Changeset 97002 in webkit for trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

Timestamp:

Oct 7, 2011, 11:37:45 PM (14 years ago)

Author:

[email protected]

Message:

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

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. This is the first step in de-virtualizing JSCell::deleteProperty.

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

(JSC::::deleteProperty):

• debugger/DebuggerActivation.cpp:

(JSC::DebuggerActivation::deleteProperty):

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

(JSC::Arguments::deleteProperty):

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

(JSC::JSActivation::deleteProperty):

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

(JSC::JSArray::deleteProperty):

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

(JSC::JSCell::deleteProperty):

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

(JSC::JSFunction::deleteProperty):

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

(JSC::JSNotAnObject::deleteProperty):

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

(JSC::JSObject::deleteProperty):

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

(JSC::JSVariableObject::deleteProperty):

• runtime/JSVariableObject.h:
• runtime/RegExpMatchesArray.h:

(JSC::RegExpMatchesArray::deleteProperty):

• runtime/StrictEvalActivation.cpp:

(JSC::StrictEvalActivation::deleteProperty):

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

(JSC::StringObject::deleteProperty):

• runtime/StringObject.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. This is the first step in de-virtualizing JSCell::deleteProperty.

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

(JSC::Bindings::ObjcFallbackObjectImp::deleteProperty):

• bridge/runtime_array.cpp:

(JSC::RuntimeArray::deleteProperty):

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

(JSC::Bindings::RuntimeObject::deleteProperty):

• bridge/runtime_object.h:

File:

• trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -269 +269 @@
 bool JSCallbackObject<Parent>::deleteProperty(ExecState* exec, const Identifier& propertyName)
 {
+    return deleteProperty(this, exec, propertyName);
+}
+
+template <class Parent>
+bool JSCallbackObject<Parent>::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& propertyName)
+{
+    JSCallbackObject* thisObject = static_cast<JSCallbackObject*>(cell);
     JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
+    JSObjectRef thisRef = toRef(thisObject);
     RefPtr<OpaqueJSString> propertyNameRef;
     
-    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
             if (!propertyNameRef)
@@ -306 +313 @@
     }
     
-    return Parent::deleteProperty(exec, propertyName);
+    return Parent::deleteProperty(thisObject, exec, propertyName);
 }
 
@@ -312 +319 @@
 bool JSCallbackObject<Parent>::deleteProperty(ExecState* exec, unsigned propertyName)
 {
-    return deleteProperty(exec, Identifier::from(exec, propertyName));
+    return deleteProperty(this, exec, propertyName);
+}
+
+template <class Parent>
+bool JSCallbackObject<Parent>::deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
+{
+    return static_cast<JSCallbackObject*>(cell)->deleteProperty(exec, Identifier::from(exec, propertyName));
 }