Changeset 197098 in webkit

Timestamp:

Feb 25, 2016, 4:49:14 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196961 - REGRESSION (r196563): Images not loading on ​https://klim.co.nz/blog/paypal-sans-design-information/
​https://bugs.webkit.org/show_bug.cgi?id=154547
<rdar://problem/24772167>

Reviewed by Gavin Barraclough.

Source/WebCore:

The Website was doing the following:
$ var e = window.addEventListener;
$ e("eventname", handler)

In such case, the jsEventTargetPrototypeFunctionDispatchEvent() bindings
implementation was caused with a thisValue which is a JSLexicalEnvironment
and the implementation did not know how to convert it into a global object.
The previous implementation on JSDOMWindow used to handle tis correctly
because it was always calling JSValue::toThis() on the thisValue before
trying to cast it to a JSDOMWindow, and JSLexicalEnvironment::toThis()
gets the globalThisValue. This patch updates the EventTarget bindings
code to call always call toThis() on the thisValue before trying to
cast it. This should correctly deal with JSLexicalEnvironment and be a
no-op in usual cases.

No new tests, extended existing test.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateFunctionCastedThis):

LayoutTests:

Add regression test for <rdar://problem/24772167>.

• fast/dom/Window/addEventListener-implicit-this-expected.txt:
• fast/dom/Window/addEventListener-implicit-this.html:

Location:

releases/WebKitGTK/webkit-2.12

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/Window/addEventListener-implicit-this.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)

releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-22  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION (r196563): Images not loading on https://klim.co.nz/blog/paypal-sans-design-information/
+        https://bugs.webkit.org/show_bug.cgi?id=154547
+        <rdar://problem/24772167>
+
+        Reviewed by Gavin Barraclough.
+
+        Add regression test for <rdar://problem/24772167>.
+
+        * fast/dom/Window/addEventListener-implicit-this-expected.txt:
+        * fast/dom/Window/addEventListener-implicit-this.html:
+
 2016-02-22  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.12/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt

@@ -11 +11 @@
 PASS xhrDispatchEventFunction.call(undefined, new Event('myevent')) is true
 PASS wasWindowEventListenerCalled is true
+PASS addEventListenerFunction('myevent2', function() { wasWindowEventListenerCalled = true; }); did not throw exception.
+PASS window.dispatchEvent(new Event('myevent2')) is true
+PASS wasWindowEventListenerCalled is true
 PASS successfullyParsed is true
 

releases/WebKitGTK/webkit-2.12/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html

@@ -33 +33 @@
 shouldBeTrue("wasWindowEventListenerCalled");
 
+wasWindowEventListenerCalled = false;
+shouldNotThrow("addEventListenerFunction('myevent2', function() { wasWindowEventListenerCalled = true; });");
+shouldBeTrue("window.dispatchEvent(new Event('myevent2'))");
+shouldBeTrue("wasWindowEventListenerCalled");
+
+
 </script>
 <script src="../../../resources/js-test-post.js"></script>

releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-22  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION (r196563): Images not loading on https://klim.co.nz/blog/paypal-sans-design-information/
+        https://bugs.webkit.org/show_bug.cgi?id=154547
+        <rdar://problem/24772167>
+
+        Reviewed by Gavin Barraclough.
+
+        The Website was doing the following:
+        $ var e = window.addEventListener;
+        $ e("eventname", handler)
+
+        In such case, the jsEventTargetPrototypeFunctionDispatchEvent() bindings
+        implementation was caused with a thisValue which is a JSLexicalEnvironment
+        and the implementation did not know how to convert it into a global object.
+        The previous implementation on JSDOMWindow used to handle tis correctly
+        because it was always calling JSValue::toThis() on the thisValue before
+        trying to cast it to a JSDOMWindow, and JSLexicalEnvironment::toThis()
+        gets the globalThisValue. This patch updates the EventTarget bindings
+        code to call always call toThis() on the thisValue before trying to
+        cast it. This should correctly deal with JSLexicalEnvironment and be a
+        no-op in usual cases.
+
+        No new tests, extended existing test.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateFunctionCastedThis):
+
 2016-02-22  Simon Fraser  <simon.fraser@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -3234 +3234 @@
             # We allow calling the EventTarget API without an explicit 'this' value and fall back to using the global object instead.
             # As of early 2016, this matches Firefox and Chrome's behavior.
-            push(@implContent, "    auto castedThis = thisValue.isUndefinedOrNull() ? $castingHelper(thisValue.toThis(state, NotStrictMode)) : $castingHelper(thisValue);\n");
+            push(@implContent, "    auto castedThis = $castingHelper(thisValue.toThis(state, NotStrictMode));\n");
         } else {
             push(@implContent, "    auto castedThis = $castingHelper(thisValue);\n");