Changeset 86377 in webkit

Timestamp:

May 12, 2011 2:05:13 PM (13 years ago)

Author:

leviw@chromium.org

Message:

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

Reviewed by Eric Seidel.

Switch paintMask and paintMaskImages off of ints
​https://bugs.webkit.org/show_bug.cgi?id=60578

Primarily switching paintMask and paintMaskImages to use IntSize and IntRect respectively.
In the process of that:

• added an "expand" function to IntRect that allows you to add an IntSize or pair of integers to the size portion of an IntRect.
• changed borderFitAdjust to take an IntRect. It modifies only the x and width attributes.

No new tests since this refactoring.

• platform/graphics/IntRect.h: (WebCore::IntRect::expand): Added for convenience.
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintObject): (WebCore::RenderBlock::borderFitAdjust):
• rendering/RenderBlock.h:
• rendering/RenderBox.cpp: (WebCore::RenderBox::paintBoxDecorationsWithSize): (WebCore::RenderBox::paintMask): (WebCore::RenderBox::paintMaskImages):
• rendering/RenderBox.h: (WebCore::RenderBox::borderFitAdjust):
• rendering/RenderFieldset.cpp: (WebCore::RenderFieldset::paintMask):
• rendering/RenderFieldset.h:
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::paint):
• rendering/RenderReplica.cpp: (WebCore::RenderReplica::paint):
• rendering/RenderTable.cpp: (WebCore::RenderTable::paintObject): (WebCore::RenderTable::paintMask):
• rendering/RenderTable.h:
• rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::paintMask):
• rendering/RenderTableCell.h:
• rendering/RenderWidget.cpp: (WebCore::RenderWidget::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/IntRect.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (4 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (4 diffs)
• rendering/RenderBox.h (modified) (3 diffs)
• rendering/RenderFieldset.cpp (modified) (2 diffs)
• rendering/RenderFieldset.h (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)
• rendering/RenderReplica.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (2 diffs)
• rendering/RenderTable.h (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (2 diffs)
• rendering/RenderTableCell.h (modified) (1 diff)
• rendering/RenderWidget.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-12  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Switch paintMask and paintMaskImages off of ints
+        https://bugs.webkit.org/show_bug.cgi?id=60578
+
+        Primarily switching paintMask and paintMaskImages to use IntSize and IntRect respectively.
+        In the process of that:
+         - added an "expand" function to IntRect that allows you to add an IntSize or pair of
+           integers to the size portion of an IntRect.
+         - changed borderFitAdjust to take an IntRect. It modifies only the x and width attributes.
+
+        No new tests since this refactoring.
+
+        * platform/graphics/IntRect.h:
+        (WebCore::IntRect::expand): Added for convenience.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject):
+        (WebCore::RenderBlock::borderFitAdjust):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBoxDecorationsWithSize):
+        (WebCore::RenderBox::paintMask):
+        (WebCore::RenderBox::paintMaskImages):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::borderFitAdjust):
+        * rendering/RenderFieldset.cpp:
+        (WebCore::RenderFieldset::paintMask):
+        * rendering/RenderFieldset.h:
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::paint):
+        * rendering/RenderReplica.cpp:
+        (WebCore::RenderReplica::paint):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::paintObject):
+        (WebCore::RenderTable::paintMask):
+        * rendering/RenderTable.h:
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintMask):
+        * rendering/RenderTableCell.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::paint):
+
 2011-05-12  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/platform/graphics/IntRect.h

@@ -108 +108 @@
     IntPoint center() const { return IntPoint(x() + width() / 2, y() + height() / 2); }
 
-    void move(const IntSize& s) { m_location += s; } 
+    void move(const IntSize& size) { m_location += size; } 
     void move(int dx, int dy) { m_location.move(dx, dy); } 
-    
+
+    void expand(const IntSize& size) { m_location += size; }
+    void expand(int dw, int dh) { m_size.expand(dw, dh); }
+
     void shiftXEdgeTo(int edge)
     {

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2463 +2463 @@
 
     if (paintPhase == PaintPhaseMask && style()->visibility() == VISIBLE) {
-        paintMask(paintInfo, tx, ty);
+        paintMask(paintInfo, IntSize(tx, ty));
         return;
     }
@@ -5596 +5596 @@
 }
 
-void RenderBlock::borderFitAdjust(int& x, int& w) const
+void RenderBlock::borderFitAdjust(IntRect& rect) const
 {
     if (style()->borderFit() == BorderFitBorder)
@@ -5604 +5604 @@
     int left = INT_MAX;
     int right = INT_MIN;
-    int oldWidth = w;
+    int oldWidth = rect.width();
     adjustForBorderFit(0, left, right);
     if (left != INT_MAX) {
         left -= (borderLeft() + paddingLeft());
         if (left > 0) {
-            x += left;
-            w -= left;
+            rect.move(left, 0);
+            rect.expand(-left, 0);
         }
     }
@@ -5616 +5616 @@
         right += (borderRight() + paddingRight());
         if (right < oldWidth)
-            w -= (oldWidth - right);
+            rect.expand(-(oldWidth - right), 0);
     }
 }

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -361 +361 @@
     BidiRun* handleTrailingSpaces(BidiRunList<BidiRun>&, BidiContext*);
 
