Title: [278940] branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc
Revision
278940
Author
repst...@apple.com
Date
2021-06-16 10:57:28 -0700 (Wed, 16 Jun 2021)

Log Message

Cherry-pick r278886. rdar://problem/79405770

    REGRESSION: [ BigSur iOS wk1 Debug ] imported/w3c/web-platform-tests/html/dom/usvstring-reflection.https.html is flaky crashing
    https://bugs.webkit.org/show_bug.cgi?id=226928
    <rdar://problem/79205526>

    Reviewed by Eric Carlson.

    * Source/webrtc/rtc_base/task_queue_stdlib.cc:
    thread_ is created in TaskQueueStdlib constructor before other members pending_queue_ or delayed_queue_.
    It might happen that thread_ will start executing its callback which will read delayed_queue_ before it is initialized by TaskQueueStdlib constructor.
    Update to create thread_ before all other members.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278886 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc/ChangeLog (278939 => 278940)


--- branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc/ChangeLog	2021-06-16 17:40:09 UTC (rev 278939)
+++ branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc/ChangeLog	2021-06-16 17:57:28 UTC (rev 278940)
@@ -1,3 +1,34 @@
+2021-06-16  Russell Epstein  <repst...@apple.com>
+
+        Cherry-pick r278886. rdar://problem/79405770
+
+    REGRESSION: [ BigSur iOS wk1 Debug ] imported/w3c/web-platform-tests/html/dom/usvstring-reflection.https.html is flaky crashing
+    https://bugs.webkit.org/show_bug.cgi?id=226928
+    <rdar://problem/79205526>
+    
+    Reviewed by Eric Carlson.
+    
+    * Source/webrtc/rtc_base/task_queue_stdlib.cc:
+    thread_ is created in TaskQueueStdlib constructor before other members pending_queue_ or delayed_queue_.
+    It might happen that thread_ will start executing its callback which will read delayed_queue_ before it is initialized by TaskQueueStdlib constructor.
+    Update to create thread_ before all other members.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-06-15  Youenn Fablet  <you...@apple.com>
+
+            REGRESSION: [ BigSur iOS wk1 Debug ] imported/w3c/web-platform-tests/html/dom/usvstring-reflection.https.html is flaky crashing
+            https://bugs.webkit.org/show_bug.cgi?id=226928
+            <rdar://problem/79205526>
+
+            Reviewed by Eric Carlson.
+
+            * Source/webrtc/rtc_base/task_queue_stdlib.cc:
+            thread_ is created in TaskQueueStdlib constructor before other members pending_queue_ or delayed_queue_.
+            It might happen that thread_ will start executing its callback which will read delayed_queue_ before it is initialized by TaskQueueStdlib constructor.
+            Update to create thread_ before all other members.
+
 2021-06-10  Youenn Fablet  <you...@apple.com> and Victor M. Jaquez L. <vjaq...@igalia.com>
 
         Update libwebrtc to M92

Modified: branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/task_queue_stdlib.cc (278939 => 278940)


--- branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/task_queue_stdlib.cc	2021-06-16 17:40:09 UTC (rev 278939)
+++ branches/safari-612.1.19-branch/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/task_queue_stdlib.cc	2021-06-16 17:57:28 UTC (rev 278940)
@@ -88,9 +88,11 @@
   // Signaled whenever a new task is pending.
   rtc::Event flag_notify_;
 
+#if !defined(WEBRTC_WEBKIT_BUILD)
   // Contains the active worker thread assigned to processing
   // tasks (including delayed tasks).
   rtc::PlatformThread thread_;
+#endif
 
   Mutex pending_lock_;
 
@@ -114,6 +116,12 @@
   // std::unique_ptr out of the queue without the presence of a hack.
   std::map<DelayedEntryTimeout, std::unique_ptr<QueuedTask>> delayed_queue_
       RTC_GUARDED_BY(pending_lock_);
+
+#if defined(WEBRTC_WEBKIT_BUILD)
+  // Contains the active worker thread assigned to processing
+  // tasks (including delayed tasks).
+  rtc::PlatformThread thread_;
+#endif
 };
 
 TaskQueueStdlib::TaskQueueStdlib(absl::string_view queue_name,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to