Changeset 97506 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Oct 14, 2011, 2:18:38 PM (14 years ago)

Author:

[email protected]

Message:

Rename virtual deleteProperty to deletePropertyVirtual
​https://bugs.webkit.org/show_bug.cgi?id=69884

Reviewed by Darin Adler.

Source/JavaScriptCore:

Renamed virtual versions of deleteProperty to deletePropertyVirtual in prepration for
adding the static deleteProperty to the MethodTable in ClassInfo since the
compiler gets mad if the virtual and static versions have the same name.

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

(JSC::::deletePropertyVirtual):
(JSC::::deleteProperty):

• API/JSObjectRef.cpp:

(JSObjectDeleteProperty):

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

(JSC::DebuggerActivation::deletePropertyVirtual):
(JSC::DebuggerActivation::deleteProperty):

• debugger/DebuggerActivation.h:
• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/Arguments.cpp:

(JSC::Arguments::deletePropertyVirtual):

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

(JSC::arrayProtoFuncPop):
(JSC::arrayProtoFuncReverse):
(JSC::arrayProtoFuncShift):
(JSC::arrayProtoFuncSplice):
(JSC::arrayProtoFuncUnShift):

• runtime/JSActivation.cpp:

(JSC::JSActivation::deletePropertyVirtual):

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

(JSC::JSArray::deletePropertyVirtual):
(JSC::JSArray::deleteProperty):

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

(JSC::JSCell::deletePropertyVirtual):
(JSC::JSCell::deleteProperty):

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

(JSC::JSFunction::deletePropertyVirtual):

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

(JSC::JSNotAnObject::deletePropertyVirtual):

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

(JSC::Walker::walk):

• runtime/JSObject.cpp:

(JSC::JSObject::deletePropertyVirtual):
(JSC::JSObject::deleteProperty):
(JSC::JSObject::defineOwnProperty):

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

(JSC::JSVariableObject::deletePropertyVirtual):

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

(JSC::RegExpMatchesArray::deletePropertyVirtual):

• runtime/StrictEvalActivation.cpp:

(JSC::StrictEvalActivation::deletePropertyVirtual):

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

(JSC::StringObject::deletePropertyVirtual):

• runtime/StringObject.h:

Source/WebCore:

No new tests.

Renamed virtual versions of deleteProperty to deletePropertyVirtual in prepration for
adding the static deleteProperty to the MethodTable in ClassInfo since the
compiler gets mad if the virtual and static versions have the same name.

• WebCore.exp.in:
• bindings/js/JSDOMStringMapCustom.cpp:

(WebCore::JSDOMStringMap::deletePropertyVirtual):

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::deletePropertyVirtual):

• bindings/js/JSDOMWindowShell.cpp:

(WebCore::JSDOMWindowShell::deletePropertyVirtual):

• bindings/js/JSDOMWindowShell.h:
• bindings/js/JSHistoryCustom.cpp:

(WebCore::JSHistory::deletePropertyVirtual):

• bindings/js/JSLocationCustom.cpp:

(WebCore::JSLocation::deletePropertyVirtual):

• bindings/js/JSStorageCustom.cpp:

(WebCore::JSStorage::deletePropertyVirtual):

• bindings/js/ScriptObject.cpp:

(WebCore::ScriptGlobalObject::remove):

• bindings/objc/WebScriptObject.mm:

(-[WebScriptObject removeWebScriptKey:]):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

• bridge/NP_jsobject.cpp:

(_NPN_RemoveProperty):

• bridge/jni/jni_jsobject.mm:

(JavaJSObject::removeMember):

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

(JSC::Bindings::ObjcFallbackObjectImp::deletePropertyVirtual):

• bridge/runtime_array.cpp:

(JSC::RuntimeArray::deletePropertyVirtual):

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

(JSC::Bindings::RuntimeObject::deletePropertyVirtual):

• bridge/runtime_object.h:

Source/WebKit/mac:

Renamed virtual versions of deleteProperty to deletePropertyVirtual in prepration for
adding the static deleteProperty to the MethodTable in ClassInfo since the
compiler gets mad if the virtual and static versions have the same name.

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::removeProperty):

Source/WebKit2:

Renamed virtual versions of deleteProperty to deletePropertyVirtual in prepration for
adding the static deleteProperty to the MethodTable in ClassInfo since the
compiler gets mad if the virtual and static versions have the same name.

• WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit::JSNPObject::deletePropertyVirtual):
(WebKit::JSNPObject::deleteProperty):

• WebProcess/Plugins/Netscape/JSNPObject.h:
• WebProcess/Plugins/Netscape/NPJSObject.cpp:

(WebKit::NPJSObject::removeProperty):

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -248 +248 @@
 }
 
-bool JSObject::deleteProperty(ExecState* exec, const Identifier& propertyName)
+bool JSObject::deletePropertyVirtual(ExecState* exec, const Identifier& propertyName)
 {
     return deleteProperty(this, exec, propertyName);
@@ -281 +281 @@
 }
 
-bool JSObject::deleteProperty(ExecState* exec, unsigned propertyName)
+bool JSObject::deletePropertyVirtual(ExecState* exec, unsigned propertyName)
 {
     return deleteProperty(this, exec, propertyName);
@@ -288 +288 @@
 bool JSObject::deleteProperty(JSCell* cell, ExecState* exec, unsigned propertyName)
 {
-    return static_cast<JSObject*>(cell)->deleteProperty(exec, Identifier::from(exec, propertyName));
+    return static_cast<JSObject*>(cell)->deletePropertyVirtual(exec, Identifier::from(exec, propertyName));
 }
 
@@ -728 +728 @@
     if (descriptor.isGenericDescriptor()) {
         if (!current.attributesEqual(descriptor)) {
-            deleteProperty(exec, propertyName);
+            deletePropertyVirtual(exec, propertyName);
             putDescriptor(exec, this, propertyName, descriptor, current.attributesWithOverride(descriptor), current);
         }
@@ -741 +741 @@
             return false;
         }
-        deleteProperty(exec, propertyName);
+        deletePropertyVirtual(exec, propertyName);
         return putDescriptor(exec, this, propertyName, descriptor, current.attributesWithOverride(descriptor), current);
     }
@@ -769 +769 @@
             return true;
         }
-        deleteProperty(exec, propertyName);
+        deletePropertyVirtual(exec, propertyName);
         return putDescriptor(exec, this, propertyName, descriptor, current.attributesWithOverride(descriptor), current);
     }
@@ -798 +798 @@
         return true;
     }
-    deleteProperty(exec, propertyName);
+    deletePropertyVirtual(exec, propertyName);
     unsigned attrs = current.attributesWithOverride(descriptor);
     if (descriptor.setter())