Diff
Modified: trunk/Source/WebCore/ChangeLog (88188 => 88189)
--- trunk/Source/WebCore/ChangeLog 2011-06-06 21:26:24 UTC (rev 88188)
+++ trunk/Source/WebCore/ChangeLog 2011-06-06 21:30:42 UTC (rev 88189)
@@ -1,3 +1,22 @@
+2011-06-06 Emil A Eklund <[email protected]>
+
+ Reviewed by Eric Seidel.
+
+ Convert RenderBox::popContentsClip to IntPoint
+ https://bugs.webkit.org/show_bug.cgi?id=62132
+
+ Covered by existing tests.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paint):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::popContentsClip):
+ * rendering/RenderBox.h:
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::paint):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::paint):
+
2011-06-06 Levi Weintraub <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (88188 => 88189)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-06-06 21:26:24 UTC (rev 88188)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-06-06 21:30:42 UTC (rev 88189)
@@ -2260,7 +2260,7 @@
bool pushedClip = pushContentsClip(paintInfo, tx, ty);
paintObject(paintInfo, IntPoint(tx, ty));
if (pushedClip)
- popContentsClip(paintInfo, phase, tx, ty);
+ popContentsClip(paintInfo, phase, IntPoint(tx, ty));
// Our scrollbar widgets paint exactly when we tell them to, so that they work properly with
// z-index. We paint after we painted the background/border, so that the scrollbars will
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (88188 => 88189)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-06-06 21:26:24 UTC (rev 88188)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-06-06 21:30:42 UTC (rev 88189)
@@ -1122,14 +1122,14 @@
return true;
}
-void RenderBox::popContentsClip(PaintInfo& paintInfo, PaintPhase originalPhase, int tx, int ty)
+void RenderBox::popContentsClip(PaintInfo& paintInfo, PaintPhase originalPhase, const IntPoint& accumulatedOffset)
{
ASSERT(hasControlClip() || (hasOverflowClip() && !layer()->isSelfPaintingLayer()));
paintInfo.context->restore();
if (originalPhase == PaintPhaseOutline) {
paintInfo.phase = PaintPhaseSelfOutline;
- paintObject(paintInfo, IntPoint(tx, ty));
+ paintObject(paintInfo, accumulatedOffset);
paintInfo.phase = originalPhase;
} else if (originalPhase == PaintPhaseChildBlockBackground)
paintInfo.phase = originalPhase;
Modified: trunk/Source/WebCore/rendering/RenderBox.h (88188 => 88189)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-06-06 21:26:24 UTC (rev 88188)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-06-06 21:30:42 UTC (rev 88189)
@@ -350,7 +350,7 @@
virtual bool hasControlClip() const { return false; }
virtual IntRect controlClipRect(const IntPoint&) const { return IntRect(); }
bool pushContentsClip(PaintInfo&, int tx, int ty);
- void popContentsClip(PaintInfo&, PaintPhase originalPhase, int tx, int ty);
+ void popContentsClip(PaintInfo&, PaintPhase originalPhase, const IntPoint& accumulatedOffset);
virtual void paintObject(PaintInfo&, const IntPoint&) { ASSERT_NOT_REACHED(); }
virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (88188 => 88189)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2011-06-06 21:26:24 UTC (rev 88188)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2011-06-06 21:30:42 UTC (rev 88189)
@@ -470,7 +470,7 @@
bool pushedClip = pushContentsClip(paintInfo, tx, ty);
paintObject(paintInfo, IntPoint(tx, ty));
if (pushedClip)
- popContentsClip(paintInfo, paintPhase, tx, ty);
+ popContentsClip(paintInfo, paintPhase, IntPoint(tx, ty));
}
void RenderTable::paintObject(PaintInfo& paintInfo, const IntPoint& paintOffset)
Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (88188 => 88189)
--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2011-06-06 21:26:24 UTC (rev 88188)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2011-06-06 21:30:42 UTC (rev 88189)
@@ -906,7 +906,7 @@
bool pushedClip = pushContentsClip(paintInfo, tx, ty);
paintObject(paintInfo, IntPoint(tx, ty));
if (pushedClip)
- popContentsClip(paintInfo, phase, tx, ty);
+ popContentsClip(paintInfo, phase, IntPoint(tx, ty));
}
static inline bool compareCellPositions(RenderTableCell* elem1, RenderTableCell* elem2)
