Changeset 94701 in webkit for trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

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:

File:

• trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (modified) (6 diffs)

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;
     }