Changeset 87864 in webkit

Timestamp:

Jun 1, 2011 4:15:58 PM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-06-01 Levi Weintraub <​leviw@chromium.org>

Reviewed by Eric Seidel.

Switch paintOverflowControls to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61884

Switching paintOverflowControls to use an IntPoint instead of a pair of ints.

No new tests since this is simple refactoring.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paint):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintOverflowControls): (WebCore::RenderLayer::paintLayer):
• rendering/RenderLayer.h:
• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintIntoLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (5 diffs)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintOverflowControls to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61884
+
+        Switching paintOverflowControls to use an IntPoint instead of a pair of ints.
+
+        No new tests since this is simple refactoring.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paint):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintOverflowControls):
+        (WebCore::RenderLayer::paintLayer):
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintIntoLayer):
+
 2011-06-01  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2269 +2269 @@
     // sit above the background/border.
     if (hasOverflowClip() && style()->visibility() == VISIBLE && (phase == PaintPhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && paintInfo.shouldPaintWithinRoot(this))
-        layer()->paintOverflowControls(paintInfo.context, tx, ty, paintInfo.rect);
+        layer()->paintOverflowControls(paintInfo.context, IntPoint(tx, ty), paintInfo.rect);
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2267 +2267 @@
 }
 
-void RenderLayer::paintOverflowControls(GraphicsContext* context, int tx, int ty, const IntRect& damageRect, bool paintingOverlayControls)
+void RenderLayer::paintOverflowControls(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls)
 {
     // Don't do anything if we have no overflow.
@@ -2282 +2282 @@
         RenderView* renderView = renderer()->view();
         renderView->layer()->setContainsDirtyOverlayScrollbars(true);
-        m_cachedOverlayScrollbarOffset = IntPoint(tx, ty);
+        m_cachedOverlayScrollbarOffset = paintOffset;
         renderView->frameView()->setContainsScrollableAreaWithOverlayScrollbars(true);
         return;
@@ -2291 +2291 @@
         return;
 
-    int offsetX = tx;
-    int offsetY = ty;
-    if (paintingOverlayControls) {
-        offsetX = m_cachedOverlayScrollbarOffset.x();
-        offsetY = m_cachedOverlayScrollbarOffset.y();
-    }
+    IntPoint adjustedPaintOffset = paintOffset;
+    if (paintingOverlayControls)
+        adjustedPaintOffset = m_cachedOverlayScrollbarOffset;
 
     // Move the scrollbar widgets if necessary.  We normally move and resize widgets during layout, but sometimes
     // widgets can move without layout occurring (most notably when you scroll a document that
     // contains fixed positioned elements).
-    positionOverflowControls(IntSize(offsetX, offsetY));
+    positionOverflowControls(toSize(adjustedPaintOffset));
 
     // Now that we're sure the scrollbars are in the right place, paint them.
@@ -2324 +2321 @@
     // We fill our scroll corner with white if we have a scrollbar that doesn't run all the way up to the
     // edge of the box.
-    paintScrollCorner(context, IntPoint(offsetX, offsetY), damageRect);
+    paintScrollCorner(context, adjustedPaintOffset, damageRect);
     
     // Paint our resizer last, since it sits on top of the scroll corner.
-    paintResizer(context, IntPoint(offsetX, offsetY), damageRect);
+    paintResizer(context, adjustedPaintOffset, damageRect);
 }
 
@@ -2709 +2706 @@
     if (paintingOverlayScrollbars) {
         setClip(p, paintDirtyRect, damageRect);
-        paintOverflowControls(p, tx, ty, damageRect, true);
+        paintOverflowControls(p, IntPoint(tx, ty), damageRect, true);
         restoreClip(p, paintDirtyRect, damageRect);
     }

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -262 +262 @@
     IntSize offsetFromResizeCorner(const IntPoint& absolutePoint) const;
 
-    void paintOverflowControls(GraphicsContext*, int tx, int ty, const IntRect& damageRect, bool paintingOverlayControls = false);
+    void paintOverflowControls(GraphicsContext*, const IntPoint&, const IntRect& damageRect, bool paintingOverlayControls = false);
     void paintScrollCorner(GraphicsContext*, const IntPoint&, const IntRect& damageRect);
     void paintResizer(GraphicsContext*, const IntPoint&, const IntRect& damageRect);

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1101 +1101 @@
     IntRect layerBounds, damageRect, clipRectToApply, outlineRect;
     m_owningLayer->calculateRects(rootLayer, paintDirtyRect, layerBounds, damageRect, clipRectToApply, outlineRect);
-    
-    int x = layerBounds.x();        // layerBounds is computed relative to rootLayer
-    int y = layerBounds.y();
-    int tx = x - m_owningLayer->renderBoxX();
-    int ty = y - m_owningLayer->renderBoxY();
+
+    int tx = layerBounds.x() - m_owningLayer->renderBoxX();
+    int ty = layerBounds.y() - m_owningLayer->renderBoxY();
 
     // If this layer's renderer is a child of the paintingRoot, we render unconditionally, which
@@ -1128 +1126 @@
         // z-index.  We paint after we painted the background/border, so that the scrollbars will
         // sit above the background/border.
-        m_owningLayer->paintOverflowControls(context, x, y, damageRect);
+        m_owningLayer->paintOverflowControls(context, layerBounds.location(), damageRect);
         
         // Restore the clip.