diff options
Diffstat (limited to 'Source/WebCore/bindings/js/JSDOMWindowShell.cpp')
| -rw-r--r-- | Source/WebCore/bindings/js/JSDOMWindowShell.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/bindings/js/JSDOMWindowShell.cpp b/Source/WebCore/bindings/js/JSDOMWindowShell.cpp index 65096b9..40f9910 100644 --- a/Source/WebCore/bindings/js/JSDOMWindowShell.cpp +++ b/Source/WebCore/bindings/js/JSDOMWindowShell.cpp @@ -45,7 +45,6 @@ const ClassInfo JSDOMWindowShell::s_info = { "JSDOMWindowShell", 0, 0, 0 }; JSDOMWindowShell::JSDOMWindowShell(PassRefPtr<DOMWindow> window, DOMWrapperWorld* world) : Base(JSDOMWindowShell::createStructure(jsNull())) - , m_window(0) , m_world(world) { setWindow(window); @@ -65,8 +64,8 @@ void JSDOMWindowShell::setWindow(PassRefPtr<DOMWindow> domWindow) RefPtr<Structure> structure = JSDOMWindow::createStructure(prototype); JSDOMWindow* jsDOMWindow = new (JSDOMWindow::commonJSGlobalData()) JSDOMWindow(structure.release(), domWindow, this); - prototype->putAnonymousValue(0, jsDOMWindow); - setWindow(jsDOMWindow); + prototype->putAnonymousValue(*JSDOMWindow::commonJSGlobalData(), 0, jsDOMWindow); + setWindow(*JSDOMWindow::commonJSGlobalData(), jsDOMWindow); } // ---- @@ -77,7 +76,7 @@ void JSDOMWindowShell::markChildren(MarkStack& markStack) { Base::markChildren(markStack); if (m_window) - markStack.append(m_window); + markStack.append(&m_window); } UString JSDOMWindowShell::className() const @@ -147,7 +146,7 @@ JSValue JSDOMWindowShell::lookupSetter(ExecState* exec, const Identifier& proper JSObject* JSDOMWindowShell::unwrappedObject() { - return m_window; + return m_window.get(); } // ---- |