Changeset 87845 in webkit

Timestamp:

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

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

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

Switch paintResizer to take an IntPoint instead of a pair of ints.

No new tests as this is simple refactoring.

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintOverflowControls): (WebCore::RenderLayer::paintResizer):
• rendering/RenderLayer.h:
• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (4 diffs)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintResizer to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61883
+
+        Switch paintResizer to take an IntPoint instead of a pair of ints.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintOverflowControls):
+        (WebCore::RenderLayer::paintResizer):
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintContents):
+
 2011-06-01  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2327 +2327 @@
     
     // Paint our resizer last, since it sits on top of the scroll corner.
-    paintResizer(context, offsetX, offsetY, damageRect);
+    paintResizer(context, IntPoint(offsetX, offsetY), damageRect);
 }
 
@@ -2356 +2356 @@
 }
 
-void RenderLayer::paintResizer(GraphicsContext* context, int tx, int ty, const IntRect& damageRect)
+void RenderLayer::paintResizer(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect)
 {
     if (renderer()->style()->resize() == RESIZE_NONE)
@@ -2364 +2364 @@
     ASSERT(box);
 
-    IntRect cornerRect = resizerCornerRect(this, box->borderBoxRect());
-    IntRect absRect = IntRect(cornerRect.x() + tx, cornerRect.y() + ty, cornerRect.width(), cornerRect.height());
+    IntRect absRect = resizerCornerRect(this, box->borderBoxRect());
+    absRect.move(paintOffset);
     if (!absRect.intersects(damageRect))
         return;
@@ -2375 +2375 @@
     
     if (m_resizer) {
-        m_resizer->paintIntoRect(context, tx, ty, absRect);
+        m_resizer->paintIntoRect(context, paintOffset.x(), paintOffset.y(), absRect);
         return;
     }

trunk/Source/WebCore/rendering/RenderLayer.h

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

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1238 +1238 @@
         transformedClip.move(scrollCornerAndResizer.location());
         m_owningLayer->paintScrollCorner(&context, IntPoint(), transformedClip);
-        m_owningLayer->paintResizer(&context, 0, 0, transformedClip);
+        m_owningLayer->paintResizer(&context, IntPoint(), transformedClip);
         context.restore();
     }