Changeset 88172 in webkit

Timestamp:

Jun 6, 2011 10:50:03 AM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintFloats, paintChildren, and paintEllipsisBoxes to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62058

Switching paintFloats, paintChildren, and paintEllipsisBoxes to take IntPoints representing
their paint offsets instead of pairs of ints.

No new tests since this is simple refactoring.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintColumnContents): (WebCore::RenderBlock::paintContents): (WebCore::RenderBlock::paintChildren): (WebCore::RenderBlock::paintObject): (WebCore::RenderBlock::paintFloats): (WebCore::RenderBlock::paintEllipsisBoxes):
• rendering/RenderBlock.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (11 diffs)
• rendering/RenderBlock.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintFloats, paintChildren, and paintEllipsisBoxes to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62058
+
+        Switching paintFloats, paintChildren, and paintEllipsisBoxes to take IntPoints representing
+        their paint offsets instead of pairs of ints.
+
+        No new tests since this is simple refactoring.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintColumnContents):
+        (WebCore::RenderBlock::paintContents):
+        (WebCore::RenderBlock::paintChildren):
+        (WebCore::RenderBlock::paintObject):
+        (WebCore::RenderBlock::paintFloats):
+        (WebCore::RenderBlock::paintEllipsisBoxes):
+        * rendering/RenderBlock.h:
+
 2011-06-06  Steve Block  <steveblock@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2352 +2352 @@
             int finalY = ty + offset.height();
             if (paintingFloats)
-                paintFloats(info, finalX, finalY, paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip);
+                paintFloats(info, IntPoint(finalX, finalY), paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip);
             else
                 paintContents(info, finalX, finalY);
@@ -2376 +2376 @@
         m_lineBoxes.paint(this, paintInfo, tx, ty);
     else
-        paintChildren(paintInfo, tx, ty);
-}
-
-void RenderBlock::paintChildren(PaintInfo& paintInfo, int tx, int ty)
+        paintChildren(paintInfo, IntPoint(tx, ty));
+}
+
+void RenderBlock::paintChildren(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     PaintPhase newPhase = (paintInfo.phase == PaintPhaseChildOutlines) ? PaintPhaseOutline : paintInfo.phase;
@@ -2397 +2397 @@
         // Check for page-break-before: always, and if it's set, break and bail.
         bool checkBeforeAlways = !childrenInline() && (usePrintRect && child->style()->pageBreakBefore() == PBALWAYS);
+        int absoluteChildY = paintOffset.y() + child->y();
         if (checkBeforeAlways
-            && (ty + child->y()) > paintInfo.rect.y()
-            && (ty + child->y()) < paintInfo.rect.maxY()) {
-            view()->setBestTruncatedAt(ty + child->y(), this, true);
+            && absoluteChildY > paintInfo.rect.y()
+            && absoluteChildY < paintInfo.rect.maxY()) {
+            view()->setBestTruncatedAt(absoluteChildY, this, true);
             return;
         }
@@ -2406 +2407 @@
         if (!child->isFloating() && child->isReplaced() && usePrintRect && child->height() <= renderView->printRect().height()) {
             // Paginate block-level replaced elements.
-            if (ty + child->y() + child->height() > renderView->printRect().maxY()) {
-                if (ty + child->y() < renderView->truncatedAt())
-                    renderView->setBestTruncatedAt(ty + child->y(), child);
+            if (absoluteChildY + child->height() > renderView->printRect().maxY()) {
+                if (absoluteChildY < renderView->truncatedAt())
+                    renderView->setBestTruncatedAt(absoluteChildY, child);
                 // If we were able to truncate, don't paint.
-                if (ty + child->y() >= renderView->truncatedAt())
+                if (absoluteChildY >= renderView->truncatedAt())
                     break;
             }
         }
 
-        IntPoint childPoint = flipForWritingMode(child, IntPoint(tx, ty), ParentToChildFlippingAdjustment);
+        IntPoint childPoint = flipForWritingMode(child, paintOffset, ParentToChildFlippingAdjustment);
         if (!child->hasSelfPaintingLayer() && !child->isFloating())
             child->paint(info, childPoint.x(), childPoint.y());
@@ -2422 +2423 @@
         bool checkAfterAlways = !childrenInline() && (usePrintRect && child->style()->pageBreakAfter() == PBALWAYS);
         if (checkAfterAlways
-            && (ty + child->y() + child->height()) > paintInfo.rect.y()
-            && (ty + child->y() + child->height()) < paintInfo.rect.maxY()) {
-            view()->setBestTruncatedAt(ty + child->y() + child->height() + max(0, child->collapsedMarginAfter()), this, true);
+            && (absoluteChildY + child->height()) > paintInfo.rect.y()
+            && (absoluteChildY + child->height()) < paintInfo.rect.maxY()) {
+            view()->setBestTruncatedAt(absoluteChildY + child->height() + max(0, child->collapsedMarginAfter()), this, true);
             return;
         }
@@ -2502 +2503 @@
             paintColumnContents(paintInfo, scrolledOffset.x(), scrolledOffset.y(), true);
         else
-            paintFloats(paintInfo, scrolledOffset.x(), scrolledOffset.y(), paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip);
+            paintFloats(paintInfo, scrolledOffset, paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip);
     }
 
@@ -2555 +2556 @@
 }
 
