Diff
Modified: trunk/Source/WebCore/ChangeLog (87840 => 87841)
--- trunk/Source/WebCore/ChangeLog 2011-06-01 20:24:28 UTC (rev 87840)
+++ trunk/Source/WebCore/ChangeLog 2011-06-01 20:38:14 UTC (rev 87841)
@@ -1,3 +1,22 @@
+2011-06-01 Levi Weintraub <[email protected]>
+
+ Reviewed by Eric Seidel.
+
+ Switch paintScrollCorner to use IntPoint
+ https://bugs.webkit.org/show_bug.cgi?id=61874
+
+ Changing paintScrollCorner to take an IntPoint representing the paint
+ offset instead of a pair of ints.
+
+ No new tests as this is simple refactoring.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintOverflowControls):
+ (WebCore::RenderLayer::paintScrollCorner):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintContents):
+
2011-06-01 Kenneth Russell <[email protected]>
Reviewed by Nate Chapin.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (87840 => 87841)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-06-01 20:24:28 UTC (rev 87840)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-06-01 20:38:14 UTC (rev 87841)
@@ -2323,19 +2323,19 @@
// 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, offsetX, offsetY, damageRect);
+ paintScrollCorner(context, IntPoint(offsetX, offsetY), damageRect);
// Paint our resizer last, since it sits on top of the scroll corner.
paintResizer(context, offsetX, offsetY, damageRect);
}
-void RenderLayer::paintScrollCorner(GraphicsContext* context, int tx, int ty, const IntRect& damageRect)
+void RenderLayer::paintScrollCorner(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect)
{
RenderBox* box = renderBox();
ASSERT(box);
- IntRect cornerRect = scrollCornerRect();
- IntRect absRect = IntRect(cornerRect.x() + tx, cornerRect.y() + ty, cornerRect.width(), cornerRect.height());
+ IntRect absRect = scrollCornerRect();
+ absRect.move(paintOffset);
if (!absRect.intersects(damageRect))
return;
@@ -2345,7 +2345,7 @@
}
if (m_scrollCorner) {
- m_scrollCorner->paintIntoRect(context, tx, ty, absRect);
+ m_scrollCorner->paintIntoRect(context, paintOffset.x(), paintOffset.y(), absRect);
return;
}
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (87840 => 87841)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2011-06-01 20:24:28 UTC (rev 87840)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2011-06-01 20:38:14 UTC (rev 87841)
@@ -262,7 +262,7 @@
IntSize offsetFromResizeCorner(const IntPoint& absolutePoint) const;
void paintOverflowControls(GraphicsContext*, int tx, int ty, const IntRect& damageRect, bool paintingOverlayControls = false);
- void paintScrollCorner(GraphicsContext*, int tx, int ty, const IntRect& damageRect);
+ void paintScrollCorner(GraphicsContext*, const IntPoint&, const IntRect& damageRect);
void paintResizer(GraphicsContext*, int tx, int ty, const IntRect& damageRect);
void updateScrollInfoAfterLayout();
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (87840 => 87841)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-06-01 20:24:28 UTC (rev 87840)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-06-01 20:38:14 UTC (rev 87841)
@@ -1236,7 +1236,7 @@
context.translate(-scrollCornerAndResizer.x(), -scrollCornerAndResizer.y());
IntRect transformedClip = clip;
transformedClip.move(scrollCornerAndResizer.location());
- m_owningLayer->paintScrollCorner(&context, 0, 0, transformedClip);
+ m_owningLayer->paintScrollCorner(&context, IntPoint(), transformedClip);
m_owningLayer->paintResizer(&context, 0, 0, transformedClip);
context.restore();
}
