Attachment 373171 Details for Bug 199342 – Patch

[patch] Patch

bug-199342-20190628181555.patch (text/plain), 3.49 KB, created by Simon Fraser (smfr) on 2019-06-28 18:15:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-06-28 18:15:55 PDT

Size: 3.49 KB

patch

obsolete

>Subversion Revision: 246899
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 596824f4ada88cfc9c95aff5b4ee73979fb1481e..1453651951bc3e6604781c2182c5ff9d1676ddfc 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-06-28  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Remove a PLATFORM(IOS_FAMILY) related to repaint offsets in composited scrolling layers
>+        https://bugs.webkit.org/show_bug.cgi?id=199342
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Code in RenderObject::shouldApplyCompositedContainerScrollsForRepaint() and RenderLayerBacking::setContentsNeedDisplayInRect()
>+        seems to cancel itself out, so try removing it.
>+
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
>+        * rendering/RenderObject.cpp:
>+        (WebCore::RenderObject::visibleRectContextForRepaint):
>+        (WebCore::RenderObject::shouldApplyCompositedContainerScrollsForRepaint): Deleted.
>+
> 2019-06-27  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r246869): ASSERTION FAILED: !renderer().hasRepaintLayoutRects() || renderer().repaintLayoutRects().m_repaintRect == renderer().clippedOverflowRectForRepaint(renderer().containerForRepaint())
>diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
>index 7ecac435e090a32d3e6415d4e06d129b79e35523..7aa820a619799f6ca3f660f15dbc3ff3590d8127 100644
>--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
>+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
>@@ -2713,11 +2713,6 @@ void RenderLayerBacking::setContentsNeedDisplayInRect(const LayoutRect& r, Graph
>     if (m_scrolledContentsLayer && m_scrolledContentsLayer->drawsContent()) {
>         FloatRect layerDirtyRect = pixelSnappedRectForPainting;
>         layerDirtyRect.move(-m_scrolledContentsLayer->offsetFromRenderer() + toLayoutSize(m_scrolledContentsLayer->scrollOffset()) - m_subpixelOffsetFromRenderer);
>-#if PLATFORM(IOS_FAMILY)
>-        // Account for the fact that RenderLayerBacking::updateGeometry() bakes scrollOffset into offsetFromRenderer on iOS,
>-        // but the repaint rect is computed without taking the scroll position into account (see shouldApplyClipAndScrollPositionForRepaint()).
>-        layerDirtyRect.moveBy(-m_owningLayer.scrollPosition());
>-#endif
>         m_scrolledContentsLayer->setNeedsDisplayInRect(layerDirtyRect, shouldClip);
>     }
> }
>diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
>index aab3f46ec403e2f5421e8156545ca44d0ecb1b83..ff5b7bd08f04a0f7e84ee2a77a02a5304a6d8b1b 100644
>--- a/Source/WebCore/rendering/RenderObject.cpp
>+++ b/Source/WebCore/rendering/RenderObject.cpp
>@@ -975,20 +975,9 @@ LayoutRect RenderObject::clippedOverflowRectForRepaint(const RenderLayerModelObj
>     return LayoutRect();
> }
> 
>-bool RenderObject::shouldApplyCompositedContainerScrollsForRepaint()
>-{
>-#if PLATFORM(IOS_FAMILY)
>-    return false;
>-#else
>-    return true;
>-#endif
>-}
>-
> RenderObject::VisibleRectContext RenderObject::visibleRectContextForRepaint()
> {
>-    VisibleRectContext context(false, false, { VisibleRectContextOption::ApplyContainerClip });
>-    if (shouldApplyCompositedContainerScrollsForRepaint())
>-        context.m_options.add(VisibleRectContextOption::ApplyCompositedContainerScrolls);
>+    VisibleRectContext context(false, false, { VisibleRectContextOption::ApplyContainerClip, VisibleRectContextOption::ApplyCompositedContainerScrolls });
>     return context;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199342: 373171 | 373174