Changeset 88196 in webkit

Timestamp:

Jun 6, 2011 3:27:19 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch InlineFlowBox::paintMask to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62156

Switching InlineFlowBox::paintMask to take an IntPoint representing the paint
offset instead of a pair of ints.

No new tests as this is simple refactoring.

• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::paint): (WebCore::InlineFlowBox::paintMask):
• rendering/InlineFlowBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (6 diffs)
• rendering/InlineFlowBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch InlineFlowBox::paintMask to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62156
+
+        Switching InlineFlowBox::paintMask to take an IntPoint representing the paint
+        offset instead of a pair of ints.
+
+        No new tests as this is simple refactoring.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paint):
+        (WebCore::InlineFlowBox::paintMask):
+        * rendering/InlineFlowBox.h:
+
 2011-06-06  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -992 +992 @@
             }
         } else if (paintInfo.phase == PaintPhaseMask) {
-            paintMask(paintInfo, paintOffset.x(), paintOffset.y());
+            paintMask(paintInfo, paintOffset);
             return;
         } else {
@@ -1164 +1164 @@
 }
 
-void InlineFlowBox::paintMask(PaintInfo& paintInfo, int tx, int ty)
+void InlineFlowBox::paintMask(PaintInfo& paintInfo, const IntPoint& paintOffset)
 {
     if (!paintInfo.shouldPaintWithinRoot(renderer()) || renderer()->style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
@@ -1177 +1177 @@
     IntRect localRect(frameRect);
     flipForWritingMode(localRect);
-    tx += localRect.x();
-    ty += localRect.y();
+    IntPoint adjustedPaintOffset = paintOffset + localRect.location();
 
     const NinePieceImage& maskNinePieceImage = renderer()->style()->maskBoxImage();
@@ -1199 +1198 @@
     }
 
-    IntRect paintRect = IntRect(IntPoint(tx, ty), frameRect.size());
+    IntRect paintRect = IntRect(adjustedPaintOffset, frameRect.size());
     paintFillLayers(paintInfo, Color(), renderer()->style()->maskLayers(), paintRect, compositeOp);
     
@@ -1209 +1208 @@
     // cases only a single call to draw is required.
     if (!prevLineBox() && !nextLineBox()) {
-        boxModelObject()->paintNinePieceImage(paintInfo.context, IntRect(IntPoint(tx, ty), frameRect.size()), renderer()->style(), maskNinePieceImage, compositeOp);
+        boxModelObject()->paintNinePieceImage(paintInfo.context, IntRect(adjustedPaintOffset, frameRect.size()), renderer()->style(), maskNinePieceImage, compositeOp);
     } else {
         // We have a mask image that spans multiple lines.
@@ -1219 +1218 @@
         for (InlineFlowBox* curr = this; curr; curr = curr->nextLineBox())
             totalLogicalWidth += curr->logicalWidth();
-        int stripX = tx - (isHorizontal() ? logicalOffsetOnLine : 0);
-        int stripY = ty - (isHorizontal() ? 0 : logicalOffsetOnLine);
+        int stripX = adjustedPaintOffset.x() - (isHorizontal() ? logicalOffsetOnLine : 0);
+        int stripY = adjustedPaintOffset.y() - (isHorizontal() ? 0 : logicalOffsetOnLine);
         int stripWidth = isHorizontal() ? totalLogicalWidth : frameRect.width();
         int stripHeight = isHorizontal() ? frameRect.height() : totalLogicalWidth;

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -105 +105 @@
     
     virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
-    virtual void paintMask(PaintInfo&, int tx, int ty);
+    virtual void paintMask(PaintInfo&, const IntPoint&);
     void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, CompositeOperator = CompositeSourceOver);
     void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const IntRect&, CompositeOperator = CompositeSourceOver);