Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259820 => 259821)
--- trunk/Source/WebCore/ChangeLog 2020-04-09 20:36:21 UTC (rev 259820)
+++ trunk/Source/WebCore/ChangeLog 2020-04-09 20:38:45 UTC (rev 259821)
@@ -1,3 +1,18 @@
+2020-04-09 Daniel Bates <[email protected]>
+
+ [ 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 <[email protected]>
eventSender.monitorWheelEvents() should clear latching state
Modified: trunk/Source/WebCore/rendering/RenderWidget.cpp (259820 => 259821)
--- trunk/Source/WebCore/rendering/RenderWidget.cpp 2020-04-09 20:36:21 UTC (rev 259820)
+++ trunk/Source/WebCore/rendering/RenderWidget.cpp 2020-04-09 20:38:45 UTC (rev 259821)
@@ -292,7 +292,8 @@
if ((paintInfo.phase == PaintPhase::Outline || paintInfo.phase == PaintPhase::SelfOutline) && hasOutline())
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;
if (style().hasBorderRadius()) {
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
