Title: [274194] trunk/Source/WebKit
- Revision
- 274194
- Author
- [email protected]
- Date
- 2021-03-09 20:44:00 -0800 (Tue, 09 Mar 2021)
Log Message
REGRESSION (r274174): ASSERTION FAILED: m_shouldBeCalledOnMainThread == isMainThread() under WebKit::RemoteSampleBufferDisplayLayerManager::createLayer
https://bugs.webkit.org/show_bug.cgi?id=223015
<rdar://problem/75248289>
Unreviewed, r274174 mistakenly replaced a call to dispatchToThread() with a call to callOnMainRunLoop().
* GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp:
(WebKit::RemoteSampleBufferDisplayLayerManager::createLayer):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (274193 => 274194)
--- trunk/Source/WebKit/ChangeLog 2021-03-10 03:38:23 UTC (rev 274193)
+++ trunk/Source/WebKit/ChangeLog 2021-03-10 04:44:00 UTC (rev 274194)
@@ -1,3 +1,14 @@
+2021-03-09 Chris Dumez <[email protected]>
+
+ REGRESSION (r274174): ASSERTION FAILED: m_shouldBeCalledOnMainThread == isMainThread() under WebKit::RemoteSampleBufferDisplayLayerManager::createLayer
+ https://bugs.webkit.org/show_bug.cgi?id=223015
+ <rdar://problem/75248289>
+
+ Unreviewed, r274174 mistakenly replaced a call to dispatchToThread() with a call to callOnMainRunLoop().
+
+ * GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp:
+ (WebKit::RemoteSampleBufferDisplayLayerManager::createLayer):
+
2021-03-09 Sam Weinig <[email protected]>
Preferences do not need to be passed to the WebProcess via WebPageCreationParameters since the store already is
Modified: trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp (274193 => 274194)
--- trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp 2021-03-10 03:38:23 UTC (rev 274193)
+++ trunk/Source/WebKit/GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.cpp 2021-03-10 04:44:00 UTC (rev 274194)
@@ -84,7 +84,7 @@
auto layer = RemoteSampleBufferDisplayLayer::create(identifier, m_connection.copyRef());
auto& layerReference = *layer;
layerReference.initialize(hideRootLayer, size, [this, protectedThis = makeRef(*this), callback = WTFMove(callback), identifier, layer = WTFMove(layer)](auto layerId) mutable {
- callOnMainRunLoop([this, protectedThis = WTFMove(protectedThis), callback = WTFMove(callback), identifier, layer = WTFMove(layer), layerId = WTFMove(layerId)]() mutable {
+ dispatchToThread([this, protectedThis = WTFMove(protectedThis), callback = WTFMove(callback), identifier, layer = WTFMove(layer), layerId = WTFMove(layerId)]() mutable {
ASSERT(!m_layers.contains(identifier));
m_layers.add(identifier, WTFMove(layer));
callback(WTFMove(layerId));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
