Attachment 271353 Details for Bug 154245 – Patch

[patch] Patch

bug-154245-20160215120844.patch (text/plain), 6.22 KB, created by Chris Dumez on 2016-02-15 12:09:04 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2016-02-15 12:09:04 PST

Size: 6.22 KB

patch

obsolete

>Subversion Revision: 196580
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e6301c786e87ea01a29249a5fcd49d55ba47af0a..1b9ad4b8bd1cd9bf1ec5275ba9f265fc44e4ca99 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2016-02-15  Chris Dumez  <cdumez@apple.com>
>+
>+        Regression(r196563): It is no longer possible to call window.addEventListener without an explicit 'this'
>+        https://bugs.webkit.org/show_bug.cgi?id=154245
>+
>+        Reviewed by Ryosuke Niwa.
>+
>+        This patch adds support for calling the EventListener API without an
>+        explicit 'this' value. If no explicit 'this' value is passed, then we
>+        fall back to using the global object. This matches Chrome and Firefox's
>+        behavior. It also fixes the Dromaeo/cssquery-dojo.html test.
>+
>+        Test: fast/dom/Window/addEventListener-implicit-this.html
>+
>+        * bindings/scripts/CodeGeneratorJS.pm:
>+        (GenerateFunctionCastedThis):
>+
> 2016-02-15  Konstantin Tokarev  <annulen@yandex.ru>
> 
>         [cmake] Consolidated Linux-specific file lists.
>diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
>index 55551c3626061a82086b74439e77181af52f8d28..26fb9d879557440f768e6bb66ccb4af7f82a3b91 100644
>--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
>+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
>@@ -3235,7 +3235,14 @@ sub GenerateFunctionCastedThis
>         push(@implContent, "        return throwVMTypeError(state);\n");
>     } else {
>         push(@implContent, "    JSValue thisValue = state->thisValue();\n");
>-        push(@implContent, "    auto castedThis = " . GetCastingHelperForThisObject($interface) . "(thisValue);\n");
>+        my $castingHelper = GetCastingHelperForThisObject($interface);
>+        if ($interfaceName eq "EventTarget") {
>+            # 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");
>+        } else {
>+            push(@implContent, "    auto castedThis = $castingHelper(thisValue);\n");
>+        }
>         my $domFunctionName = $function->signature->name;
>         push(@implContent, "    if (UNLIKELY(!castedThis))\n");
>         push(@implContent, "        return throwThisTypeError(*state, \"$interfaceName\", \"$domFunctionName\");\n");
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 398c288ed9c463078eaf35a246767595886cca00..e36a0a68aa2eca9be39fa76075a186f34035c069 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2016-02-15  Chris Dumez  <cdumez@apple.com>
>+
>+        Regression(r196563): It is no longer possible to call window.addEventListener without an explicit 'this'
>+        https://bugs.webkit.org/show_bug.cgi?id=154245
>+
>+        Reviewed by Ryosuke Niwa.
>+
>+        Add a layout test to cover the use of the EventListener API without an
>+        explicit 'this' value.
>+
>+        * fast/dom/Window/addEventListener-implicit-this-expected.txt: Added.
>+        * fast/dom/Window/addEventListener-implicit-this.html: Added.
>+
> 2016-02-15  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Rebaseline imported/w3c/web-platform-tests/html/dom/interfaces.html for ios-simulator after r196563
>diff --git a/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt b/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4acfdfa171ed6e046e70be5acaa33774bf9dcf7a
>--- /dev/null
>+++ b/LayoutTests/fast/dom/Window/addEventListener-implicit-this-expected.txt
>@@ -0,0 +1,16 @@
>+Checks that the Window's EventListener API can be called without an explicit 'this' value.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS addEventListenerFunction.call(undefined, 'myevent', function() { wasWindowEventListenerCalled = true; }); did not throw exception.
>+PASS dispatchEventFunction.call(undefined, new Event('myevent')) is true
>+PASS wasWindowEventListenerCalled is true
>+PASS bodyDispatchEventFunction.call(undefined, new Event('myevent')) is true
>+PASS wasWindowEventListenerCalled is true
>+PASS xhrDispatchEventFunction.call(undefined, new Event('myevent')) is true
>+PASS wasWindowEventListenerCalled is true
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html b/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2ce8b04e01aa78f6d08bcd29837f8bd77091b048
>--- /dev/null
>+++ b/LayoutTests/fast/dom/Window/addEventListener-implicit-this.html
>@@ -0,0 +1,38 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<script src="../../../resources/js-test-pre.js"></script>
>+<script>
>+description("Checks that the Window's EventListener API can be called without an explicit 'this' value.");
>+
>+var wasWindowEventListenerCalled = false;
>+
>+var addEventListenerFunction = window.addEventListener;
>+shouldNotThrow("addEventListenerFunction.call(undefined, 'myevent', function() { wasWindowEventListenerCalled = true; });");
>+
>+var dispatchEventFunction = window.dispatchEvent;
>+shouldBeTrue("dispatchEventFunction.call(undefined, new Event('myevent'))");
>+
>+shouldBeTrue("wasWindowEventListenerCalled");
>+
>+// As of early 2016, this matches Firefox and Chrome's behavior: We fall back to using the global window, even if the function
>+// came from a non-Window object.
>+wasWindowEventListenerCalled = false;
>+
>+bodyDispatchEventFunction = document.body.dispatchEvent;
>+shouldBeTrue("bodyDispatchEventFunction.call(undefined, new Event('myevent'))");
>+
>+shouldBeTrue("wasWindowEventListenerCalled");
>+
>+wasWindowEventListenerCalled = false;
>+
>+var xhr = new XMLHttpRequest();
>+xhrDispatchEventFunction = xhr.dispatchEvent;
>+shouldBeTrue("xhrDispatchEventFunction.call(undefined, new Event('myevent'))");
>+
>+shouldBeTrue("wasWindowEventListenerCalled");
>+
>+</script>
>+<script src="../../../resources/js-test-post.js"></script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 154245: 271346 | 271353