Title: [228286] branches/safari-605-branch/Source/WebCore
- Revision
- 228286
- Author
- [email protected]
- Date
- 2018-02-08 11:50:12 -0800 (Thu, 08 Feb 2018)
Log Message
Cherry-pick r228258. rdar://problem/37355417
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228285 => 228286)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-08 19:48:30 UTC (rev 228285)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-08 19:50:12 UTC (rev 228286)
@@ -1,3 +1,25 @@
+2018-02-08 Jason Marcell <[email protected]>
+
+ Cherry-pick r228258. rdar://problem/37355417
+
+ 2018-02-07 Andy Estes <[email protected]>
+
+ 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-06 Jason Marcell <[email protected]>
Cherry-pick r228199. rdar://problem/37294597
Modified: branches/safari-605-branch/Source/WebCore/bindings/js/JSDOMPromise.cpp (228285 => 228286)
--- branches/safari-605-branch/Source/WebCore/bindings/js/JSDOMPromise.cpp 2018-02-08 19:48:30 UTC (rev 228285)
+++ branches/safari-605-branch/Source/WebCore/bindings/js/JSDOMPromise.cpp 2018-02-08 19:50:12 UTC (rev 228286)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
