Title: [264674] trunk
Revision
264674
Author
ysuz...@apple.com
Date
2020-07-21 13:35:28 -0700 (Tue, 21 Jul 2020)

Log Message

Use CatchScope in microtask execution
https://bugs.webkit.org/show_bug.cgi?id=214600
<rdar://problem/65881165>

Reviewed by Mark Lam.

Source/WebCore:

Test: js/dom/microtask-drain-should-use-catch-scope.html

Use CatchScope to suppress JSC_validateExceptionChecks.

* bindings/js/JSMicrotaskCallback.h:
(WebCore::JSMicrotaskCallback::call):

LayoutTests:

* js/dom/microtask-drain-should-use-catch-scope-expected.txt: Added.
* js/dom/microtask-drain-should-use-catch-scope.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (264673 => 264674)


--- trunk/LayoutTests/ChangeLog	2020-07-21 19:36:56 UTC (rev 264673)
+++ trunk/LayoutTests/ChangeLog	2020-07-21 20:35:28 UTC (rev 264674)
@@ -1,3 +1,14 @@
+2020-07-21  Yusuke Suzuki  <ysuz...@apple.com>
+
+        Use CatchScope in microtask execution
+        https://bugs.webkit.org/show_bug.cgi?id=214600
+        <rdar://problem/65881165>
+
+        Reviewed by Mark Lam.
+
+        * js/dom/microtask-drain-should-use-catch-scope-expected.txt: Added.
+        * js/dom/microtask-drain-should-use-catch-scope.html: Added.
+
 2020-07-21  Youenn Fablet  <you...@apple.com>
 
         NetworkConnectionToWebProcess should not handle NetworkRTCProvider messages

Added: trunk/LayoutTests/js/dom/microtask-drain-should-use-catch-scope-expected.txt (0 => 264674)


--- trunk/LayoutTests/js/dom/microtask-drain-should-use-catch-scope-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/js/dom/microtask-drain-should-use-catch-scope-expected.txt	2020-07-21 20:35:28 UTC (rev 264674)
@@ -0,0 +1,9 @@
+Use CatchScope in microtask draining
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/js/dom/microtask-drain-should-use-catch-scope.html (0 => 264674)


--- trunk/LayoutTests/js/dom/microtask-drain-should-use-catch-scope.html	                        (rev 0)
+++ trunk/LayoutTests/js/dom/microtask-drain-should-use-catch-scope.html	2020-07-21 20:35:28 UTC (rev 264674)
@@ -0,0 +1,13 @@
+<!DOCTYPE html><!-- webkit-test-runner [ jscOptions=--validateExceptionChecks=true ] -->
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<script>
+description("Use CatchScope in microtask draining");
+Promise.resolve().then().then();
+</script>
+<script src=""
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (264673 => 264674)


--- trunk/Source/WebCore/ChangeLog	2020-07-21 19:36:56 UTC (rev 264673)
+++ trunk/Source/WebCore/ChangeLog	2020-07-21 20:35:28 UTC (rev 264674)
@@ -1,3 +1,18 @@
+2020-07-21  Yusuke Suzuki  <ysuz...@apple.com>
+
+        Use CatchScope in microtask execution
+        https://bugs.webkit.org/show_bug.cgi?id=214600
+        <rdar://problem/65881165>
+
+        Reviewed by Mark Lam.
+
+        Test: js/dom/microtask-drain-should-use-catch-scope.html
+
+        Use CatchScope to suppress JSC_validateExceptionChecks.
+
+        * bindings/js/JSMicrotaskCallback.h:
+        (WebCore::JSMicrotaskCallback::call):
+
 2020-07-21  Eric Carlson  <eric.carl...@apple.com>
 
         Use AVRoutePickerView when available for choosing AirPlay devices

Modified: trunk/Source/WebCore/bindings/js/JSMicrotaskCallback.h (264673 => 264674)


--- trunk/Source/WebCore/bindings/js/JSMicrotaskCallback.h	2020-07-21 19:36:56 UTC (rev 264673)
+++ trunk/Source/WebCore/bindings/js/JSMicrotaskCallback.h	2020-07-21 20:35:28 UTC (rev 264674)
@@ -42,7 +42,7 @@
         auto protectedThis { makeRef(*this) };
         JSC::VM& vm = m_globalObject->vm();
         JSC::JSLockHolder lock(vm);
-        auto scope = DECLARE_THROW_SCOPE(vm);
+        auto scope = DECLARE_CATCH_SCOPE(vm);
         JSExecState::runTask(m_globalObject.get(), m_task);
         scope.assertNoException();
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to