-    virtual void borderFitAdjust(int& x, int& w) const; // Shrink the box in which the border paints if border-fit is set.
+    virtual void borderFitAdjust(IntRect&) const; // Shrink the box in which the border paints if border-fit is set.
 
     virtual void updateBeforeAfterContent(PseudoId);

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -838 +838 @@
     // border-fit can adjust where we paint our border and background.  If set, we snugly fit our line box descendants.  (The iChat
     // balloon layout is an example of this).
-    borderFitAdjust(tx, width);
+    borderFitAdjust(paintRect);
 
     // FIXME: Should eventually give the theme control over whether the box shadow should paint, since controls could have
     // custom shadows of their own.
-    paintBoxShadow(paintInfo.context, tx, ty, width, height, style(), Normal);
+    paintBoxShadow(paintInfo.context, paintRect.x(), paintRect.y(), paintRect.width(), paintRect.height(), style(), Normal);
 
     BackgroundBleedAvoidance bleedAvoidance = determineBackgroundBleedAvoidance(paintInfo.context);
@@ -871 +871 @@
             theme()->paintDecorations(this, paintInfo, paintRect);
     }
-    paintBoxShadow(paintInfo.context, tx, ty, width, height, style(), Inset);
+    paintBoxShadow(paintInfo.context, paintRect.x(), paintRect.y(), paintRect.width(), paintRect.height(), style(), Inset);
 
     // The theme will tell us whether or not we should also paint the CSS border.
     if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, paintRect))) && style()->hasBorder())
-        paintBorder(paintInfo.context, IntRect(tx, ty, width, height), style(), bleedAvoidance);
+        paintBorder(paintInfo.context, paintRect, style(), bleedAvoidance);
 
     if (bleedAvoidance == BackgroundBleedUseTransparencyLayer)
@@ -881 +881 @@
 }
 
-void RenderBox::paintMask(PaintInfo& paintInfo, int tx, int ty)
+void RenderBox::paintMask(PaintInfo& paintInfo, IntSize paintOffset)
 {
     if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask || paintInfo.context->paintingDisabled())
         return;
 
-    int w = width();
-    int h = height();
+    IntRect paintRect = IntRect(toPoint(paintOffset), size());
 
     // border-fit can adjust where we paint our border and background.  If set, we snugly fit our line box descendants.  (The iChat
     // balloon layout is an example of this).
-    borderFitAdjust(tx, w);
-
-    paintMaskImages(paintInfo, tx, ty, w, h);
-}
-
-void RenderBox::paintMaskImages(const PaintInfo& paintInfo, int tx, int ty, int w, int h)
+    borderFitAdjust(paintRect);
+
+    paintMaskImages(paintInfo, paintRect);
+}
+
+void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const IntRect& paintRect)
 {
     // Figure out if we need to push a transparency layer to render our mask.
@@ -954 +953 @@
 
     if (allMaskImagesLoaded) {
-        IntRect paintRect = IntRect(tx, ty, w, h);
         paintFillLayers(paintInfo, Color(), style()->maskLayers(), paintRect, BackgroundBleedNone, compositeOp);
         paintNinePieceImage(paintInfo.context, paintRect, style(), style()->maskBoxImage(), compositeOp);

trunk/Source/WebCore/rendering/RenderBox.h

@@ -253 +253 @@
     int computeContentBoxLogicalHeight(int height) const;
 
-    virtual void borderFitAdjust(int& /*x*/, int& /*w*/) const { } // Shrink the box in which the border paints if border-fit is set.
+    virtual void borderFitAdjust(IntRect&) const { } // Shrink the box in which the border paints if border-fit is set.
 
     // Resolve auto margins in the inline direction of the containing block so that objects can be pushed to the start, middle or end
@@ -346 +346 @@
     virtual void paintObject(PaintInfo&, int /*tx*/, int /*ty*/) { ASSERT_NOT_REACHED(); }
     virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
-    virtual void paintMask(PaintInfo&, int tx, int ty);
+    virtual void paintMask(PaintInfo&, IntSize);
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
@@ -410 +410 @@
 
     void paintBoxDecorationsWithSize(PaintInfo&, int tx, int ty, int width, int height);
-    void paintMaskImages(const PaintInfo&, int tx, int ty, int width, int height);
+    void paintMaskImages(const PaintInfo&, const IntRect&);
 
 #if PLATFORM(MAC)

trunk/Source/WebCore/rendering/RenderFieldset.cpp

@@ -171 +171 @@
 }
 
-void RenderFieldset::paintMask(PaintInfo& paintInfo, int tx, int ty)
+void RenderFieldset::paintMask(PaintInfo& paintInfo, IntSize paintOffset)
 {
     if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
         return;
 
-    int w = width();
-    int h = height();
+    IntRect paintRect = IntRect(toPoint(paintOffset), size());
+    IntSize adjustedSize = size();
     RenderBox* legend = findLegend();
     if (!legend)
-        return RenderBlock::paintMask(paintInfo, tx, ty);
+        return RenderBlock::paintMask(paintInfo, paintOffset);
 
     // FIXME: We need to work with "rl" and "bt" block flow directions.  In those
@@ -187 +187 @@
     if (style()->isHorizontalWritingMode()) {
         int yOff = (legend->y() > 0) ? 0 : (legend->height() - borderTop()) / 2;
-        h -= yOff;
-        ty += yOff;
+        paintRect.expand(0, -yOff);
+        paintRect.move(0, yOff);
     } else {
         int xOff = (legend->x() > 0) ? 0 : (legend->width() - borderLeft()) / 2;
-        w -= xOff;
-        tx += xOff;
-    }
-
-    paintMaskImages(paintInfo, tx, ty, w, h);
+        paintRect.expand(-xOff, 0);
+        paintRect.move(xOff, 0);
+    }
+
+    paintMaskImages(paintInfo, paintRect);
 }
 

