Title: [268208] trunk/Source/WebCore
Revision
268208
Author
hironori.fu...@sony.com
Date
2020-10-08 14:17:46 -0700 (Thu, 08 Oct 2020)

Log Message

[WinCairo] ASSERTION FAILED: m_renderingUpdateRemainingSteps.last().isEmpty() in WebCore::Page::finalizeRenderingUpdate since r268075
https://bugs.webkit.org/show_bug.cgi?id=217490

Reviewed by Simon Fraser.

When the assertion failed, m_renderingUpdateRemainingSteps was
0x2000 (ScrollingTreeUpdate). The flag ScrollingTreeUpdate should
be used only if ENABLE(ASYNC_SCROLLING).

* page/Page.cpp:
(WebCore::operator<<):
* page/Page.h:
Conditioned out ScrollingTreeUpdate by ENABLE(ASYNC_SCROLLING).

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (268207 => 268208)


--- trunk/Source/WebCore/ChangeLog	2020-10-08 21:07:15 UTC (rev 268207)
+++ trunk/Source/WebCore/ChangeLog	2020-10-08 21:17:46 UTC (rev 268208)
@@ -1,3 +1,19 @@
+2020-10-08  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [WinCairo] ASSERTION FAILED: m_renderingUpdateRemainingSteps.last().isEmpty() in WebCore::Page::finalizeRenderingUpdate since r268075
+        https://bugs.webkit.org/show_bug.cgi?id=217490
+
+        Reviewed by Simon Fraser.
+
+        When the assertion failed, m_renderingUpdateRemainingSteps was
+        0x2000 (ScrollingTreeUpdate). The flag ScrollingTreeUpdate should
+        be used only if ENABLE(ASYNC_SCROLLING).
+
+        * page/Page.cpp:
+        (WebCore::operator<<):
+        * page/Page.h:
+        Conditioned out ScrollingTreeUpdate by ENABLE(ASYNC_SCROLLING).
+
 2020-10-08  Andres Gonzalez  <andresg...@apple.com>
 
         Presidential Executive Order pages not accessible with Safari.

Modified: trunk/Source/WebCore/page/Page.cpp (268207 => 268208)


--- trunk/Source/WebCore/page/Page.cpp	2020-10-08 21:07:15 UTC (rev 268207)
+++ trunk/Source/WebCore/page/Page.cpp	2020-10-08 21:17:46 UTC (rev 268208)
@@ -3364,7 +3364,9 @@
     case RenderingUpdateStep::CursorUpdate: ts << "CursorUpdate"; break;
     case RenderingUpdateStep::EventRegionUpdate: ts << "EventRegionUpdate"; break;
     case RenderingUpdateStep::LayerFlush: ts << "LayerFlush"; break;
+#if ENABLE(ASYNC_SCROLLING)
     case RenderingUpdateStep::ScrollingTreeUpdate: ts << "ScrollingTreeUpdate"; break;
+#endif
     }
     return ts;
 }

Modified: trunk/Source/WebCore/page/Page.h (268207 => 268208)


--- trunk/Source/WebCore/page/Page.h	2020-10-08 21:07:15 UTC (rev 268207)
+++ trunk/Source/WebCore/page/Page.h	2020-10-08 21:17:46 UTC (rev 268208)
@@ -191,7 +191,9 @@
     CursorUpdate                    = 1 << 10,
     EventRegionUpdate               = 1 << 11,
     LayerFlush                      = 1 << 12,
+#if ENABLE(ASYNC_SCROLLING)
     ScrollingTreeUpdate             = 1 << 13,
+#endif
 };
 
 constexpr OptionSet<RenderingUpdateStep> updateRenderingSteps = {
@@ -215,7 +217,9 @@
 
 constexpr auto allRenderingUpdateSteps = updateRenderingSteps | OptionSet<RenderingUpdateStep> {
     RenderingUpdateStep::LayerFlush,
+#if ENABLE(ASYNC_SCROLLING)
     RenderingUpdateStep::ScrollingTreeUpdate,
+#endif
 };
 
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to