diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowShell.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowShell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowShell.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowShell.cpp index 3c3ff4c239..9072f91bc3 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowShell.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowShell.cpp @@ -171,18 +171,18 @@ void* JSDOMWindowShell::operator new(size_t size) // Conversion methods // ---- -JSValue toJS(ExecState*, Frame* frame) +JSValue toJS(ExecState* exec, Frame* frame) { if (!frame) return jsNull(); - return frame->script()->windowShell(); + return frame->script()->windowShell(currentWorld(exec)); } -JSDOMWindowShell* toJSDOMWindowShell(Frame* frame) +JSDOMWindowShell* toJSDOMWindowShell(Frame* frame, DOMWrapperWorld* isolatedWorld) { if (!frame) return 0; - return frame->script()->windowShell(); + return frame->script()->windowShell(isolatedWorld); } } // namespace WebCore |