Changeset 94701 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Sep 7, 2011, 12:40:41 PM (14 years ago)

Author:

[email protected]

Message:

Remove JSObjectWithGlobalObject
​https://bugs.webkit.org/show_bug.cgi?id=67689

Reviewed by Geoff Garen.

../../../../Volumes/Data/git/WebKit/OpenSource/Source/JavaScriptCore:

Remove JSObjectWithGlobalObject, and update code to stop using anonymous
storage to access the global object that a JSObject comes from. Largely
mechanical change to remove the use of anonymous storage and JSObjectWithGlobalObject.

• API/JSCallbackConstructor.cpp:

(JSC::JSCallbackConstructor::JSCallbackConstructor):
(JSC::JSCallbackConstructor::finishCreation):

• API/JSCallbackConstructor.h:
• API/JSCallbackObject.cpp:
• API/JSCallbackObject.h:

(JSC::JSCallbackObject::create):

• API/JSCallbackObjectFunctions.h:

(JSC::::JSCallbackObject):
(JSC::::finishCreation):
(JSC::::staticFunctionGetter):

• API/JSClassRef.cpp:

(OpaqueJSClass::prototype):

• API/JSObjectRef.cpp:

(JSObjectMake):
(JSObjectGetPrivate):
(JSObjectSetPrivate):
(JSObjectGetPrivateProperty):
(JSObjectSetPrivateProperty):
(JSObjectDeletePrivateProperty):

• API/JSValueRef.cpp:

(JSValueIsObjectOfClass):

• API/JSWeakObjectMapRefPrivate.cpp:
• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/CodeBlock.h:
• dfg/DFGRepatch.cpp:

(JSC::DFG::dfgRepatchGetMethodFast):
(JSC::DFG::tryCacheGetMethod):

• jit/JIT.h:
• jit/JITInlineMethods.h:

(JSC::JIT::emitAllocateJSFunction):

• jit/JITPropertyAccess.cpp:

(JSC::JIT::patchMethodCallProto):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/DatePrototype.cpp:
• runtime/InternalFunction.cpp:

(JSC::InternalFunction::InternalFunction):
(JSC::InternalFunction::finishCreation):

• runtime/InternalFunction.h:
• runtime/JSFunction.cpp:

(JSC::JSFunction::JSFunction):
(JSC::JSFunction::finishCreation):

• runtime/JSFunction.h:

(JSC::JSFunction::create):
(JSC::JSFunction::createStructure):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):

• runtime/JSONObject.cpp:

(JSC::JSONObject::JSONObject):
(JSC::JSONObject::finishCreation):

• runtime/JSONObject.h:
• runtime/JSObject.h:

(JSC::JSObject::globalObject):

• runtime/JSObjectWithGlobalObject.cpp: Removed.
• runtime/JSObjectWithGlobalObject.h: Removed.
• runtime/JSValue.cpp:

(JSC::JSValue::isValidCallee):

• runtime/Lookup.cpp:

(JSC::setUpStaticFunctionSlot):

• runtime/Lookup.h:
• runtime/MathObject.cpp:

(JSC::MathObject::MathObject):
(JSC::MathObject::finishCreation):

• runtime/MathObject.h:
• runtime/NumberPrototype.cpp:
• runtime/RegExpObject.cpp:

(JSC::RegExpObject::RegExpObject):
(JSC::RegExpObject::finishCreation):

• runtime/RegExpObject.h:
• runtime/Structure.cpp:

(JSC::Structure::Structure):

• runtime/Structure.h:

(JSC::Structure::create):
(JSC::Structure::globalObject):

../../../../Volumes/Data/git/WebKit/OpenSource/Source/WebCore:

Remove use of anonymous storage and JSObjectWithGlobalObject for
accessing a JSObject's global object now that they're available
on the object's structure.

• bindings/js/JSDOMWindowShell.cpp:

(WebCore::JSDOMWindowShell::setWindow):

• bindings/js/JSDOMWrapper.h:

(WebCore::JSDOMWrapper::globalObject):
(WebCore::JSDOMWrapper::JSDOMWrapper):

• bindings/js/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::initScript):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):
(GenerateImplementation):

• bridge/objc/objc_runtime.h:
• bridge/objc/objc_runtime.mm:

(JSC::Bindings::ObjcFallbackObjectImp::ObjcFallbackObjectImp):
(JSC::Bindings::ObjcFallbackObjectImp::finishCreation):

• bridge/runtime_object.cpp:

(JSC::Bindings::RuntimeObject::RuntimeObject):
(JSC::Bindings::RuntimeObject::finishCreation):

• bridge/runtime_object.h:

../../../../Volumes/Data/git/WebKit/OpenSource/Source/WebKit2:

Remove JSObjectWithGlobalObject usage.

• WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit::JSNPObject::JSNPObject):
(WebKit::JSNPObject::finishCreation):

