Changeset 88176 in webkit

Timestamp:

Jun 6, 2011 11:43:40 AM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintContents, paintColumnContents, paintColumnRules, and paintSelection to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62134

Switching paintContents, paintColumnContents, paintColumnRules, and paintSelection to take an
IntPoint representing the paint offset instead of a pair of ints.

No new tests as this simple refactoring.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintColumnRules): (WebCore::RenderBlock::paintColumnContents): (WebCore::RenderBlock::paintContents): (WebCore::RenderBlock::paintObject): (WebCore::RenderBlock::paintSelection):
• rendering/RenderBlock.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintContents, paintColumnContents, paintColumnRules, and paintSelection to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62134
+
+        Switching paintContents, paintColumnContents, paintColumnRules, and paintSelection to take an
+        IntPoint representing the paint offset instead of a pair of ints.
+
+        No new tests as this simple refactoring.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintColumnRules):
+        (WebCore::RenderBlock::paintColumnContents):
+        (WebCore::RenderBlock::paintContents):
+        (WebCore::RenderBlock::paintObject):
+        (WebCore::RenderBlock::paintSelection):
+        * rendering/RenderBlock.h:
+
 2011-06-06  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2270 +2270 @@
 }
 
-void RenderBlock::paintColumnRules(PaintInfo& paintInfo, int tx, int ty)
+void RenderBlock::paintColumnRules(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     if (paintInfo.context->paintingDisabled())
@@ -2310 +2310 @@
         // Now paint the column rule.
         if (i < colCount - 1) {
-            int ruleLeft = isHorizontalWritingMode() ? tx + ruleLogicalLeft - ruleWidth / 2 + ruleAdd : tx + borderBefore() + paddingBefore();
+            int ruleLeft = isHorizontalWritingMode() ? paintOffset.x() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd : paintOffset.x() + borderBefore() + paddingBefore();
             int ruleRight = isHorizontalWritingMode() ? ruleLeft + ruleWidth : ruleLeft + contentWidth();
-            int ruleTop = isHorizontalWritingMode() ? ty + borderTop() + paddingTop() : ty + ruleLogicalLeft - ruleWidth / 2 + ruleAdd;
+            int ruleTop = isHorizontalWritingMode() ? paintOffset.y() + borderTop() + paddingTop() : paintOffset.y() + ruleLogicalLeft - ruleWidth / 2 + ruleAdd;
             int ruleBottom = isHorizontalWritingMode() ? ruleTop + contentHeight() : ruleTop + ruleWidth;
             drawLineForBoxSide(paintInfo.context, ruleLeft, ruleTop, ruleRight, ruleBottom,
@@ -2322 +2322 @@
 }
 
-void RenderBlock::paintColumnContents(PaintInfo& paintInfo, int tx, int ty, bool paintingFloats)
+void RenderBlock::paintColumnContents(PaintInfo& paintInfo, const IntPoint& paintOffset, bool paintingFloats)
 {
     // We need to do multiple passes, breaking up our child painting into strips.
@@ -2337 +2337 @@
         int logicalLeftOffset = (isHorizontalWritingMode() ? colRect.x() : colRect.y()) - logicalLeftOffsetForContent();
         IntSize offset = isHorizontalWritingMode() ? IntSize(logicalLeftOffset, currLogicalTopOffset) : IntSize(currLogicalTopOffset, logicalLeftOffset);
-        colRect.move(tx, ty);
+        colRect.moveBy(paintOffset);
         PaintInfo info(paintInfo);
         info.rect.intersect(colRect);
@@ -2349 +2349 @@
 
             // Adjust our x and y when painting.
-            int finalX = tx + offset.width();
-            int finalY = ty + offset.height();
+            IntPoint adjustedPaintOffset = paintOffset + offset;
             if (paintingFloats)
-                paintFloats(info, IntPoint(finalX, finalY), paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip);
+                paintFloats(info, adjustedPaintOffset, paintInfo.phase == PaintPhaseSelection || paintInfo.phase == PaintPhaseTextClip);
             else
-                paintContents(info, finalX, finalY);
+                paintContents(info, adjustedPaintOffset);
         }
 
@@ -2365 +2364 @@
 }
 
-void RenderBlock::paintContents(PaintInfo& paintInfo, int tx, int ty)
+void RenderBlock::paintContents(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     // Avoid painting descendants of the root element when stylesheets haven't loaded.  This eliminates FOUC.
@@ -2374 +2373 @@
 
     if (childrenInline())
-        m_lineBoxes.paint(this, paintInfo, tx, ty);
+        m_lineBoxes.paint(this, paintInfo, paintOffset.x(), paintOffset.y());
     else
-        paintChildren(paintInfo, IntPoint(tx, ty));
+        paintChildren(paintInfo, paintOffset);
 }
 
@@ -2467 +2466 @@
             paintBoxDecorations(paintInfo, paintOffset);
         if (hasColumns())
-            paintColumnRules(paintInfo, paintOffset.x(), paintOffset.y());
+            paintColumnRules(paintInfo, paintOffset);
     }
 
