Changeset 53706 in webkit

Timestamp:

Jan 22, 2010 11:09:47 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-22 Kent Hansen <​kent.hansen@nokia.com>

Reviewed by Darin Adler.

Object.getOwnPropertyDescriptor(window) returns descriptors for properties in the prototype chain
​https://bugs.webkit.org/show_bug.cgi?id=33948

Even though prototype properties are proxied by JSDOMWindow::getOwnPropertySlot(),
that proxying should not be performed by JSDOMWindow::getOwnPropertyDescriptor().

This makes getOwnPropertyDescriptor() consistent with getOwnPropertyNames().

Test: fast/dom/Window/window-property-descriptors.html

• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::getOwnPropertyDescriptor):

Location:

trunk

Files:

• LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js (added)
• LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt (added)
• LayoutTests/fast/dom/Window/window-property-descriptors.html (added)
• LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt (added)
• LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-22  Kent Hansen  <kent.hansen@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Object.getOwnPropertyDescriptor(window) returns descriptors for properties in the prototype chain
+        https://bugs.webkit.org/show_bug.cgi?id=33948
+
+        Even though prototype properties are proxied by JSDOMWindow::getOwnPropertySlot(),
+        that proxying should not be performed by JSDOMWindow::getOwnPropertyDescriptor().
+
+        This makes getOwnPropertyDescriptor() consistent with getOwnPropertyNames().
+
+        Test: fast/dom/Window/window-property-descriptors.html
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::getOwnPropertyDescriptor):
+
 2010-01-22  Girish Ramakrishnan  <girish@forwardbias.in>
 

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -326 +326 @@
     }
 
-    // We need this code here because otherwise JSDOMWindowBase will stop the search before we even get to the
-    // prototype due to the blanket same origin (allowsAccessFrom) check at the end of getOwnPropertySlot.
-    // Also, it's important to get the implementation straight out of the DOMWindow prototype regardless of
-    // what prototype is actually set on this object.
-    entry = JSDOMWindowPrototype::s_info.propHashTable(exec)->entry(exec, propertyName);
-    if (entry) {
-        if (entry->attributes() & Function) {
-            if (entry->function() == jsDOMWindowPrototypeFunctionShowModalDialog) {
-                if (!DOMWindow::canShowModalDialog(impl()->frame())) {
-                    descriptor.setUndefined();
-                    return true;
-                }
-            }
-        }
-    }
-    
     entry = JSDOMWindow::s_info.propHashTable(exec)->entry(exec, propertyName);
     if (entry) {
@@ -362 +346 @@
     }
     
-    // Do prototype lookup early so that functions and attributes in the prototype can have
-    // precedence over the index and name getters.  
-    JSValue proto = prototype();
-    if (proto.isObject()) {
-        if (asObject(proto)->getPropertyDescriptor(exec, propertyName, descriptor))
-            return true;
-    }
-
     bool ok;
     unsigned i = propertyName.toArrayIndex(&ok);