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

Timestamp:

Nov 3, 2011, 6:32:18 PM (14 years ago)

Author:

[email protected]

Message:

De-virtualize JSObject::getPropertyNames
​https://bugs.webkit.org/show_bug.cgi?id=71306

Reviewed by Darin Adler.

Source/JavaScriptCore:

Added getPropertyNames to the MethodTable, changed all the virtual
implementations of getPropertyNames to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

• API/JSObjectRef.cpp:

(JSObjectCopyPropertyNames):

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

(JSC::DebuggerActivation::getOwnPropertyNames):

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

(JSC::JSCell::getPropertyNames):

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

(JSC::JSObject::getPropertyNames):
(JSC::JSObject::getOwnPropertyNames):

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

(JSC::JSPropertyNameIterator::create):

• runtime/ScopeChain.cpp:

(JSC::ScopeChainNode::print):

• runtime/Structure.cpp:

(JSC::Structure::getPropertyNamesFromStructure):

• runtime/Structure.h:

Source/JavaScriptGlue:

Added getPropertyNames to the MethodTable, changed all the virtual
implementations of getPropertyNames to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

• JSUtils.cpp:

(KJSValueToCFTypeInternal):

• JSValueWrapper.cpp:

(JSValueWrapper::JSObjectCopyPropertyNames):

Source/WebCore:

No new tests.

Added getPropertyNames to the MethodTable, changed all the virtual
implementations of getPropertyNames to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::getPropertyNames):

• bindings/js/JSDOMWindowShell.cpp:

(WebCore::JSDOMWindowShell::getPropertyNames):

• bindings/js/JSDOMWindowShell.h:
• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

• bridge/NP_jsobject.cpp:

(_NPN_Enumerate):

• bridge/qt/qt_runtime.cpp:

(JSC::Bindings::convertValueToQVariantMap):

Source/WebKit/mac:

Added getPropertyNames to the MethodTable, changed all the virtual
implementations of getPropertyNames to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::enumerate):

Source/WebKit2:

Added getPropertyNames to the MethodTable, changed all the virtual
implementations of getPropertyNames to static ones, and replaced
all call sites with corresponding lookups in the MethodTable.

• WebProcess/Plugins/Netscape/NPJSObject.cpp:

(WebKit::NPJSObject::enumerate):

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -496 +496 @@
 }
 
-void JSObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
-{
-    methodTable()->getOwnPropertyNames(this, exec, propertyNames, mode);
-
-    if (prototype().isNull())
-        return;
-
-    JSObject* prototype = asObject(this->prototype());
+void JSObject::getPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
+{
+    object->methodTable()->getOwnPropertyNames(object, exec, propertyNames, mode);
+
+    if (object->prototype().isNull())
+        return;
+
+    JSObject* prototype = asObject(object->prototype());
     while(1) {
         if (prototype->structure()->typeInfo().overridesGetPropertyNames()) {
-            prototype->getPropertyNames(exec, propertyNames, mode);
+            prototype->methodTable()->getPropertyNames(prototype, exec, propertyNames, mode);
             break;
         }
@@ -519 +519 @@
 void JSObject::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
 {
-    object->structure()->getPropertyNames(exec->globalData(), propertyNames, mode);
+    object->structure()->getPropertyNamesFromStructure(exec->globalData(), propertyNames, mode);
     if (!object->staticFunctionsReified())
         getClassPropertyNames(exec, object->classInfo(), propertyNames, mode);