Changeset 37759 in webkit for trunk/JavaScriptCore/API

Timestamp:

Oct 20, 2008, 11:08:06 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-20 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21766
REGRESSION: 12 JSC tests fail

The JSGlobalObject was mutating the shared nullProtoStructureID when
used in jsc. Instead of using nullProtoStructureID, use a new StructureID.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h: (JSC::::JSCallbackObject):
• API/JSContextRef.cpp: (JSGlobalContextCreateInGroup):
• kjs/JSGlobalObject.h: (JSC::JSGlobalObject::JSGlobalObject):
• kjs/Shell.cpp: (GlobalObject::GlobalObject): (jscmain):

JavaScriptGlue:

2008-10-20 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21766
REGRESSION: 12 JSC tests fail

The JSGlobalObject constructor no longer takes a JSGlobalData
as an argument.

• JSRun.cpp: (JSRun::JSRun):
• JSRun.h: (JSGlueGlobalObject::JSGlueGlobalObject):
• JSUtils.cpp: (getThreadGlobalExecState):

Location:

trunk/JavaScriptCore/API

Files:

• JSCallbackObject.h (modified) (1 diff)
• JSCallbackObjectFunctions.h (modified) (1 diff)
• JSContextRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackObject.h

@@ -38 +38 @@
 public:
     JSCallbackObject(ExecState*, PassRefPtr<StructureID>, JSClassRef, void* data);
-    JSCallbackObject(JSGlobalData*, JSClassRef);
+    JSCallbackObject(JSClassRef);
     virtual ~JSCallbackObject();
 

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -58 +58 @@
 // FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one.
 template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(JSGlobalData* globalData, JSClassRef jsClass)
-    : Base(globalData)
+JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass)
+    : Base()
     , m_callbackObjectData(new JSCallbackObjectData(0, jsClass))
 {

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -68 +68 @@
 
     if (!globalObjectClass) {
-        JSGlobalObject* globalObject = new (globalData.get()) JSGlobalObject(globalData.get());
+        JSGlobalObject* globalObject = new (globalData.get()) JSGlobalObject;
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
-    JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalData.get(), globalObjectClass);
+    JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     ExecState* exec = globalObject->globalExec();
     JSValuePtr prototype = globalObjectClass->prototype(exec);