Changeset 154444 in webkit

Timestamp:

Aug 22, 2013 5:46:16 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] DRT bug revealed/caused by r154300
​https://bugs.webkit.org/show_bug.cgi?id=120151

Reviewed by Simon Hausmann.

Since QtInstance had an implementation of getOwnPropertySlot and not getOwnPropertyDescriptor,
the behavior of getOwnPropertyDescriptor changed when it got implemented using getOwnPropertySlot
in r154300.

DRT relied on getOwnPropertyDescriptor returning undefined for JS set properties to distinguish
between native Qt methods and JSC bound methods. This patch changes the check to see if the
property is writable since the Qt methods are ReadOnly.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(DumpRenderTree::initJSObjects):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-22  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] DRT bug revealed/caused by r154300
+        https://bugs.webkit.org/show_bug.cgi?id=120151
+
+        Reviewed by Simon Hausmann.
+
+        Since QtInstance had an implementation of getOwnPropertySlot and not getOwnPropertyDescriptor,
+        the behavior of getOwnPropertyDescriptor changed when it got implemented using getOwnPropertySlot
+        in r154300.
+
+        DRT relied on getOwnPropertyDescriptor returning undefined for JS set properties to distinguish
+        between native Qt methods and JSC bound methods. This patch changes the check to see if the 
+        property is writable since the Qt methods are ReadOnly.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (DumpRenderTree::initJSObjects):
+
 2013-08-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -774 +774 @@
                                                                                    "for (var prop in this.jscBasedTestRunner) {\n"
                                                                                    "    var pd = Object.getOwnPropertyDescriptor(this.qtBasedTestRunner, prop);\n"
-                                                                                   "    if (pd !== undefined) continue;\n"
+                                                                                   "    if (pd !== undefined && !pd.writable) continue;\n"
                                                                                    "    pd = Object.getOwnPropertyDescriptor(this.jscBasedTestRunner, prop);\n"
                                                                                    "    this.qtBasedTestRunner[prop] = bind(this.jscBasedTestRunner[prop], this.jscBasedTestRunner);\n"