trunk/Source/WebCore/rendering/RenderFieldset.h

@@ -46 +46 @@
 
     virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
-    virtual void paintMask(PaintInfo&, int tx, int ty);
+    virtual void paintMask(PaintInfo&, IntSize);
 };
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -107 +107 @@
     
     if (paintInfo.phase == PaintPhaseMask) {
-        paintMask(paintInfo, tx, ty);
+        paintMask(paintInfo, IntSize(tx, ty));
         return;
     }

trunk/Source/WebCore/rendering/RenderReplica.cpp

@@ -77 +77 @@
                                       RenderLayer::PaintLayerHaveTransparency | RenderLayer::PaintLayerAppliedTransform | RenderLayer::PaintLayerTemporaryClipRects | RenderLayer::PaintLayerPaintingReflection);
     else if (paintInfo.phase == PaintPhaseMask)
-        paintMask(paintInfo, tx, ty);
+        paintMask(paintInfo, IntSize(tx, ty));
 }
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -481 +481 @@
 
     if (paintPhase == PaintPhaseMask) {
-        paintMask(paintInfo, tx, ty);
+        paintMask(paintInfo, IntSize(tx, ty));
         return;
     }
@@ -574 +574 @@
 }
 
-void RenderTable::paintMask(PaintInfo& paintInfo, int tx, int ty)
+void RenderTable::paintMask(PaintInfo& paintInfo, IntSize paintOffset)
 {
     if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
         return;
 
-    IntRect rect(tx, ty, width(), height());
+    IntRect rect(toPoint(paintOffset), size());
     subtractCaptionRect(rect);
 
-    paintMaskImages(paintInfo, rect.x(), rect.y(), rect.width(), rect.height());
+    paintMaskImages(paintInfo, rect);
 }
 

trunk/Source/WebCore/rendering/RenderTable.h

@@ -218 +218 @@
     virtual void paintObject(PaintInfo&, int tx, int ty);
     virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
-    virtual void paintMask(PaintInfo&, int tx, int ty);
+    virtual void paintMask(PaintInfo&, IntSize);
     virtual void layout();
     virtual void computePreferredLogicalWidths();

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -1024 +1024 @@
 }
 
-void RenderTableCell::paintMask(PaintInfo& paintInfo, int tx, int ty)
+void RenderTableCell::paintMask(PaintInfo& paintInfo, IntSize paintOffset)
 {
     if (style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
@@ -1032 +1032 @@
     if (!tableElt->collapseBorders() && style()->emptyCells() == HIDE && !firstChild())
         return;
-
-    int w = width();
-    int h = height();
    
-    paintMaskImages(paintInfo, tx, ty, w, h);
+    paintMaskImages(paintInfo, IntRect(toPoint(paintOffset), size()));
 }
 

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -144 +144 @@
 
     virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
-    virtual void paintMask(PaintInfo&, int tx, int ty);
+    virtual void paintMask(PaintInfo&, IntSize);
 
     virtual IntSize offsetFromContainer(RenderObject*, const IntPoint&) const;

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -259 +259 @@
 
     if (paintInfo.phase == PaintPhaseMask) {
-        paintMask(paintInfo, tx, ty);
+        paintMask(paintInfo, IntSize(tx, ty));
         return;
     }