-void RenderBlock::paintFloats(PaintInfo& paintInfo, int tx, int ty, bool preservePhase)
+void RenderBlock::paintFloats(PaintInfo& paintInfo, const IntPoint& paintOffset, bool preservePhase)
 {
     if (!m_floatingObjects)
@@ -2568 +2569 @@
             PaintInfo currentPaintInfo(paintInfo);
             currentPaintInfo.phase = preservePhase ? paintInfo.phase : PaintPhaseBlockBackground;
-            IntPoint childPoint = flipFloatForWritingMode(r, IntPoint(tx + xPositionForFloatIncludingMargin(r) - r->m_renderer->x(), ty + yPositionForFloatIncludingMargin(r) - r->m_renderer->y()));
+            IntPoint childPoint = flipFloatForWritingMode(r, IntPoint(paintOffset.x() + xPositionForFloatIncludingMargin(r) - r->m_renderer->x(), paintOffset.y() + yPositionForFloatIncludingMargin(r) - r->m_renderer->y()));
             r->m_renderer->paint(currentPaintInfo, childPoint.x(), childPoint.y());
             if (!preservePhase) {
@@ -2584 +2585 @@
 }
 
-void RenderBlock::paintEllipsisBoxes(PaintInfo& paintInfo, int tx, int ty)
+void RenderBlock::paintEllipsisBoxes(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     if (!paintInfo.shouldPaintWithinRoot(this) || !firstLineBox())
@@ -2592 +2593 @@
         // We can check the first box and last box and avoid painting if we don't
         // intersect.
-        int yPos = ty + firstLineBox()->y();
+        int yPos = paintOffset.y() + firstLineBox()->y();
         int h = lastLineBox()->y() + lastLineBox()->logicalHeight() - firstLineBox()->y();
         if (yPos >= paintInfo.rect.maxY() || yPos + h <= paintInfo.rect.y())
@@ -2601 +2602 @@
         // based off positions of our first line box or our last line box.
         for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
-            yPos = ty + curr->y();
+            yPos = paintOffset.y() + curr->y();
             h = curr->logicalHeight();
             if (curr->ellipsisBox() && yPos < paintInfo.rect.maxY() && yPos + h > paintInfo.rect.y())
-                curr->paintEllipsisBox(paintInfo, IntPoint(tx, ty), curr->lineTop(), curr->lineBottom());
+                curr->paintEllipsisBox(paintInfo, paintOffset, curr->lineTop(), curr->lineBottom());
         }
     }

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -560 +560 @@
     // End of functions defined in RenderBlockLineLayout.cpp.
 
-    void paintFloats(PaintInfo&, int tx, int ty, bool preservePhase = false);
+    void paintFloats(PaintInfo&, const IntPoint&, bool preservePhase = false);
     void paintContents(PaintInfo&, int tx, int ty);
     void paintColumnContents(PaintInfo&, int tx, int ty, bool paintFloats = false);
     void paintColumnRules(PaintInfo&, int tx, int ty);
-    void paintChildren(PaintInfo&, int tx, int ty);
-    void paintEllipsisBoxes(PaintInfo&, int tx, int ty);
+    void paintChildren(PaintInfo&, const IntPoint&);
+    void paintEllipsisBoxes(PaintInfo&, const IntPoint&);
     void paintSelection(PaintInfo&, int tx, int ty);
     void paintCaret(PaintInfo&, const IntPoint&, CaretType);