Changeset 243986 in webkit

Timestamp:

Apr 8, 2019, 3:15:21 AM (7 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.24/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-25  Fujii Hironori  <Hironori.Fujii@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.Fujii@sony.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp

@@ -432 +432 @@
     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;