Back out patch for bug 428672
git-svn-id: svn://10.0.0.236/trunk@250863 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
95d76befd7
commit
42daeb3b49
@ -2561,14 +2561,6 @@ nsDocument::GetScriptGlobalObject() const
|
||||
do_QueryReferent(mDocumentContainer);
|
||||
if (requestor) {
|
||||
nsCOMPtr<nsIScriptGlobalObject> globalObject = do_GetInterface(requestor);
|
||||
|
||||
// Our docshell's script global object is an outer window, but
|
||||
// our script global object is an inner window. Convert here.
|
||||
|
||||
nsCOMPtr<nsPIDOMWindow> pwin = do_QueryInterface(globalObject);
|
||||
NS_ASSERTION(pwin, "What kind of global object do we have?");
|
||||
|
||||
globalObject = do_QueryInterface(pwin->GetCurrentInnerWindow());
|
||||
return globalObject;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user