• WebProcess/Plugins/Netscape/JSNPObject.h:

Location:

trunk/Source/JavaScriptCore/API

Files:

• JSCallbackConstructor.cpp (modified) (2 diffs)
• JSCallbackConstructor.h (modified) (1 diff)
• JSCallbackObject.cpp (modified) (1 diff)
• JSCallbackObject.h (modified) (3 diffs)
• JSCallbackObjectFunctions.h (modified) (3 diffs)
• JSClassRef.cpp (modified) (1 diff)
• JSObjectRef.cpp (modified) (6 diffs)
• JSValueRef.cpp (modified) (1 diff)
• JSWeakObjectMapRefPrivate.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSCallbackConstructor.cpp

@@ -37 +37 @@
 namespace JSC {
 
-const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &JSObjectWithGlobalObject::s_info, 0, 0 };
+const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &JSNonFinalObject::s_info, 0, 0 };
 
 JSCallbackConstructor::JSCallbackConstructor(JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback)
-    : JSObjectWithGlobalObject(globalObject, structure)
+    : JSNonFinalObject(globalObject->globalData(), structure)
     , m_class(jsClass)
     , m_callback(callback)
@@ -49 +49 @@
 void JSCallbackConstructor::finishCreation(JSGlobalObject* globalObject, JSClassRef jsClass)
 {
-    Base::finishCreation(globalObject->globalData(), globalObject);
+    Base::finishCreation(globalObject->globalData());
     ASSERT(inherits(&s_info));
     if (m_class)

trunk/Source/JavaScriptCore/API/JSCallbackConstructor.h

@@ -28 +28 @@
 
 #include "JSObjectRef.h"
-#include <runtime/JSObjectWithGlobalObject.h>
+#include <runtime/JSObject.h>
 
 namespace JSC {
 
-class JSCallbackConstructor : public JSObjectWithGlobalObject {
+class JSCallbackConstructor : public JSNonFinalObject {
 public:
-    typedef JSObjectWithGlobalObject Base;
+    typedef JSNonFinalObject Base;
 
     static JSCallbackConstructor* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef classRef, JSObjectCallAsConstructorCallback callback) 

trunk/Source/JavaScriptCore/API/JSCallbackObject.cpp

@@ -33 +33 @@
 namespace JSC {
 
-ASSERT_CLASS_FITS_IN_CELL(JSCallbackObject<JSObjectWithGlobalObject>);
+ASSERT_CLASS_FITS_IN_CELL(JSCallbackObject<JSNonFinalObject>);
 ASSERT_CLASS_FITS_IN_CELL(JSCallbackObject<JSGlobalObject>);
 
 // Define the two types of JSCallbackObjects we support.
-template <> const ClassInfo JSCallbackObject<JSObjectWithGlobalObject>::s_info = { "CallbackObject", &JSObjectWithGlobalObject::s_info, 0, 0 };
+template <> const ClassInfo JSCallbackObject<JSNonFinalObject>::s_info = { "CallbackObject", &JSNonFinalObject::s_info, 0, 0 };
 template <> const ClassInfo JSCallbackObject<JSGlobalObject>::s_info = { "CallbackGlobalObject", &JSGlobalObject::s_info, 0, 0 };
 

trunk/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -118 +118 @@
 class JSCallbackObject : public Parent {
 protected:
-    JSCallbackObject(ExecState*, JSGlobalObject*, Structure*, JSClassRef, void* data);
+    JSCallbackObject(ExecState*, Structure*, JSClassRef, void* data);
     JSCallbackObject(JSGlobalData&, JSClassRef, Structure*);
     // We'd like to use the placement version of operator new defined in JSCell, but 
@@ -125 +125 @@
     void* operator new(size_t, void* ptr) { return ptr; }
 
-    void finishCreation(ExecState*, JSGlobalObject*);
+    void finishCreation(ExecState*);
     void finishCreation();
 
@@ -133 +133 @@
     static JSCallbackObject* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef classRef, void* data)
     {
-        JSCallbackObject* callbackObject = new (allocateCell<JSCallbackObject>(*exec->heap())) JSCallbackObject(exec, globalObject, structure, classRef, data);
+        ASSERT(!structure->globalObject() || structure->globalObject() == globalObject);
+        JSCallbackObject* callbackObject = new (allocateCell<JSCallbackObject>(*exec->heap())) JSCallbackObject(exec, structure, classRef, data);
         return callbackObject;
     }

trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -51 +51 @@
 
 template <class Parent>
-JSCallbackObject<Parent>::JSCallbackObject(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, void* data)
-    : Parent(globalObject, structure)
+JSCallbackObject<Parent>::JSCallbackObject(ExecState* exec, Structure* structure, JSClassRef jsClass, void* data)
+    : Parent(exec->globalData(), structure)
     , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass)))
 {
-    finishCreation(exec, globalObject);
+    finishCreation(exec);
 }
 
@@ -69 +69 @@
 
 template <class Parent>
-void JSCallbackObject<Parent>::finishCreation(ExecState* exec, JSGlobalObject* globalObject)
-{
-    Base::finishCreation(globalObject->globalData(), globalObject);
+void JSCallbackObject<Parent>::finishCreation(ExecState* exec)
+{
+    Base::finishCreation(exec->globalData());
     ASSERT(Parent::inherits(&s_info));
     init(exec);
@@ -575 +575 @@
                 if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
                     
-                    JSObject* o = JSCallbackFunction::create(exec, asGlobalObject(thisObj->getAnonymousValue(0)), callAsFunction, propertyName);
+                    JSObject* o = JSCallbackFunction::create(exec, thisObj->globalObject(), callAsFunction, propertyName);
                     thisObj->putDirect(exec->globalData(), propertyName, o, entry->attributes);
                     return o;

trunk/Source/JavaScriptCore/API/JSClassRef.cpp

@@ -252 +252 @@
     if (!jsClassData.cachedPrototype) {
         // Recursive, but should be good enough for our purposes
-        jsClassData.cachedPrototype.set(exec->globalData(), JSCallbackObject<JSObjectWithGlobalObject>::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), prototypeClass, &jsClassData), 0); // set jsClassData as the object's private data, so it can clear our reference on destruction
+        jsClassData.cachedPrototype.set(exec->globalData(), JSCallbackObject<JSNonFinalObject>::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), prototypeClass, &jsClassData), 0); // set jsClassData as the object's private data, so it can clear our reference on destruction
         if (parentClass) {
             if (JSObject* prototype = parentClass->prototype(exec))

trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

@@ -82 +82 @@
         return toRef(constructEmptyObject(exec));
 
-    JSCallbackObject<JSObjectWithGlobalObject>* object = JSCallbackObject<JSObjectWithGlobalObject>::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), jsClass, data);
+    JSCallbackObject<JSNonFinalObject>* object = JSCallbackObject<JSNonFinalObject>::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), jsClass, data);
     if (JSObject* prototype = jsClass->prototype(exec))
         object->setPrototype(exec->globalData(), prototype);
