Changeset 259821 in webkit

Timestamp:

Apr 9, 2020, 1:38:45 PM (6 years ago)

Author:

dbates@webkit.org

Message:

[ macOS debug wk2 ] REGRESSION(r259762): ASSERTION FAILED: !needsLayout() on fast/events/scroll-subframe-in-rendering-update.html
​https://bugs.webkit.org/show_bug.cgi?id=210278
<rdar://problem/61517389>

Reviewed by Darin Adler.

Only EventRegion paint the contents of the widget if the widget is a frame view that
does not need layout because layout must come before painting. Otherwise, an assertion
failure will occur.

• rendering/RenderWidget.cpp:

(WebCore::RenderWidget::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderWidget.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-09  Daniel Bates  <dabates@apple.com>
+
+        [ macOS debug wk2 ] REGRESSION(r259762): ASSERTION FAILED: !needsLayout() on fast/events/scroll-subframe-in-rendering-update.html
+        https://bugs.webkit.org/show_bug.cgi?id=210278
+        <rdar://problem/61517389>
+
+        Reviewed by Darin Adler.
+
+        Only EventRegion paint the contents of the widget if the widget is a frame view that
+        does not need layout because layout must come before painting. Otherwise, an assertion
+        failure will occur.
+
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::paint):
+
 2020-04-09  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -293 +293 @@
         paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size()));
 
-    if (paintInfo.phase != PaintPhase::Foreground && (paintInfo.phase != PaintPhase::EventRegion || view().needsLayout()))
+    bool needsEventRegionContentPaint = paintInfo.phase == PaintPhase::EventRegion && is<FrameView>(m_widget) && !downcast<FrameView>(*m_widget).needsLayout();
+    if (paintInfo.phase != PaintPhase::Foreground && !needsEventRegionContentPaint)
         return;