@@ -2487 +2486 @@
     if (paintPhase != PaintPhaseSelfOutline) {
         if (hasColumns())
-            paintColumnContents(paintInfo, scrolledOffset.x(), scrolledOffset.y());
+            paintColumnContents(paintInfo, scrolledOffset);
         else
-            paintContents(paintInfo, scrolledOffset.x(), scrolledOffset.y());
+            paintContents(paintInfo, scrolledOffset);
     }
 
@@ -2496 +2495 @@
     bool isPrinting = document()->printing();
     if (!isPrinting && !hasColumns())
-        paintSelection(paintInfo, scrolledOffset.x(), scrolledOffset.y()); // Fill in gaps in selection on lines and between blocks.
+        paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on lines and between blocks.
 
     // 4. paint floats.
     if (paintPhase == PaintPhaseFloat || paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip) {
         if (hasColumns())
-            paintColumnContents(paintInfo, scrolledOffset.x(), scrolledOffset.y(), true);
+            paintColumnContents(paintInfo, scrolledOffset, true);
         else
             paintFloats(paintInfo, scrolledOffset, paintPhase == PaintPhaseSelection || paintPhase == PaintPhaseTextClip);
@@ -2741 +2740 @@
 }
 
-void RenderBlock::paintSelection(PaintInfo& paintInfo, int tx, int ty)
+void RenderBlock::paintSelection(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     if (shouldPaintSelectionGaps() && paintInfo.phase == PaintPhaseForeground) {
@@ -2749 +2748 @@
         GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
-        IntRect gapRectsBounds = selectionGaps(this, IntPoint(tx, ty), IntSize(), lastTop, lastLeft, lastRight, &paintInfo);
+        IntRect gapRectsBounds = selectionGaps(this, paintOffset, IntSize(), lastTop, lastLeft, lastRight, &paintInfo);
         if (!gapRectsBounds.isEmpty()) {
             if (RenderLayer* layer = enclosingLayer()) {
-                gapRectsBounds.move(IntSize(-tx, -ty));
+                gapRectsBounds.moveBy(-paintOffset);
                 if (!hasLayer()) {
                     IntRect localBounds(gapRectsBounds);

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -561 +561 @@
 
     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 paintContents(PaintInfo&, const IntPoint&);
+    void paintColumnContents(PaintInfo&, const IntPoint&, bool paintFloats = false);
+    void paintColumnRules(PaintInfo&, const IntPoint&);
     void paintChildren(PaintInfo&, const IntPoint&);
     void paintEllipsisBoxes(PaintInfo&, const IntPoint&);
-    void paintSelection(PaintInfo&, int tx, int ty);
+    void paintSelection(PaintInfo&, const IntPoint&);
     void paintCaret(PaintInfo&, const IntPoint&, CaretType);