Changeset 60057 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj

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/JavaScriptCore.xcodeproj/project.pbxproj (modified) (10 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -320 +320 @@
                 A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */; };
                 A7C1E8E4112E72EF00A37F98 /* JITPropertyAccess32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */; };
-                A7C2217810C7479400F97913 /* JSZombie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C2216B10C7469C00F97913 /* JSZombie.cpp */; };
                 A7C530E4102A3813005BC741 /* MarkStackPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C530E3102A3813005BC741 /* MarkStackPosix.cpp */; };
                 A7D649AA1015224E009B2E1B /* PossiblyNull.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D649A91015224E009B2E1B /* PossiblyNull.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -329 +328 @@
                 A7FB60A4103F7DC20017A286 /* PropertyDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7FB60A3103F7DC20017A286 /* PropertyDescriptor.cpp */; };
                 A7FB61001040C38B0017A286 /* PropertyDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = A7FB604B103F5EAB0017A286 /* PropertyDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                BC01D4F111A8F1FF00A54B2A /* JSZombie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC01D4EF11A8F1FF00A54B2A /* JSZombie.cpp */; };
+                BC01D4F211A8F1FF00A54B2A /* JSZombie.h in Headers */ = {isa = PBXBuildFile; fileRef = BC01D4F011A8F1FF00A54B2A /* JSZombie.h */; };
                 BC02E90D0E1839DB000F9297 /* ErrorConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9050E1839DB000F9297 /* ErrorConstructor.h */; };
                 BC02E90F0E1839DB000F9297 /* ErrorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9070E1839DB000F9297 /* ErrorPrototype.h */; };
@@ -915 +916 @@
                 A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocator.cpp; sourceTree = "<group>"; };
                 A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITPropertyAccess32_64.cpp; sourceTree = "<group>"; };
-                A7C2216810C745E000F97913 /* JSZombie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSZombie.h; sourceTree = "<group>"; };
-                A7C2216B10C7469C00F97913 /* JSZombie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSZombie.cpp; sourceTree = "<group>"; };
                 A7C530E3102A3813005BC741 /* MarkStackPosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MarkStackPosix.cpp; sourceTree = "<group>"; };
                 A7D649A91015224E009B2E1B /* PossiblyNull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PossiblyNull.h; sourceTree = "<group>"; };
@@ -931 +930 @@
                 A8E894310CD0602400367179 /* JSCallbackObjectFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackObjectFunctions.h; sourceTree = "<group>"; };
                 A8E894330CD0603F00367179 /* JSGlobalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObject.h; sourceTree = "<group>"; };
+                BC01D4EF11A8F1FF00A54B2A /* JSZombie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSZombie.cpp; sourceTree = "<group>"; };
+                BC01D4F011A8F1FF00A54B2A /* JSZombie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSZombie.h; sourceTree = "<group>"; };
                 BC02E9040E1839DB000F9297 /* ErrorConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ErrorConstructor.cpp; sourceTree = "<group>"; };
                 BC02E9050E1839DB000F9297 /* ErrorConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ErrorConstructor.h; sourceTree = "<group>"; };
@@ -1621 +1622 @@
                                 BC22A3980E16E14800AF21C8 /* JSObject.cpp */,
                                 BC22A3990E16E14800AF21C8 /* JSObject.h */,
+                                A783A2AA11A5BE8400563D20 /* JSObjectWithGlobalObject.cpp */,
+                                A783A0D011A36DCA00563D20 /* JSObjectWithGlobalObject.h */,
                                 A7F9935E0FD7325100A0B2D0 /* JSONObject.cpp */,
                                 A7F9935D0FD7325100A0B2D0 /* JSONObject.h */,
@@ -1638 +1641 @@
                                 65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */,
                                 65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */,
-                                A7C2216B10C7469C00F97913 /* JSZombie.cpp */,
-                                A7C2216B10C7469C00F97913 /* JSZombie.cpp */,
-                                A7C2216810C745E000F97913 /* JSZombie.h */,
-                                A7C2216810C745E000F97913 /* JSZombie.h */,
+                                BC01D4EF11A8F1FF00A54B2A /* JSZombie.cpp */,
+                                BC01D4F011A8F1FF00A54B2A /* JSZombie.h */,
                                 A7E2EA6A0FB460CF00601F06 /* LiteralParser.cpp */,
                                 A7E2EA690FB460CF00601F06 /* LiteralParser.h */,
@@ -1721 +1722 @@
                                 14035DB010DBFB2A00FFFFE7 /* WeakGCPtr.h */,
                                 1420BE7A10AA6DDB00F455D2 /* WeakRandom.h */,
-                                A783A0D011A36DCA00563D20 /* JSObjectWithGlobalObject.h */,
-                                A783A2AA11A5BE8400563D20 /* JSObjectWithGlobalObject.cpp */,
                         );
                         path = runtime;
@@ -2161 +2160 @@
                                 86C568E211A213EE0007F7F0 /* MIPSAssembler.h in Headers */,
                                 A783A0D111A36DCA00563D20 /* JSObjectWithGlobalObject.h in Headers */,
+                                BC01D4F211A8F1FF00A54B2A /* JSZombie.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2536 +2536 @@
                                 147F39D7107EC37600427A48 /* JSVariableObject.cpp in Sources */,
                                 14280870107EC1340013E7B2 /* JSWrapperObject.cpp in Sources */,
-                                A7C2217810C7479400F97913 /* JSZombie.cpp in Sources */,
                                 BCFD8C920EEB2EE700283848 /* JumpTable.cpp in Sources */,
                                 148F21B0107EC5410042EC2C /* Lexer.cpp in Sources */,
@@ -2617 +2616 @@
                                 146FE51211A710430087AE66 /* JITCall32_64.cpp in Sources */,
                                 A783A2AB11A5BE8400563D20 /* JSObjectWithGlobalObject.cpp in Sources */,
+                                BC01D4F111A8F1FF00A54B2A /* JSZombie.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;