Modified: trunk/Source/WebCore/ChangeLog (87844 => 87845)
--- trunk/Source/WebCore/ChangeLog 2011-06-01 20:57:15 UTC (rev 87844)
+++ trunk/Source/WebCore/ChangeLog 2011-06-01 20:58:34 UTC (rev 87845)
@@ -1,3 +1,21 @@
+2011-06-01 Levi Weintraub <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (87844 => 87845)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-06-01 20:57:15 UTC (rev 87844)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-06-01 20:58:34 UTC (rev 87845)
@@ -2326,7 +2326,7 @@
paintScrollCorner(context, IntPoint(offsetX, offsetY), damageRect);
// Paint our resizer last, since it sits on top of the scroll corner.
- paintResizer(context, offsetX, offsetY, damageRect);
+ paintResizer(context, IntPoint(offsetX, offsetY), damageRect);
}
void RenderLayer::paintScrollCorner(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect)
@@ -2355,7 +2355,7 @@
context->fillRect(absRect, Color::white, box->style()->colorSpace());
}
-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)
return;
@@ -2363,8 +2363,8 @@
RenderBox* box = renderBox();
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;
@@ -2374,7 +2374,7 @@
}
if (m_resizer) {
- m_resizer->paintIntoRect(context, tx, ty, absRect);
+ m_resizer->paintIntoRect(context, paintOffset.x(), paintOffset.y(), absRect);
return;
}
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (87844 => 87845)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2011-06-01 20:57:15 UTC (rev 87844)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2011-06-01 20:58:34 UTC (rev 87845)
@@ -263,7 +263,7 @@
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();
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (87844 => 87845)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-06-01 20:57:15 UTC (rev 87844)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-06-01 20:58:34 UTC (rev 87845)
@@ -1237,7 +1237,7 @@
IntRect transformedClip = clip;
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();
}
}
