Changeset 60057 in webkit for trunk/JavaScriptCore/runtime/JSObjectWithGlobalObject.h

Timestamp:

May 23, 2010, 7:15:02 PM (15 years ago)

Author:

[email protected]

Message:

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=39575
Make JS DOMObject inherit from JSObjectWithGlobalObject instead of JSObject

Reviewed by Oliver Hunt.

JavaScriptCore:

Expose the global object stored in JSObjectWithGlobalObject.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/JSObjectWithGlobalObject.cpp:

(JSC::JSObjectWithGlobalObject::JSObjectWithGlobalObject):
(JSC::JSObjectWithGlobalObject::globalObject):

• runtime/JSObjectWithGlobalObject.h:

WebCore:

• Changes JSDOMWindowShell to inherit from JSObject instead of DOMObject since it doesn't ever go into any DOMObject tables. In a separate change, we may want to make this inherit from JSObjectWithGlobalObject since JSDOMWindowShell does store a global object pointer.
• Change DOMObject to inherit from JSObjectWithGlobalObject instead of JSObject. In this change I am keeping around DOMObjectWithGlobalPointer, which now just uses the capabilities of JSObjectWithGlobalObject instead of implementing them itself. DOMObjectWithGlobalPointer will go away in a subsequent patch.

• bindings/js/JSDOMBinding.h:

(WebCore::DOMObjectWithGlobalPointer::globalObject):
(WebCore::DOMObjectWithGlobalPointer::DOMObjectWithGlobalPointer):

• bindings/js/JSDOMWindowShell.h:
• bindings/js/JSDOMWrapper.h:

(WebCore::DOMObject::DOMObject):

File:

• trunk/JavaScriptCore/runtime/JSObjectWithGlobalObject.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSObjectWithGlobalObject.h

@@ -40 +40 @@
     }
 
+    JSGlobalObject* globalObject() const;
+
 protected:
     JSObjectWithGlobalObject(JSGlobalObject*, NonNullPassRefPtr<Structure>);
@@ -49 +51 @@
     }
     static const unsigned AnonymousSlotCount = JSObject::AnonymousSlotCount + 1;
+    static const unsigned GlobalObjectSlot = 0;
 };
 
-}
+} // namespace JSC
 
 #endif // JSObjectWithGlobalObject_h