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

Timestamp:

Nov 1, 2011, 7:24:50 PM (14 years ago)

Author:

[email protected]

Message:

Implement lookupGetter/lookupSetter in terms of getPropertyDescriptor
​https://bugs.webkit.org/show_bug.cgi?id=71336

Reviewed by Darin Adler.

Source/JavaScriptCore:

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

Remove overrides of lookupGetter/lookupSetter, which are no longer needed
due to implementing getPropertyDescriptor.

• runtime/JSObject.cpp:

(JSC::JSObject::lookupGetter):
(JSC::JSObject::lookupSetter):

• runtime/JSObject.h:

De-virtualize lookupGetter/lookupSetter, and implement them in terms of
getPropertyDescriptor.

Source/WebCore:

• bindings/js/JSDOMWindowCustom.cpp:
• bindings/js/JSDOMWindowShell.cpp:
• bindings/js/JSDOMWindowShell.h:
• page/DOMWindow.idl:

Remove overrides of lookupGetter/lookupSetter, which are no longer needed
due to implementing getPropertyDescriptor.

LayoutTests:

• fast/dom/getter-on-window-object2-expected.txt:

Update results now that lookupGetter/lookupSetter match getOwnPropertyDescriptor.
The failures are tracked by ​https://bugs.webkit.org/show_bug.cgi?id=71333.

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -435 +435 @@
 JSValue JSObject::lookupGetter(ExecState* exec, const Identifier& propertyName)
 {
-    JSObject* object = this;
-    while (true) {
-        if (JSValue value = object->getDirect(exec->globalData(), propertyName)) {
-            if (!value.isGetterSetter())
-                return jsUndefined();
-            JSObject* functionObject = asGetterSetter(value)->getter();
-            if (!functionObject)
-                return jsUndefined();
-            return functionObject;
-        }
-
-        if (!object->prototype() || !object->prototype().isObject())
-            return jsUndefined();
-        object = asObject(object->prototype());
-    }
+    PropertyDescriptor descriptor;
+    if (!getPropertyDescriptor(exec, propertyName, descriptor))
+        return jsUndefined();
+
+    if (!descriptor.getterPresent())
+        return jsUndefined();
+
+    return descriptor.getter();
 }
 
 JSValue JSObject::lookupSetter(ExecState* exec, const Identifier& propertyName)
 {
-    JSObject* object = this;
-    while (true) {
-        if (JSValue value = object->getDirect(exec->globalData(), propertyName)) {
-            if (!value.isGetterSetter())
-                return jsUndefined();
-            JSObject* functionObject = asGetterSetter(value)->setter();
-            if (!functionObject)
-                return jsUndefined();
-            return functionObject;
-        }
-
-        if (!object->prototype() || !object->prototype().isObject())
-            return jsUndefined();
-        object = asObject(object->prototype());
-    }
+    PropertyDescriptor descriptor;
+    if (!getPropertyDescriptor(exec, propertyName, descriptor))
+        return jsUndefined();
+
+    if (!descriptor.setterPresent())
+        return jsUndefined();
+    
+    return descriptor.setter();
 }