Changeset 117032 in webkit

Timestamp:

May 14, 2012, 11:12:05 PM (14 years ago)

Author:

timothy_horton@apple.com

Message:

RenderLayer::repaintRectIncludingDescendants shouldn't include repaint rects of composited descendants
​https://bugs.webkit.org/show_bug.cgi?id=86429
<rdar://problem/11445132>

Reviewed by Simon Fraser.

Change repaintRectIncludingDescendants to not include repaint rects for composited child layers,
and rename the function to make it more clear that that's what it does now.

No new tests, scrolling performance optimization.

• page/FrameView.cpp:

(WebCore::FrameView::scrollContentsFastPath):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::repaintRectIncludingNonCompositingDescendants):

• rendering/RenderLayer.h:

(RenderLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-14  Tim Horton  <timothy_horton@apple.com>
+
+        RenderLayer::repaintRectIncludingDescendants shouldn't include repaint rects of composited descendants
+        https://bugs.webkit.org/show_bug.cgi?id=86429
+        <rdar://problem/11445132>
+
+        Reviewed by Simon Fraser.
+
+        Change repaintRectIncludingDescendants to not include repaint rects for composited child layers,
+        and rename the function to make it more clear that that's what it does now.
+
+        No new tests, scrolling performance optimization.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollContentsFastPath):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::repaintRectIncludingNonCompositingDescendants):
+        * rendering/RenderLayer.h:
+        (RenderLayer):
+
 2012-05-14  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1490 +1490 @@
             continue;
 #endif
-        IntRect updateRect = pixelSnappedIntRect(renderBox->layer()->repaintRectIncludingDescendants());
+        IntRect updateRect = pixelSnappedIntRect(renderBox->layer()->repaintRectIncludingNonCompositingDescendants());
         updateRect = contentsToRootView(updateRect);
         if (!isCompositedContentLayer && clipsRepaints())

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -453 +453 @@
 }
 
-LayoutRect RenderLayer::repaintRectIncludingDescendants() const
+LayoutRect RenderLayer::repaintRectIncludingNonCompositingDescendants() const
 {
     LayoutRect repaintRect = m_repaintRect;
-    for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
-        repaintRect.unite(child->repaintRectIncludingDescendants());
+    for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
+        // Don't include repaint rects for composited child layers; they will paint themselves and have a different origin.
+        if (child->isComposited())
+            continue;
+
+        repaintRect.unite(child->repaintRectIncludingNonCompositingDescendants());
+    }
     return repaintRect;
 }

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -512 +512 @@
     // Return a cached repaint rect, computed relative to the layer renderer's containerForRepaint.
     LayoutRect repaintRect() const { return m_repaintRect; }
-    LayoutRect repaintRectIncludingDescendants() const;
+    LayoutRect repaintRectIncludingNonCompositingDescendants() const;
 
     enum UpdateLayerPositionsAfterScrollFlag {