mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 448548, r+sr=sicking
This commit is contained in:
parent
70a550fd3e
commit
20c5c91fe4
@ -3025,6 +3025,7 @@ nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
|
||||
mScriptGlobalObject = aScriptGlobalObject;
|
||||
|
||||
if (aScriptGlobalObject) {
|
||||
mScriptObject = nsnull;
|
||||
mHasHadScriptHandlingObject = PR_TRUE;
|
||||
// Go back to using the docshell for the layout history state
|
||||
mLayoutHistoryState = nsnull;
|
||||
|
@ -169,6 +169,13 @@ txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
|
||||
// Create the document
|
||||
rv = NS_NewXMLDocument(getter_AddRefs(mDocument));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
|
||||
NS_ENSURE_STATE(source);
|
||||
PRBool hasHadScriptObject = PR_FALSE;
|
||||
nsIScriptGlobalObject* sgo =
|
||||
source->GetScriptHandlingObject(hasHadScriptObject);
|
||||
NS_ENSURE_STATE(sgo || !hasHadScriptObject);
|
||||
mDocument->SetScriptHandlingObject(sgo);
|
||||
}
|
||||
else {
|
||||
mDocument = do_QueryInterface(aResultDocument);
|
||||
|
@ -833,6 +833,13 @@ txMozillaXMLOutput::createResultDocument(const nsSubstring& aName, PRInt32 aNsID
|
||||
rv = NS_NewXMLDocument(getter_AddRefs(mDocument));
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
nsCOMPtr<nsIDocument> source = do_QueryInterface(aSourceDocument);
|
||||
NS_ENSURE_STATE(source);
|
||||
PRBool hasHadScriptObject = PR_FALSE;
|
||||
nsIScriptGlobalObject* sgo =
|
||||
source->GetScriptHandlingObject(hasHadScriptObject);
|
||||
NS_ENSURE_STATE(sgo || !hasHadScriptObject);
|
||||
mDocument->SetScriptHandlingObject(sgo);
|
||||
}
|
||||
else {
|
||||
mDocument = do_QueryInterface(aResultDocument);
|
||||
|
Loading…
Reference in New Issue
Block a user