Changeset 99136 in webkit

Timestamp:

Nov 2, 2011 9:17:54 PM (12 years ago)

Author:

weinig@apple.com

Message:

Source/JavaScriptCore: Object.getOwnPropertyDescriptor() does not retrieve the getter/setter from a property on the window that has been overridden with a getter/setter
​https://bugs.webkit.org/show_bug.cgi?id=71333

Reviewed by Gavin Barraclough.

Tested by fast/dom/getter-on-window-object2.html

• runtime/PropertyDescriptor.cpp:

(JSC::PropertyDescriptor::setDescriptor):
The attributes returned from Structure::get do not include Getter or Setter, so
instead check if the value is a GetterSetter like we do elsewhere. If it is, update
the descriptor's attributes accordingly.

LayoutTests: Object.getOwnPropertyDescriptor() does not retrieve the getter/setter from a property on the window that has been overridden with a getter/setter/
​https://bugs.webkit.org/show_bug.cgi?id=71333

Reviewed by Gavin Barraclough.

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

Update for now correct results.

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/runtime/PropertyDescriptor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-02  Sam Weinig  <sam@webkit.org>
+
+        Object.getOwnPropertyDescriptor() does not retrieve the getter/setter from a property on the window that has been overridden with a getter/setter/
+        https://bugs.webkit.org/show_bug.cgi?id=71333
+
+        Reviewed by Gavin Barraclough.
+
+        * fast/dom/getter-on-window-object2-expected.txt:
+        Update for now correct results.
+
 2011-11-02  Erik Arvidsson  <arv@chromium.org>
 

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

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-02  Sam Weinig  <sam@webkit.org>
+
+        Object.getOwnPropertyDescriptor() does not retrieve the getter/setter from a property on the window that has been overridden with a getter/setter
+        https://bugs.webkit.org/show_bug.cgi?id=71333
+
+        Reviewed by Gavin Barraclough.
+
+        Tested by fast/dom/getter-on-window-object2.html
+
+        * runtime/PropertyDescriptor.cpp:
+        (JSC::PropertyDescriptor::setDescriptor):
+        The attributes returned from Structure::get do not include Getter or Setter, so
+        instead check if the value is a GetterSetter like we do elsewhere. If it is, update
+        the descriptor's attributes accordingly.
+
 2011-11-02  Yuqiang Xian  <yuqiang.xian@intel.com>
 

trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp

@@ -89 +89 @@
     ASSERT(value);
     m_attributes = attributes;
-    if (attributes & (Getter | Setter)) {
+    if (value.isGetterSetter()) {
         GetterSetter* accessor = asGetterSetter(value);
+
         m_getter = accessor->getter();
+        if (m_getter)
+            m_attributes |= Getter;
+
         m_setter = accessor->setter();
+        if (m_setter)
+            m_attributes |= Setter;
+
         ASSERT(m_getter || m_setter);
         m_seenAttributes = EnumerablePresent | ConfigurablePresent;