@@ -343 +343 @@
     if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
         return static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivate();
-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info))
-        return static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->getPrivate();
+    if (jsObject->inherits(&JSCallbackObject<JSNonFinalObject>::s_info))
+        return static_cast<JSCallbackObject<JSNonFinalObject>*>(jsObject)->getPrivate();
     
     return 0;
@@ -357 +357 @@
         return true;
     }
-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->setPrivate(data);
+    if (jsObject->inherits(&JSCallbackObject<JSNonFinalObject>::s_info)) {
+        static_cast<JSCallbackObject<JSNonFinalObject>*>(jsObject)->setPrivate(data);
         return true;
     }
@@ -374 +374 @@
     if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
         result = static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivateProperty(name);
-    else if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info))
-        result = static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->getPrivateProperty(name);
+    else if (jsObject->inherits(&JSCallbackObject<JSNonFinalObject>::s_info))
+        result = static_cast<JSCallbackObject<JSNonFinalObject>*>(jsObject)->getPrivateProperty(name);
     return toRef(exec, result);
 }
@@ -390 +390 @@
         return true;
     }
-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->setPrivateProperty(exec->globalData(), name, jsValue);
+    if (jsObject->inherits(&JSCallbackObject<JSNonFinalObject>::s_info)) {
+        static_cast<JSCallbackObject<JSNonFinalObject>*>(jsObject)->setPrivateProperty(exec->globalData(), name, jsValue);
         return true;
     }
@@ -407 +407 @@
         return true;
     }
-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->deletePrivateProperty(name);
+    if (jsObject->inherits(&JSCallbackObject<JSNonFinalObject>::s_info)) {
+        static_cast<JSCallbackObject<JSNonFinalObject>*>(jsObject)->deletePrivateProperty(name);
         return true;
     }

trunk/Source/JavaScriptCore/API/JSValueRef.cpp

@@ -132 +132 @@
         if (o->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
             return static_cast<JSCallbackObject<JSGlobalObject>*>(o)->inherits(jsClass);
-        if (o->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info))
-            return static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(o)->inherits(jsClass);
+        if (o->inherits(&JSCallbackObject<JSNonFinalObject>::s_info))
+            return static_cast<JSCallbackObject<JSNonFinalObject>*>(o)->inherits(jsClass);
     }
     return false;

trunk/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp

@@ -58 +58 @@
     if (!obj)
         return;
-    ASSERT(obj->inherits(&JSCallbackObject<JSGlobalObject>::s_info) || obj->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info));
+    ASSERT(obj->inherits(&JSCallbackObject<JSGlobalObject>::s_info) || obj->inherits(&JSCallbackObject<JSNonFinalObject>::s_info));
     map->map().set(exec->globalData(), key, obj);
 }