Changeset 166554 in webkit for trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Mar 31, 2014, 6:10:35 PM (11 years ago)

Author:

[email protected]

Message:

REGRESSION(r166415): JSObject{Get,Set}Private() don't work with proxies objects
​https://bugs.webkit.org/show_bug.cgi?id=130992

Reviewed by Mark Hahnenberg.

Forward JSObjectGetPrivate() and JSObjectSetPrivate() to the wrapped object.

• API/JSObjectRef.cpp:

(JSObjectGetPrivate):
(JSObjectSetPrivate):

• API/tests/testapi.c:

(main): Added new test case to validate we are properly foarwarding.

File:

• trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

@@ -452 +452 @@
 {
     JSObject* jsObject = uncheckedToJS(object);
-    
+
+    // Get wrapped object if proxied
+    if (jsObject->inherits(JSProxy::info()))
+        jsObject = jsCast<JSProxy*>(jsObject)->target();
+
     if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info()))
         return jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivate();
@@ -468 +472 @@
 {
     JSObject* jsObject = uncheckedToJS(object);
-    
+
+    // Get wrapped object if proxied
+    if (jsObject->inherits(JSProxy::info()))
+        jsObject = jsCast<JSProxy*>(jsObject)->target();
+
     if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info())) {
         jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivate(data);