Changeset 99034 in webkit

Timestamp:

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

Author:

weinig@apple.com

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/getter-on-window-object2-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• Source/JavaScriptCore/debugger/DebuggerActivation.cpp (modified) (1 diff)
• Source/JavaScriptCore/debugger/DebuggerActivation.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSObject.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSObject.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMWindowShell.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMWindowShell.h (modified) (1 diff)
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-01  Sam Weinig  <sam@webkit.org>
+
+        Implement __lookupGetter__/__lookupSetter__ in terms of getPropertyDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=71336
+
+        Reviewed by Darin Adler.
+
+        * 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.
+
 2011-11-01  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/LayoutTests/fast/dom/getter-on-window-object2-expected.txt

@@ -13 +13 @@
 
 PASS window.y is 'window.y __getter__'
-PASS typeof window.__lookupGetter__('y') is 'function'
+FAIL typeof window.__lookupGetter__('y') should be function. Was undefined.
 FAIL typeof Object.getOwnPropertyDescriptor(window, 'y').get should be function. Was undefined.
 
 PASS window.y is 'window.y __getter__'
-PASS typeof window.__lookupGetter__('y') is 'function'
+FAIL typeof window.__lookupGetter__('y') should be function. Was undefined.
 FAIL typeof Object.getOwnPropertyDescriptor(window, 'y').get should be function. Was undefined.
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-01  Sam Weinig  <sam@webkit.org>
+
+        Implement __lookupGetter__/__lookupSetter__ in terms of getPropertyDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=71336
+
+        Reviewed by Darin Adler.
+
+        * 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.
+
 2011-11-01  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -241 +241 @@
     ?lockAtomicallyInitializedStaticMutex@WTF@@YAXXZ
     ?lockCount@JSLock@JSC@@SAHXZ
-    ?lookupGetter@JSObject@JSC@@UAE?AVJSValue@2@PAVExecState@2@ABVIdentifier@2@@Z
-    ?lookupSetter@JSObject@JSC@@UAE?AVJSValue@2@PAVExecState@2@ABVIdentifier@2@@Z
     ?match@RegExp@JSC@@QAEHAAVJSGlobalData@2@ABVUString@2@HPAV?$Vector@H$0CA@@WTF@@@Z
     ?materializePropertyMap@Structure@JSC@@AAEXAAVJSGlobalData@2@@Z

trunk/Source/JavaScriptCore/debugger/DebuggerActivation.cpp

@@ -106 +106 @@
 }
 
-JSValue DebuggerActivation::lookupGetter(ExecState* exec, const Identifier& propertyName)
-{
-    return m_activation->lookupGetter(exec, propertyName);
-}
-
-JSValue DebuggerActivation::lookupSetter(ExecState* exec, const Identifier& propertyName)
-{
-    return m_activation->lookupSetter(exec, propertyName);
-}
-
 } // namespace JSC

trunk/Source/JavaScriptCore/debugger/DebuggerActivation.h

@@ -52 +52 @@
         static void defineGetter(JSObject*, ExecState*, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes);
         static void defineSetter(JSObject*, ExecState*, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes);
-        virtual JSValue lookupGetter(ExecState*, const Identifier& propertyName);
-        virtual JSValue lookupSetter(ExecState*, const Identifier& propertyName);
 
         static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype) 

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();
 }
 

trunk/Source/JavaScriptCore/runtime/JSObject.h

@@ -188 +188 @@
         static void defineGetter(JSObject*, ExecState*, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes = 0);
         static void defineSetter(JSObject*, ExecState*, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes = 0);
-        virtual JSValue lookupGetter(ExecState*, const Identifier& propertyName);
-        virtual JSValue lookupSetter(ExecState*, const Identifier& propertyName);
+        JSValue lookupGetter(ExecState*, const Identifier& propertyName);
+        JSValue lookupSetter(ExecState*, const Identifier& propertyName);
         virtual bool defineOwnProperty(ExecState*, const Identifier& propertyName, PropertyDescriptor&, bool shouldThrow);
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-01  Sam Weinig  <sam@webkit.org>
+
+        Implement __lookupGetter__/__lookupSetter__ in terms of getPropertyDescriptor
+        https://bugs.webkit.org/show_bug.cgi?id=71336
+
+        Reviewed by Darin Adler.
+
+        * 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.
+
+
 2011-11-01  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -416 +416 @@
 }
 
-JSValue JSDOMWindow::lookupGetter(ExecState* exec, const Identifier& propertyName)
-{
-    // Only allow looking-up getters by frames in the same origin.
-    if (!allowsAccessFrom(exec))
-        return jsUndefined();
-    return Base::lookupGetter(exec, propertyName);
-}
-
-JSValue JSDOMWindow::lookupSetter(ExecState* exec, const Identifier& propertyName)
-{
-    // Only allow looking-up setters by frames in the same origin.
-    if (!allowsAccessFrom(exec))
-        return jsUndefined();
-    return Base::lookupSetter(exec, propertyName);
-}
-
 // Custom Attributes
 

trunk/Source/WebCore/bindings/js/JSDOMWindowShell.cpp

@@ -145 +145 @@
 }
 
-JSValue JSDOMWindowShell::lookupGetter(ExecState* exec, const Identifier& propertyName)
-{
-    return window()->lookupGetter(exec, propertyName);
-}
-
-JSValue JSDOMWindowShell::lookupSetter(ExecState* exec, const Identifier& propertyName)
-{
-    return window()->lookupSetter(exec, propertyName);
-}
-
 
 // ----

trunk/Source/WebCore/bindings/js/JSDOMWindowShell.h

@@ -90 +90 @@
         static void defineSetter(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSObject* setterFunction, unsigned attributes);
         virtual bool defineOwnProperty(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&, bool shouldThrow);
-        virtual JSC::JSValue lookupGetter(JSC::ExecState*, const JSC::Identifier& propertyName);
-        virtual JSC::JSValue lookupSetter(JSC::ExecState*, const JSC::Identifier& propertyName);
 
         RefPtr<DOMWrapperWorld> m_world;

trunk/Source/WebCore/page/DOMWindow.idl

@@ -34 +34 @@
         CustomGetOwnPropertySlot,
         CustomGetPropertyNames,
-        CustomLookupGetter,
-        CustomLookupSetter,
         CustomMarkFunction,
         CustomNativeConverter,