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 616076, no need for userdata in print documents, r=jst, a=blocking

Browse Source 
--HG--
extra : rebase_source : a9ecb61ffca7f73234cba3c3eb3d956ffc2bf7b1
This commit is contained in:
Olli Pettay 2010-12-08 20:52:39 +02:00
parent d95de3f85f
commit ce8ef3e4f7
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsDOMAttribute.cpp
View File

@ -448,7 +448,7 @@ nsDOMAttribute::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
NS_IMETHODIMP
nsDOMAttribute::CloneNode(PRBool aDeep, nsIDOMNode** aResult)
{
return nsNodeUtils::CloneNodeImpl(this, aDeep, aResult);
return nsNodeUtils::CloneNodeImpl(this, aDeep, PR_TRUE, aResult);
}
NS_IMETHODIMP

2
content/base/src/nsDocument.cpp
View File

@ -5778,7 +5778,7 @@ nsDocument::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn)
NS_IMETHODIMP
nsDocument::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
{
return nsNodeUtils::CloneNodeImpl(this, aDeep, aReturn);
return nsNodeUtils::CloneNodeImpl(this, aDeep, !mCreatingStaticClone, aReturn);
}
NS_IMETHODIMP

2
content/base/src/nsGenericDOMDataNode.h
View File

@ -485,7 +485,7 @@ private:
return nsGenericDOMDataNode::IsSupported(aFeature, aVersion, aReturn); \
} \
NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn) { \
return nsNodeUtils::CloneNodeImpl(this, aDeep, aReturn); \
return nsNodeUtils::CloneNodeImpl(this, aDeep, PR_TRUE, aReturn); \
} \
virtual nsGenericDOMDataNode *CloneDataNode(nsINodeInfo *aNodeInfo, \
PRBool aCloneText) const;

2
content/base/src/nsGenericElement.h
View File

@ -544,7 +544,7 @@ public:
PRBool* aReturn);
nsresult CloneNode(PRBool aDeep, nsIDOMNode **aResult)
{
return nsNodeUtils::CloneNodeImpl(this, aDeep, aResult);
return nsNodeUtils::CloneNodeImpl(this, aDeep, PR_TRUE, aResult);
}
//----------------------------------------

6
content/base/src/nsNodeUtils.cpp
View File

@ -418,7 +418,9 @@ nsNodeUtils::TraverseUserData(nsINode* aNode,
/* static */
nsresult
nsNodeUtils::CloneNodeImpl(nsINode *aNode, PRBool aDeep, nsIDOMNode **aResult)
nsNodeUtils::CloneNodeImpl(nsINode *aNode, PRBool aDeep,
PRBool aCallUserDataHandlers,
nsIDOMNode **aResult)
{
*aResult = nsnull;
@ -429,7 +431,7 @@ nsNodeUtils::CloneNodeImpl(nsINode *aNode, PRBool aDeep, nsIDOMNode **aResult)
NS_ENSURE_SUCCESS(rv, rv);
nsIDocument *ownerDoc = aNode->GetOwnerDoc();
if (ownerDoc) {
if (ownerDoc && aCallUserDataHandlers) {
rv = CallUserDataHandlers(nodesWithProperties, ownerDoc,
nsIDOMUserDataHandler::NODE_CLONED, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);

2
content/base/src/nsNodeUtils.h
View File

@ -242,9 +242,11 @@ public:
*
* @param aNode the node to clone
* @param aDeep if true all descendants will be cloned too
* @param aCallUserDataHandlers if true, user data handlers will be called
* @param aResult the clone
*/
static nsresult CloneNodeImpl(nsINode *aNode, PRBool aDeep,
PRBool aCallUserDataHandlers,
nsIDOMNode **aResult);
/**