Title: [183569] tags/Safari-601.1.31/Source/_javascript_Core
- Revision
- 183569
- Author
- [email protected]
- Date
- 2015-04-29 12:45:44 -0700 (Wed, 29 Apr 2015)
Log Message
Merged r183526. rdar://problem/20717863
Modified Paths
Diff
Modified: tags/Safari-601.1.31/Source/_javascript_Core/ChangeLog (183568 => 183569)
--- tags/Safari-601.1.31/Source/_javascript_Core/ChangeLog 2015-04-29 19:42:08 UTC (rev 183568)
+++ tags/Safari-601.1.31/Source/_javascript_Core/ChangeLog 2015-04-29 19:45:44 UTC (rev 183569)
@@ -1,3 +1,19 @@
+2015-04-29 Babak Shafiei <[email protected]>
+
+ Merge r183526.
+
+ 2015-04-28 Joseph Pecoraro <[email protected]>
+
+ Deadlock on applications using JSContext on non-main thread
+ https://bugs.webkit.org/show_bug.cgi?id=144370
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::singleton):
+ Prevent a possible deadlock by assuming we can synchronously
+ run something on the main queue at this time.
+
2015-04-28 Michael Catanzaro <[email protected]>
Fully replace ENABLE_LLINT_C_LOOP with ENABLE_JIT
Modified: tags/Safari-601.1.31/Source/_javascript_Core/inspector/remote/RemoteInspector.mm (183568 => 183569)
--- tags/Safari-601.1.31/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2015-04-29 19:42:08 UTC (rev 183568)
+++ tags/Safari-601.1.31/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2015-04-29 19:45:44 UTC (rev 183569)
@@ -93,8 +93,12 @@
if ([NSThread isMainThread])
initialize();
- else
- dispatch_sync(dispatch_get_main_queue(), initialize);
+ else {
+ // FIXME: This means that we may miss an auto-attach to a JSContext created on a non-main thread.
+ // The main thread initialization is required for certain WTF values that need to be initialized
+ // on the "real" main thread. We should investigate a better way to handle this.
+ dispatch_async(dispatch_get_main_queue(), initialize);
+ }
}
});
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
