corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 935325 - merge nsIScriptGlobalObjectOwner into nsIDocShell r=smaug

Browse Source
This commit is contained in:
Trevor Saunders
2013-05-27 06:07:01 -04:00
parent 1600570bae
commit 54a01461f2
9 changed files with 23 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
parser/html/nsHtml5TreeOpExecutor.cpp
View File

@@ -17,7 +17,6 @@
#include "nsStyleLinkElement.h"
#include "nsIDocShell.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIScriptSecurityManager.h"
#include "nsIWebShellServices.h"
#include "nsContentUtils.h"
@@ -653,9 +652,7 @@ nsHtml5TreeOpExecutor::IsScriptEnabled()
// Getting context is tricky if the document hasn't had its
// GlobalObject set yet
if (!globalObject) {
nsCOMPtr<nsIScriptGlobalObjectOwner> owner = do_GetInterface(mDocShell);
NS_ENSURE_TRUE(owner, true);
globalObject = do_QueryInterface(mDocument->GetWindow());
globalObject = mDocShell->GetScriptGlobalObject();
NS_ENSURE_TRUE(globalObject, true);
}
nsIScriptContext *scriptContext = globalObject->GetContext();