Title: [243986] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 243986
- Author
- carlo...@webkit.org
- Date
- 2019-04-08 03:15:21 -0700 (Mon, 08 Apr 2019)
Log Message
Merge r243475 - [Coordinated Graphics][WinCairo] ASSERTION FAILED: state.id == m_nicosia.state.id
https://bugs.webkit.org/show_bug.cgi?id=196190
Reviewed by Žan Doberšek.
This assertion assumes the pre-committed and the committed scenes
are identical. But, the pre-committed scene is updated in the main
thread. Removed the false assertion.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::purgeGLResources): Remove the
assertion. Removed layers of committed scene, not pre-committed
scene.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (243985 => 243986)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:15:18 UTC (rev 243985)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:15:21 UTC (rev 243986)
@@ -1,3 +1,19 @@
+2019-03-25 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Coordinated Graphics][WinCairo] ASSERTION FAILED: state.id == m_nicosia.state.id
+ https://bugs.webkit.org/show_bug.cgi?id=196190
+
+ Reviewed by Žan Doberšek.
+
+ This assertion assumes the pre-committed and the committed scenes
+ are identical. But, the pre-committed scene is updated in the main
+ thread. Removed the false assertion.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::purgeGLResources): Remove the
+ assertion. Removed layers of committed scene, not pre-committed
+ scene.
+
2019-03-11 Fujii Hironori <hironori.fu...@sony.com>
[CoordinatedGraphics] ASSERTION FAILED: !m_state.isSuspended
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (243985 => 243986)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2019-04-08 10:15:18 UTC (rev 243985)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2019-04-08 10:15:21 UTC (rev 243986)
@@ -431,13 +431,12 @@
if (m_nicosia.scene) {
m_nicosia.scene->accessState(
- [this](const Nicosia::Scene::State& state)
+ [](Nicosia::Scene::State& state)
{
- ASSERT(state.id == m_nicosia.state.id);
- for (auto& layer : m_nicosia.state.layers)
+ for (auto& layer : state.layers)
removeLayer(*layer);
- m_nicosia.state.layers = { };
- m_nicosia.state.rootLayer = nullptr;
+ state.layers = { };
+ state.rootLayer = nullptr;
});
m_nicosia.scene = nullptr;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
