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

Timestamp:

Oct 7, 2011, 5:06:07 PM (14 years ago)

Author:

[email protected]

Message:

Add static version of JSCell::put
​https://bugs.webkit.org/show_bug.cgi?id=69382

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Added static version of both versions of put to all classes that
override them and changed the virtual versions to call the static
versions.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:

(JSC::::put):

• JavaScriptCore.exp:
• debugger/DebuggerActivation.cpp:

(JSC::DebuggerActivation::put):

• debugger/DebuggerActivation.h:
• runtime/Arguments.cpp:

(JSC::Arguments::put):

• runtime/Arguments.h:
• runtime/JSActivation.cpp:

(JSC::JSActivation::put):

• runtime/JSActivation.h:
• runtime/JSArray.cpp:

(JSC::JSArray::put):

• runtime/JSArray.h:
• runtime/JSByteArray.cpp:

(JSC::JSByteArray::put):

• runtime/JSByteArray.h:
• runtime/JSCell.cpp:

(JSC::JSCell::put):

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

(JSC::JSFunction::put):

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

(JSC::JSGlobalObject::put):

• runtime/JSGlobalObject.h:
• runtime/JSNotAnObject.cpp:

(JSC::JSNotAnObject::put):

• runtime/JSNotAnObject.h:
• runtime/JSObject.cpp:

(JSC::JSObject::put):

• runtime/JSObject.h:
• runtime/JSStaticScopeObject.cpp:

(JSC::JSStaticScopeObject::put):

• runtime/JSStaticScopeObject.h:
• runtime/ObjectPrototype.cpp:

(JSC::ObjectPrototype::put):

• runtime/ObjectPrototype.h:
• runtime/RegExpConstructor.cpp:

(JSC::RegExpConstructor::put):

• runtime/RegExpConstructor.h:
• runtime/RegExpMatchesArray.h:

(JSC::RegExpMatchesArray::put):

• runtime/RegExpObject.cpp:

(JSC::RegExpObject::put):

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

(JSC::StringObject::put):

• runtime/StringObject.h:

Source/JavaScriptGlue:

Added static version of both versions of put to all classes that
override them and changed the virtual versions to call the static
versions.

• UserObjectImp.cpp:

(UserObjectImp::put):

• UserObjectImp.h:

Source/WebCore:

No new tests.

Added static version of both versions of put to all classes that
override them and changed the virtual versions to call the static
versions.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):
(GenerateImplementation):

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::JSTestObj::put):

• bindings/scripts/test/JS/JSTestObj.h:
• bridge/objc/objc_runtime.h:
• bridge/objc/objc_runtime.mm:

(JSC::Bindings::ObjcFallbackObjectImp::put):

• bridge/runtime_array.cpp:

(JSC::RuntimeArray::put):

• bridge/runtime_array.h:
• bridge/runtime_object.cpp:

(JSC::Bindings::RuntimeObject::put):

• bridge/runtime_object.h:

Location:

trunk/Source/JavaScriptCore/API

Files:

• JSCallbackObject.h (modified) (1 diff)
• JSCallbackObjectFunctions.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -183 +183 @@
     
     virtual void put(ExecState*, const Identifier&, JSValue, PutPropertySlot&);
+    static void put(JSCell*, ExecState*, const Identifier&, JSValue, PutPropertySlot&);
 
     virtual bool deleteProperty(ExecState*, const Identifier&);

trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -204 +204 @@
 void JSCallbackObject<Parent>::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
 {
+    put(this, exec, propertyName, value, slot);
+}
+
+template <class Parent>
+void JSCallbackObject<Parent>::put(JSCell* cell, ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
+{
+    JSCallbackObject* thisObject = static_cast<JSCallbackObject*>(cell);
     JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
+    JSObjectRef thisRef = toRef(thisObject);
     RefPtr<OpaqueJSString> propertyNameRef;
     JSValueRef valueRef = toRef(exec, value);
     
-    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
             if (!propertyNameRef)
@@ -250 +257 @@
                 if (entry->attributes & kJSPropertyAttributeReadOnly)
                     return;
-                JSCallbackObject<Parent>::putDirect(exec->globalData(), propertyName, value); // put as override property
+                thisObject->JSCallbackObject<Parent>::putDirect(exec->globalData(), propertyName, value); // put as override property
                 return;
             }
@@ -256 +263 @@
     }
     
-    return Parent::put(exec, propertyName, value, slot);
+    return Parent::put(thisObject, exec, propertyName, value, slot);
 }