corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 959150 part 4 - Avoid using tree ops when parsing with nsHtml5StringParser. r=smaug.

Browse Source
This commit is contained in:
Henri Sivonen
2014-03-05 21:38:50 +02:00
parent 9c5e892c4f
commit d07d56d994
16 changed files with 638 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
parser/html/nsHtml5TreeOperation.cpp
View File

@@ -344,7 +344,7 @@ nsIContent*
nsHtml5TreeOperation::CreateElement(int32_t aNs,
nsIAtom* aName,
nsHtml5HtmlAttributes* aAttributes,
bool aFromNetwork,
mozilla::dom::FromParser aFromParser,
nsHtml5DocumentBuilder* aBuilder)
{
bool isKeygen = (aName == nsHtml5Atoms::keygen && aNs == kNameSpaceID_XHTML);
@@ -358,11 +358,7 @@ nsHtml5TreeOperation::CreateElement(int32_t aNs,
NS_ASSERTION(nodeInfo, "Got null nodeinfo.");
NS_NewElement(getter_AddRefs(newContent),
nodeInfo.forget(),
(aFromNetwork ?
dom::FROM_PARSER_NETWORK
: (aBuilder->BelongsToStringParser() ?
dom::FROM_PARSER_FRAGMENT :
dom::FROM_PARSER_DOCUMENT_WRITE)));
aFromParser);
NS_ASSERTION(newContent, "Element creation created null pointer.");
aBuilder->HoldElement(newContent);
@@ -406,11 +402,7 @@ nsHtml5TreeOperation::CreateElement(int32_t aNs,
nsCOMPtr<nsINodeInfo> ni = optionNodeInfo;
NS_NewElement(getter_AddRefs(optionElt),
ni.forget(),
(aFromNetwork ?
dom::FROM_PARSER_NETWORK
: (aBuilder->BelongsToStringParser() ?
dom::FROM_PARSER_FRAGMENT :
dom::FROM_PARSER_DOCUMENT_WRITE)));
aFromParser);
nsRefPtr<nsTextNode> optionText =
new nsTextNode(aBuilder->GetNodeInfoManager());
(void) optionText->SetText(theContent[i], false);
@@ -674,7 +666,9 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
*target = CreateElement(ns,
name,
attributes,
mOpCode == eTreeOpCreateElementNetwork,
mOpCode == eTreeOpCreateElementNetwork ?
dom::FROM_PARSER_NETWORK :
dom::FROM_PARSER_DOCUMENT_WRITE,
aBuilder);
return NS_OK;
}