Changeset 88189 in webkit

Timestamp:

Jun 6, 2011 2:30:42 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-06-06 Emil A Eklund <​eae@chromium.org>

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Emil A Eklund  <eae@chromium.org>
+
+        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  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2261 +2261 @@
     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

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1123 +1123 @@
 }
 
-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()));
@@ -1130 +1130 @@
     if (originalPhase == PaintPhaseOutline) {
         paintInfo.phase = PaintPhaseSelfOutline;
-        paintObject(paintInfo, IntPoint(tx, ty));
+        paintObject(paintInfo, accumulatedOffset);
         paintInfo.phase = originalPhase;
     } else if (originalPhase == PaintPhaseChildBlockBackground)

trunk/Source/WebCore/rendering/RenderBox.h

@@ -351 +351 @@
     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(); }

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -471 +471 @@
     paintObject(paintInfo, IntPoint(tx, ty));
     if (pushedClip)
-        popContentsClip(paintInfo, paintPhase, tx, ty);
+        popContentsClip(paintInfo, paintPhase, IntPoint(tx, ty));
 }
 

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -907 +907 @@
     paintObject(paintInfo, IntPoint(tx, ty));
     if (pushedClip)
-        popContentsClip(paintInfo, phase, tx, ty);
+        popContentsClip(paintInfo, phase, IntPoint(tx, ty));
 }