Changeset 196004 in webkit

Timestamp:

Feb 1, 2016 10:35:09 PM (8 years ago)

Author:

Chris Dumez

Message:

object.lookupGetter() / object.lookupSetter() does not work for native bindings
​https://bugs.webkit.org/show_bug.cgi?id=153765
<rdar://problem/24439699>

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

Add support for CustomAccessor slots to objectProtoFuncLookupGetter() and
objectProtoFuncLookupSetter() by return getOwnPropertyDescriptor().get / set.
getOwnPropertyDescriptor() now correctly deals with CustomAccessors since
r196001.

• runtime/ObjectPrototype.cpp:

(JSC::objectProtoFuncLookupGetter):
(JSC::objectProtoFuncLookupSetter):

LayoutTests:

Add layout tests to test that object.lookupGetter() / object.lookupSetter()
works for native bindings.

• js/lookupGetterGetter-native-bindings-expected.txt: Added.
• js/lookupGetterGetter-native-bindings.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/lookupGetterGetter-native-bindings-expected.txt (added)
• LayoutTests/js/lookupGetterGetter-native-bindings.html (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ObjectPrototype.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-01  Chris Dumez  <cdumez@apple.com>
+
+        object.__lookupGetter__() / object.__lookupSetter__() does not work for native bindings
+        https://bugs.webkit.org/show_bug.cgi?id=153765
+        <rdar://problem/24439699>
+
+        Reviewed by Oliver Hunt.
+
+        Add layout tests to test that object.__lookupGetter__() / object.__lookupSetter__()
+        works for native bindings.
+
+        * js/lookupGetterGetter-native-bindings-expected.txt: Added.
+        * js/lookupGetterGetter-native-bindings.html: Added.
+
 2016-02-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-01  Chris Dumez  <cdumez@apple.com>
+
+        object.__lookupGetter__() / object.__lookupSetter__() does not work for native bindings
+        https://bugs.webkit.org/show_bug.cgi?id=153765
+        <rdar://problem/24439699>
+
+        Reviewed by Oliver Hunt.
+
+        Add support for CustomAccessor slots to objectProtoFuncLookupGetter() and
+        objectProtoFuncLookupSetter() by return getOwnPropertyDescriptor().get / set.
+        getOwnPropertyDescriptor() now correctly deals with CustomAccessors since
+        r196001.
+
+        * runtime/ObjectPrototype.cpp:
+        (JSC::objectProtoFuncLookupGetter):
+        (JSC::objectProtoFuncLookupSetter):
+
 2016-02-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp

@@ -176 +176 @@
 
     PropertySlot slot(thisObject);
-    if (thisObject->getPropertySlot(exec, propertyName, slot) && slot.isAccessor()) {
-        GetterSetter* getterSetter = slot.getterSetter();
-        return getterSetter->isGetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->getter());
+    if (thisObject->getPropertySlot(exec, propertyName, slot)) {
+        if (slot.isAccessor()) {
+            GetterSetter* getterSetter = slot.getterSetter();
+            return getterSetter->isGetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->getter());
+        }
+        if (slot.attributes() & CustomAccessor) {
+            PropertyDescriptor descriptor;
+            ASSERT(slot.slotBase());
+            if (slot.slotBase()->getOwnPropertyDescriptor(exec, propertyName, descriptor))
+                return descriptor.getterPresent() ? JSValue::encode(descriptor.getter()) : JSValue::encode(jsUndefined());
+        }
     }
 
@@ -195 +203 @@
 
     PropertySlot slot(thisObject);
-    if (thisObject->getPropertySlot(exec, propertyName, slot) && slot.isAccessor()) {
-        GetterSetter* getterSetter = slot.getterSetter();
-        return getterSetter->isSetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->setter());
+    if (thisObject->getPropertySlot(exec, propertyName, slot)) {
+        if (slot.isAccessor()) {
+            GetterSetter* getterSetter = slot.getterSetter();
+            return getterSetter->isSetterNull() ? JSValue::encode(jsUndefined()) : JSValue::encode(getterSetter->setter());
+        }
+        if (slot.attributes() & CustomAccessor) {
+            PropertyDescriptor descriptor;
+            ASSERT(slot.slotBase());
+            if (slot.slotBase()->getOwnPropertyDescriptor(exec, propertyName, descriptor))
+                return descriptor.setterPresent() ? JSValue::encode(descriptor.setter()) : JSValue::encode(jsUndefined());
+        }
     }