Title: [243475] trunk/Source/WebKit
- Revision
- 243475
- Author
- [email protected]
- Date
- 2019-03-25 17:43:22 -0700 (Mon, 25 Mar 2019)
Log Message
[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: trunk/Source/WebKit/ChangeLog (243474 => 243475)
--- trunk/Source/WebKit/ChangeLog 2019-03-26 00:24:23 UTC (rev 243474)
+++ trunk/Source/WebKit/ChangeLog 2019-03-26 00:43:22 UTC (rev 243475)
@@ -1,3 +1,19 @@
+2019-03-25 Fujii Hironori <[email protected]>
+
+ [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-25 Brady Eidson <[email protected]>
Add socket-delegate to another entitlements config
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (243474 => 243475)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2019-03-26 00:24:23 UTC (rev 243474)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2019-03-26 00:43:22 UTC (rev 243475)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
