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 561173 - Reduce QIing and Addref/Release while setting innerHTML, r=jst, a=1hourlimit

Browse Source
This commit is contained in:
Olli Pettay 2010-04-24 13:41:02 +03:00
parent 0797892373
commit d55a9c4d4f
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/public/nsContentUtils.h
View File

@ -1019,7 +1019,7 @@ public:
* transferred to the caller.
* @param aReturn [out] the created DocumentFragment
*/
static nsresult CreateContextualFragment(nsIDOMNode* aContextNode,
static nsresult CreateContextualFragment(nsINode* aContextNode,
const nsAString& aFragment,
PRBool aWillOwnFragment,
nsIDOMDocumentFragment** aReturn);

19
content/base/src/nsContentUtils.cpp
View File

@ -3696,27 +3696,26 @@ nsContentUtils::IsValidNodeName(nsIAtom *aLocalName, nsIAtom *aPrefix,
/* static */
nsresult
nsContentUtils::CreateContextualFragment(nsIDOMNode* aContextNode,
nsContentUtils::CreateContextualFragment(nsINode* aContextNode,
const nsAString& aFragment,
PRBool aWillOwnFragment,
nsIDOMDocumentFragment** aReturn)
{
NS_ENSURE_ARG(aContextNode);
*aReturn = nsnull;
NS_ENSURE_ARG(aContextNode);
nsresult rv;
nsCOMPtr<nsINode> node = do_QueryInterface(aContextNode);
NS_ENSURE_TRUE(node, NS_ERROR_NOT_AVAILABLE);
// If we don't have a document here, we can't get the right security context
// for compiling event handlers... so just bail out.
nsCOMPtr<nsIDocument> document = node->GetOwnerDoc();
nsCOMPtr<nsIDocument> document = aContextNode->GetOwnerDoc();
NS_ENSURE_TRUE(document, NS_ERROR_NOT_AVAILABLE);
PRBool bCaseSensitive = !document->IsHTML();
nsCOMPtr<nsIHTMLDocument> htmlDoc(do_QueryInterface(document));
PRBool isHTML = htmlDoc && !bCaseSensitive;
PRBool isHTML = document->IsHTML();
#ifdef DEBUG
nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(document);
NS_ASSERTION(!isHTML || htmlDoc, "Should have HTMLDocument here!");
#endif
if (isHTML && nsHtml5Module::sEnabled) {
// See if the document has a cached fragment parser. nsHTMLDocument is the
@ -3760,7 +3759,7 @@ nsContentUtils::CreateContextualFragment(nsIDOMNode* aContextNode,
(document->GetCompatibilityMode() == eCompatibility_NavQuirks));
}
NS_ADDREF(*aReturn = frag);
frag.swap(*aReturn);
document->SetFragmentParser(parser);
return NS_OK;
}

5
content/base/src/nsRange.cpp
View File

@ -2033,10 +2033,9 @@ NS_IMETHODIMP
nsRange::CreateContextualFragment(const nsAString& aFragment,
nsIDOMDocumentFragment** aReturn)
{
nsCOMPtr<nsIDOMNode> start = do_QueryInterface(mStartParent);
if (mIsPositioned) {
return nsContentUtils::CreateContextualFragment(start, aFragment, PR_TRUE,
aReturn);
return nsContentUtils::CreateContextualFragment(mStartParent, aFragment,
PR_TRUE, aReturn);
}
return NS_ERROR_FAILURE;
}

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

@ -681,14 +681,12 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
loader->SetEnabled(PR_FALSE);
}
nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(static_cast<nsIContent *>
(this)));
nsresult rv = nsContentUtils::CreateContextualFragment(thisNode, aInnerHTML,
nsresult rv = nsContentUtils::CreateContextualFragment(this, aInnerHTML,
PR_FALSE,
getter_AddRefs(df));
nsCOMPtr<nsINode> fragment = do_QueryInterface(df);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIDOMNode> tmpNode;
rv = thisNode->AppendChild(df, getter_AddRefs(tmpNode));
static_cast<nsINode*>(this)->AppendChild(fragment, &rv);
}
if (scripts_enabled) {