wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 563322 part 1 - Avoid calling nsScriptLoader::SetEnabled in the innerHTML setter when using the HTML parser. r=Olli.Pettay.

Browse Source
This commit is contained in:
Henri Sivonen 2011-08-01 10:48:28 +03:00
parent 0176915bb7
commit cd3a59b9ef
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -746,11 +746,6 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
nsCOMPtr<nsIDOMDocumentFragment> df;
// Strong ref since appendChild can fire events
nsRefPtr<nsScriptLoader> loader = doc->ScriptLoader();
PRBool scripts_enabled = loader->GetEnabled();
loader->SetEnabled(PR_FALSE);
if (doc->IsHTML()) {
PRInt32 oldChildCount = GetChildCount();
nsContentUtils::ParseFragmentHTML(aInnerHTML,
@ -775,19 +770,23 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
nsGenericElement::FireNodeInserted(doc, this, childNodes);
}
} else {
// Strong ref since appendChild can fire events
nsRefPtr<nsScriptLoader> loader = doc->ScriptLoader();
PRBool scripts_enabled = loader->GetEnabled();
loader->SetEnabled(PR_FALSE);
rv = nsContentUtils::CreateContextualFragment(this, aInnerHTML,
getter_AddRefs(df));
nsCOMPtr<nsINode> fragment = do_QueryInterface(df);
if (NS_SUCCEEDED(rv)) {
static_cast<nsINode*>(this)->AppendChild(fragment, &rv);
}
}
if (scripts_enabled) {
// If we disabled scripts, re-enable them now that we're
// done. Don't fire JS timeouts when enabling the context here.
if (scripts_enabled) {
// If we disabled scripts, re-enable them now that we're
// done. Don't fire JS timeouts when enabling the context here.
loader->SetEnabled(PR_TRUE);
loader->SetEnabled(PR_TRUE);
}
}
return rv;