diff options
Diffstat (limited to 'Source/WebCore/bindings/js/JSDOMWindowBase.h')
| -rw-r--r-- | Source/WebCore/bindings/js/JSDOMWindowBase.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.h b/Source/WebCore/bindings/js/JSDOMWindowBase.h index 91b4f42..bfec31c 100644 --- a/Source/WebCore/bindings/js/JSDOMWindowBase.h +++ b/Source/WebCore/bindings/js/JSDOMWindowBase.h @@ -49,7 +49,7 @@ namespace WebCore { public: void updateDocument(); - DOMWindow* impl() const { return d()->impl.get(); } + DOMWindow* impl() const { return m_impl.get(); } virtual ScriptExecutionContext* scriptExecutionContext() const; // Called just before removing this window from the JSDOMWindowShell. @@ -57,9 +57,9 @@ namespace WebCore { static const JSC::ClassInfo s_info; - static PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) + static PassRefPtr<JSC::Structure> createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) { - return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); + return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); } virtual JSC::ExecState* globalExec(); @@ -82,19 +82,11 @@ namespace WebCore { static JSC::JSGlobalData* commonJSGlobalData(); private: - struct JSDOMWindowBaseData : public JSDOMGlobalObjectData { - JSDOMWindowBaseData(PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell); - - RefPtr<DOMWindow> impl; - JSDOMWindowShell* shell; - }; + RefPtr<DOMWindow> m_impl; + JSDOMWindowShell* m_shell; bool allowsAccessFromPrivate(const JSC::JSGlobalObject*) const; String crossDomainAccessErrorMessage(const JSC::JSGlobalObject*) const; - - static void destroyJSDOMWindowBaseData(void*); - - JSDOMWindowBaseData* d() const { return static_cast<JSDOMWindowBaseData*>(JSC::JSVariableObject::d); } }; // Returns a JSDOMWindow or jsNull() |