Title: [228659] releases/WebKitGTK/webkit-2.20/Source/WebCore
Revision
228659
Author
carlo...@webkit.org
Date
2018-02-19 04:08:38 -0800 (Mon, 19 Feb 2018)

Log Message

Merge r228258 - ASSERTION FAILED: vm->currentThreadIsHoldingAPILock() seen with http/tests/paymentrequest/payment-request-show-method.https.html
https://bugs.webkit.org/show_bug.cgi?id=182591

Reviewed by Youenn Fablet.

Fixes assertion failures in http/tests/paymentrequest/payment-request-show-method.https.html.

DOMPromise::whenSettled() calls the JSC API without first aquiring the API lock, and
r228195 added a call to whenSettled() where the lock is not guaranteed to be already
acquired.

Fix this by creating a JSLockHolder in DOMPromise::whenSettled().

* bindings/js/JSDOMPromise.cpp:
(WebCore::DOMPromise::whenSettled):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (228658 => 228659)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog	2018-02-19 12:08:34 UTC (rev 228658)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog	2018-02-19 12:08:38 UTC (rev 228659)
@@ -1,3 +1,21 @@
+2018-02-07  Andy Estes  <aes...@apple.com>
+
+        ASSERTION FAILED: vm->currentThreadIsHoldingAPILock() seen with http/tests/paymentrequest/payment-request-show-method.https.html
+        https://bugs.webkit.org/show_bug.cgi?id=182591
+
+        Reviewed by Youenn Fablet.
+
+        Fixes assertion failures in http/tests/paymentrequest/payment-request-show-method.https.html.
+
+        DOMPromise::whenSettled() calls the JSC API without first aquiring the API lock, and
+        r228195 added a call to whenSettled() where the lock is not guaranteed to be already
+        acquired.
+
+        Fix this by creating a JSLockHolder in DOMPromise::whenSettled().
+
+        * bindings/js/JSDOMPromise.cpp:
+        (WebCore::DOMPromise::whenSettled):
+
 2018-02-07  Ryosuke Niwa  <rn...@webkit.org>
 
         Remove unused CSSParserContext in CSSParser::parseInlineStyleDeclaration

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/bindings/js/JSDOMPromise.cpp (228658 => 228659)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/bindings/js/JSDOMPromise.cpp	2018-02-19 12:08:34 UTC (rev 228658)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/bindings/js/JSDOMPromise.cpp	2018-02-19 12:08:38 UTC (rev 228659)
@@ -55,6 +55,7 @@
 {
     auto& state = *globalObject()->globalExec();
     auto& vm = state.vm();
+    JSLockHolder lock(vm);
     auto* handler = JSC::JSNativeStdFunction::create(vm, globalObject(), 1, String { }, [callback = WTFMove(callback)] (ExecState*) mutable {
         callback();
         return JSC::JSValue::encode(JSC::jsUndefined());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to