diff options
Diffstat (limited to 'WebCore/bridge/jni')
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp | 8 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaRuntimeObject.cpp | 4 | ||||
-rw-r--r-- | WebCore/bridge/jni/jsc/JavaRuntimeObject.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp index 8959189..2fae747 100644 --- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp @@ -65,7 +65,7 @@ JavaInstance::~JavaInstance() RuntimeObject* JavaInstance::newRuntimeObject(ExecState* exec) { - return new (exec) JavaRuntimeObject(exec, this); + return new (exec) JavaRuntimeObject(exec, exec->lexicalGlobalObject(), this); } #define NUM_LOCAL_REFS 64 @@ -118,8 +118,8 @@ JSValue JavaInstance::booleanValue() const class JavaRuntimeMethod : public RuntimeMethod { public: - JavaRuntimeMethod(ExecState* exec, const Identifier& name, Bindings::MethodList& list) - : RuntimeMethod(exec, name, list) + JavaRuntimeMethod(ExecState* exec, JSGlobalObject* globalObject, const Identifier& name, Bindings::MethodList& list) + : RuntimeMethod(exec, globalObject, name, list) { } @@ -133,7 +133,7 @@ const ClassInfo JavaRuntimeMethod::s_info = { "JavaRuntimeMethod", &RuntimeMetho JSValue JavaInstance::getMethod(ExecState* exec, const Identifier& propertyName) { MethodList methodList = getClass()->methodsNamed(propertyName, this); - return new (exec) JavaRuntimeMethod(exec, propertyName, methodList); + return new (exec) JavaRuntimeMethod(exec, exec->lexicalGlobalObject(), propertyName, methodList); } JSValue JavaInstance::invokeMethod(ExecState* exec, RuntimeMethod* runtimeMethod, const ArgList &args) diff --git a/WebCore/bridge/jni/jsc/JavaRuntimeObject.cpp b/WebCore/bridge/jni/jsc/JavaRuntimeObject.cpp index dc58b71..6270f9f 100644 --- a/WebCore/bridge/jni/jsc/JavaRuntimeObject.cpp +++ b/WebCore/bridge/jni/jsc/JavaRuntimeObject.cpp @@ -33,8 +33,8 @@ namespace Bindings { const ClassInfo JavaRuntimeObject::s_info = { "JavaRuntimeObject", &RuntimeObject::s_info, 0, 0 }; -JavaRuntimeObject::JavaRuntimeObject(ExecState* exec, PassRefPtr<JavaInstance> instance) - : RuntimeObject(exec, instance) +JavaRuntimeObject::JavaRuntimeObject(ExecState* exec, JSGlobalObject* globalObject, PassRefPtr<JavaInstance> instance) + : RuntimeObject(exec, globalObject, instance) { } diff --git a/WebCore/bridge/jni/jsc/JavaRuntimeObject.h b/WebCore/bridge/jni/jsc/JavaRuntimeObject.h index d9bf693..0e400f4 100644 --- a/WebCore/bridge/jni/jsc/JavaRuntimeObject.h +++ b/WebCore/bridge/jni/jsc/JavaRuntimeObject.h @@ -35,7 +35,7 @@ class JavaInstance; class JavaRuntimeObject : public RuntimeObject { public: - JavaRuntimeObject(ExecState*, PassRefPtr<JavaInstance>); + JavaRuntimeObject(ExecState*, JSGlobalObject*, PassRefPtr<JavaInstance>); virtual ~JavaRuntimeObject(); JavaInstance* getInternalJavaInstance() const; |