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 759082 - Remove nsIScriptContext::InitOuterWindow; r=mrbkap

Browse Source
This commit is contained in:
Ms2ger 2012-06-06 09:40:00 +02:00
parent 7be9f2c7f1
commit 2d94d35139
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/base/nsIScriptContext.h
View File

@ -45,8 +45,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContextPrincipal,
NS_ISCRIPTCONTEXTPRINCIPAL_IID)
#define NS_ISCRIPTCONTEXT_IID \
{ 0xec973091, 0x809b, 0x4796, \
{ 0x80, 0xd7, 0x4f, 0xfb, 0x64, 0xa4, 0x8e, 0x66 } }
{ 0x9a4df96d, 0xa231, 0x4108, \
{ 0xb5, 0xbc, 0xaf, 0x67, 0x7a, 0x36, 0xa7, 0x44 } }
/* This MUST match JSVERSION_DEFAULT. This version stuff if we don't
know what language we have is a little silly... */
@ -264,12 +264,6 @@ public:
**/
virtual nsresult InitContext() = 0;
/**
* Prepares this context for use with the current inner window for the
* context's global object. This must be called after CreateOuterObject.
*/
virtual nsresult InitOuterWindow() = 0;
/**
* Check to see if context is as yet intialized. Used to prevent
* reentrancy issues during the initialization process.

4
dom/base/nsIScriptGlobalObject.h
View File

@ -68,8 +68,8 @@ NS_HandleScriptError(nsIScriptGlobalObject *aScriptGlobal,
#define NS_ISCRIPTGLOBALOBJECT_IID \
{ 0xf3db4f83, 0x0584, 0x429d, \
{ 0x89, 0x4b, 0x6d, 0x0e, 0x88, 0x16, 0xec, 0x66 } }
{ 0x92569431, 0x6e6e, 0x408a, \
{ 0xa8, 0x8c, 0x45, 0x28, 0x5c, 0x1c, 0x85, 0x73 } }
/**
* The global object which keeps a script context for each supported script

11
dom/base/nsJSEnvironment.cpp
View File

@ -2090,17 +2090,6 @@ nsJSContext::InitContext()
return NS_OK;
}
nsresult
nsJSContext::InitOuterWindow()
{
JSObject *global = JS_ObjectToInnerObject(mContext, JS_GetGlobalObject(mContext));
nsresult rv = InitClasses(global); // this will complete global object initialization
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
nsresult
nsJSContext::InitializeExternalClasses()
{

1
dom/base/nsJSEnvironment.h
View File

@ -108,7 +108,6 @@ public:
virtual JSContext* GetNativeContext();
virtual JSObject* GetNativeGlobal();
virtual nsresult InitContext();
virtual nsresult InitOuterWindow();
virtual bool IsContextInitialized();
virtual void ScriptEvaluated(bool aTerminated);