Title: [228192] branches/safari-605-branch
Revision
228192
Author
jmarc...@apple.com
Date
2018-02-06 14:36:00 -0800 (Tue, 06 Feb 2018)

Log Message

Cherry-pick r228001. rdar://problem/37264547

Modified Paths

Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (228191 => 228192)


--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-02-06 22:23:11 UTC (rev 228191)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-02-06 22:36:00 UTC (rev 228192)
@@ -1,5 +1,19 @@
 2018-02-06  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r228001. rdar://problem/37264547
+
+    2018-02-02  Fujii Hironori  <hironori.fu...@sony.com>
+
+            [GTK] fast/events/message-channel-gc-4.html is flaky
+            https://bugs.webkit.org/show_bug.cgi?id=182104
+
+            Reviewed by Carlos Garcia Campos.
+
+            * platform/gtk/TestExpectations:
+            Unmarked fast/events/message-channel-gc-4.html and fast/workers/worker-cloneport.html.
+
+2018-02-06  Jason Marcell  <jmarc...@apple.com>
+
         Revert r228147. rdar://problem/37264529
 
 2018-02-06  Jason Marcell  <jmarc...@apple.com>

Modified: branches/safari-605-branch/Source/WTF/ChangeLog (228191 => 228192)


--- branches/safari-605-branch/Source/WTF/ChangeLog	2018-02-06 22:23:11 UTC (rev 228191)
+++ branches/safari-605-branch/Source/WTF/ChangeLog	2018-02-06 22:36:00 UTC (rev 228192)
@@ -1,3 +1,21 @@
+2018-02-06  Jason Marcell  <jmarc...@apple.com>
+
+        Cherry-pick r228001. rdar://problem/37264547
+
+    2018-02-02  Fujii Hironori  <hironori.fu...@sony.com>
+
+            [GTK] fast/events/message-channel-gc-4.html is flaky
+            https://bugs.webkit.org/show_bug.cgi?id=182104
+
+            Reviewed by Carlos Garcia Campos.
+
+            RELEASE_ASSERT of ThreadSpecific::set fails because
+            RunLoop::current is called even in GC thread since r227275.
+
+            * wtf/RunLoop.cpp:
+            (WTF::RunLoop::current):
+            Let the second template argument of ThreadSpecific CanBeGCThread::True.
+
 2018-02-04  Jason Marcell  <jmarc...@apple.com>
 
         Cherry-pick r227951. rdar://problem/37145493

Modified: branches/safari-605-branch/Source/WTF/wtf/RunLoop.cpp (228191 => 228192)


--- branches/safari-605-branch/Source/WTF/wtf/RunLoop.cpp	2018-02-06 22:23:11 UTC (rev 228191)
+++ branches/safari-605-branch/Source/WTF/wtf/RunLoop.cpp	2018-02-06 22:36:00 UTC (rev 228192)
@@ -58,7 +58,7 @@
 
 RunLoop& RunLoop::current()
 {
-    static NeverDestroyed<ThreadSpecific<Holder>> runLoopHolder;
+    static NeverDestroyed<ThreadSpecific<Holder, CanBeGCThread::True>> runLoopHolder;
     return runLoopHolder.get()->runLoop();
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to