Changeset 91417 in webkit

Timestamp:

Jul 20, 2011 4:18:27 PM (13 years ago)

Author:

leviw@chromium.org

Message:

Bring Int/Float graphics classes closer to parity
​https://bugs.webkit.org/show_bug.cgi?id=64833

Reviewed by James Robinson.

In preparation of switching to Floating point data structures, bringing the
functionality and method names of the Int/Float graphics classes close together.

Also fixing some compiler errors when using Floats for layout units along the way.

No new tests, no functionality change.

• page/FrameView.cpp:

(WebCore::FrameView::convertFromRenderer):

• platform/ScrollView.cpp:

(WebCore::ScrollView::wheelEvent):

• platform/ScrollView.h:

(WebCore::ScrollView::convertChildToSelf):
(WebCore::ScrollView::convertSelfToChild):

• platform/graphics/FloatPoint.h:

(WebCore::operator-): Adding a single-parameter version.

• platform/graphics/FloatSize.cpp:

(WebCore::FloatSize::isZero): Adding isZero that uses epsilon for floats.

• platform/graphics/FloatSize.h:
• platform/graphics/IntPoint.h:

(WebCore::IntPoint::moveBy): Renaming IntPoint version to moveBy to mirror FloatPoint.

• platform/graphics/RoundedRect.cpp:

(WebCore::RoundedRect::Radii::expand): Switching to specific templatized max.

• platform/graphics/filters/FilterEffect.cpp:

(WebCore::FilterEffect::requestedRegionOfInputImageData):

• rendering/RenderBlock.cpp: Moving outstanding Int* functions to Layout units.

(WebCore::RenderBlock::paintContinuationOutlines):
(WebCore::RenderBlock::logicalRectToPhysicalRect):

• rendering/RenderBlock.h:
• rendering/RenderBox.cpp:

(WebCore::RenderBox::positionForPoint):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::subtractCaptionRect):

• rendering/RenderTable.h:
• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::styleOrColLogicalWidth):
(WebCore::RenderTableCell::setOverrideSizeFromRowHeight):
(WebCore::RenderTableCell::paintCollapsedBorder):
(WebCore::RenderTableCell::paintBackgroundsBehindCell):

• rendering/RenderTableCell.h:
• rendering/RenderView.h:

(WebCore::RenderView::pushLayoutState):
(WebCore::LayoutStateMaintainer::LayoutStateMaintainer):
(WebCore::LayoutStateMaintainer::push):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::paddedLayoutOverflowRect):
(WebCore::setAscentAndDescent):

• rendering/RootInlineBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• platform/ScrollView.cpp (modified) (2 diffs)
• platform/ScrollView.h (modified) (2 diffs)
• platform/graphics/FloatPoint.h (modified) (1 diff)
• platform/graphics/FloatSize.cpp (modified) (2 diffs)
• platform/graphics/FloatSize.h (modified) (1 diff)
• platform/graphics/IntPoint.h (modified) (1 diff)
• platform/graphics/RoundedRect.cpp (modified) (1 diff)
• platform/graphics/filters/FilterEffect.cpp (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/RenderTable.h (modified) (2 diffs)
• rendering/RenderTableCell.cpp (modified) (4 diffs)
• rendering/RenderTableCell.h (modified) (2 diffs)
• rendering/RenderView.h (modified) (3 diffs)
• rendering/RootInlineBox.cpp (modified) (2 diffs)
• rendering/RootInlineBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-20  Levi Weintraub  <leviw@chromium.org>
+
+        Bring Int/Float graphics classes closer to parity
+        https://bugs.webkit.org/show_bug.cgi?id=64833
+
+        Reviewed by James Robinson.
+
+        In preparation of switching to Floating point data structures, bringing the
+        functionality and method names of the Int/Float graphics classes close together.
+
+        Also fixing some compiler errors when using Floats for layout units along the way.
+
+        No new tests, no functionality change.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::convertFromRenderer):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::wheelEvent):
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::convertChildToSelf):
+        (WebCore::ScrollView::convertSelfToChild):
+        * platform/graphics/FloatPoint.h:
+        (WebCore::operator-): Adding a single-parameter version.
+        * platform/graphics/FloatSize.cpp:
+        (WebCore::FloatSize::isZero): Adding isZero that uses epsilon for floats.
+        * platform/graphics/FloatSize.h:
+        * platform/graphics/IntPoint.h:
+        (WebCore::IntPoint::moveBy): Renaming IntPoint version to moveBy to mirror FloatPoint.
+        * platform/graphics/RoundedRect.cpp:
+        (WebCore::RoundedRect::Radii::expand): Switching to specific templatized max.
+        * platform/graphics/filters/FilterEffect.cpp:
+        (WebCore::FilterEffect::requestedRegionOfInputImageData):
+        * rendering/RenderBlock.cpp: Moving outstanding Int* functions to Layout units.
+        (WebCore::RenderBlock::paintContinuationOutlines):
+        (WebCore::RenderBlock::logicalRectToPhysicalRect):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::positionForPoint):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::subtractCaptionRect):
+        * rendering/RenderTable.h:
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::styleOrColLogicalWidth):
+        (WebCore::RenderTableCell::setOverrideSizeFromRowHeight):
+        (WebCore::RenderTableCell::paintCollapsedBorder):
+        (WebCore::RenderTableCell::paintBackgroundsBehindCell):
+        * rendering/RenderTableCell.h:
+        * rendering/RenderView.h:
+        (WebCore::RenderView::pushLayoutState):
+        (WebCore::LayoutStateMaintainer::LayoutStateMaintainer):
+        (WebCore::LayoutStateMaintainer::push):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::paddedLayoutOverflowRect):
+        (WebCore::setAscentAndDescent):
+        * rendering/RootInlineBox.h:
+
 2011-07-20  Scott Graham  <scottmg@chromium.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2704 +2704 @@
 
     // Convert from page ("absolute") to FrameView coordinates.
-    point.move(-scrollPosition());
+    point.moveBy(-scrollPosition());
     return point;
 }

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -1143 +1143 @@
     // Scrollbars won't be transformed within us
     IntPoint newPoint = localPoint;
-    newPoint.move(scrollbar->location());
+    newPoint.moveBy(scrollbar->location());
     return newPoint;
 }
@@ -1151 +1151 @@
     IntPoint newPoint = parentPoint;
     // Scrollbars won't be transformed within us
-    newPoint.move(-scrollbar->location());
+    newPoint.moveBy(-scrollbar->location());
     return newPoint;
 }

trunk/Source/WebCore/platform/ScrollView.h

@@ -244 +244 @@
         if (!isScrollViewScrollbar(child))
             newPoint = point - scrollOffset();
-        newPoint.move(child->location());
+        newPoint.moveBy(child->location());
         return newPoint;
     }
@@ -253 +253 @@
         if (!isScrollViewScrollbar(child))
             newPoint = point + scrollOffset();
-        newPoint.move(-child->location());
+        newPoint.moveBy(-child->location());
         return newPoint;
     }

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

@@ -213 +213 @@
 }
 
+inline FloatPoint operator-(const FloatPoint& a)
+{
+    return FloatPoint(-a.x(), -a.y());
+}
+
 inline bool operator==(const FloatPoint& a, const FloatPoint& b)
 {

trunk/Source/WebCore/platform/graphics/FloatSize.cpp

@@ -30 +30 @@
 #include "FloatConversion.h"
 #include "IntSize.h"
+#include <limits>
 #include <math.h>
+
+using namespace std;
 
 namespace WebCore {
@@ -43 +46 @@
 }
 
+bool FloatSize::isZero() const
+{
+    return fabs(m_width) < numeric_limits<float>::epsilon() && fabs(m_height) < numeric_limits<float>::epsilon();
+}
+
 FloatSize FloatSize::narrowPrecision(double width, double height)
 {

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

@@ -63 +63 @@
 
     bool isEmpty() const { return m_width <= 0 || m_height <= 0; }
+    bool isZero() const;
 
     float aspectRatio() const { return m_width / m_height; }

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

@@ -92 +92 @@
 
     void move(const IntSize& s) { move(s.width(), s.height()); } 
-    void move(const IntPoint& offset) { move(offset.x(), offset.y()); }
+    void moveBy(const IntPoint& offset) { move(offset.x(), offset.y()); }
     void move(int dx, int dy) { m_x += dx; m_y += dy; }
     void scale(float sx, float sy)

trunk/Source/WebCore/platform/graphics/RoundedRect.cpp

@@ -62 +62 @@
 void RoundedRect::Radii::expand(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth)
 {
-    m_topLeft.setWidth(max(0, m_topLeft.width() + leftWidth));
-    m_topLeft.setHeight(max(0, m_topLeft.height() + topWidth));
+    m_topLeft.setWidth(max<LayoutUnit>(0, m_topLeft.width() + leftWidth));
+    m_topLeft.setHeight(max<LayoutUnit>(0, m_topLeft.height() + topWidth));
 
-    m_topRight.setWidth(max(0, m_topRight.width() + rightWidth));
-    m_topRight.setHeight(max(0, m_topRight.height() + topWidth));
+    m_topRight.setWidth(max<LayoutUnit>(0, m_topRight.width() + rightWidth));
+    m_topRight.setHeight(max<LayoutUnit>(0, m_topRight.height() + topWidth));
 
-    m_bottomLeft.setWidth(max(0, m_bottomLeft.width() + leftWidth));
-    m_bottomLeft.setHeight(max(0, m_bottomLeft.height() + bottomWidth));
+    m_bottomLeft.setWidth(max<LayoutUnit>(0, m_bottomLeft.width() + leftWidth));
+    m_bottomLeft.setHeight(max<LayoutUnit>(0, m_bottomLeft.height() + bottomWidth));
 
-    m_bottomRight.setWidth(max(0, m_bottomRight.width() + rightWidth));
-    m_bottomRight.setHeight(max(0, m_bottomRight.height() + bottomWidth));
+    m_bottomRight.setWidth(max<LayoutUnit>(0, m_bottomRight.width() + rightWidth));
+    m_bottomRight.setHeight(max<LayoutUnit>(0, m_bottomRight.height() + bottomWidth));
 }
 

trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp

@@ -70 +70 @@
     ASSERT(hasResult());
     IntPoint location = m_absolutePaintRect.location();
-    location.move(-effectRect.location());
+    location.moveBy(-effectRect.location());
     return IntRect(location, m_absolutePaintRect.size());
 }

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2702 +2702 @@
         RenderBlock* block = flow->containingBlock();
         for ( ; block && block != this; block = block->containingBlock())
-            accumulatedPaintOffset.move(block->location());
+            accumulatedPaintOffset.moveBy(block->location());
         ASSERT(block);   
         flow->paintOutline(info.context, accumulatedPaintOffset);
@@ -2808 +2808 @@
 }
 
-IntRect RenderBlock::logicalRectToPhysicalRect(const IntPoint& rootBlockPhysicalPosition, const IntRect& logicalRect)
-{
-    IntRect result;
+LayoutRect RenderBlock::logicalRectToPhysicalRect(const LayoutPoint& rootBlockPhysicalPosition, const LayoutRect& logicalRect)
+{
+    LayoutRect result;
     if (isHorizontalWritingMode())
         result = logicalRect;
     else
-        result = IntRect(logicalRect.y(), logicalRect.x(), logicalRect.height(), logicalRect.width());
+        result = LayoutRect(logicalRect.y(), logicalRect.x(), logicalRect.height(), logicalRect.width());
     flipForWritingMode(result);
     result.moveBy(rootBlockPhysicalPosition);

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -142 +142 @@
                                         RenderObject* selObj, LayoutUnit logicalRight, LayoutUnit logicalTop, LayoutUnit logicalHeight, const PaintInfo*);
     void getSelectionGapInfo(SelectionState, bool& leftGap, bool& rightGap);
-    IntRect logicalRectToPhysicalRect(const IntPoint& physicalPosition, const IntRect& logicalRect);
+    LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, const LayoutRect& logicalRect);
         
     // Helper methods for computing line counts and heights for line counts.

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3121 +3121 @@
     LayoutPoint adjustedPoint = point;
     if (isTableRow())
-        adjustedPoint.move(location());
+        adjustedPoint.moveBy(location());
 
     for (RenderObject* renderObject = firstChild(); renderObject; renderObject = renderObject->nextSibling()) {

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -532 +532 @@
 }
 
-void RenderTable::subtractCaptionRect(IntRect& rect) const
+void RenderTable::subtractCaptionRect(LayoutRect& rect) const
 {
     if (!m_caption)
         return;
 
-    int captionLogicalHeight = m_caption->logicalHeight() + m_caption->marginBefore() + m_caption->marginAfter();
+    LayoutUnit captionLogicalHeight = m_caption->logicalHeight() + m_caption->marginBefore() + m_caption->marginAfter();
     bool captionIsBefore = (m_caption->style()->captionSide() != CAPBOTTOM) ^ style()->isFlippedBlocksWritingMode();
     if (style()->isHorizontalWritingMode()) {

trunk/Source/WebCore/rendering/RenderTable.h

@@ -217 +217 @@
     virtual void paint(PaintInfo&, const LayoutPoint&);
     virtual void paintObject(PaintInfo&, const LayoutPoint&);
-    virtual void paintBoxDecorations(PaintInfo&, const IntPoint&);
-    virtual void paintMask(PaintInfo&, const IntPoint&);
+    virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
+    virtual void paintMask(PaintInfo&, const LayoutPoint&);
     virtual void layout();
     virtual void computePreferredLogicalWidths();
@@ -236 +236 @@
     virtual void addOverflowFromChildren();
 
-    void subtractCaptionRect(IntRect&) const;
+    void subtractCaptionRect(LayoutRect&) const;
 
     void recalcCaption(RenderBlock*) const;

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -116 +116 @@
         // See Bugzilla bug 8126 for details.
         if (colWidthSum.isFixed() && colWidthSum.value() > 0)
-            colWidthSum = Length(max(0, colWidthSum.value() - borderAndPaddingLogicalWidth()), Fixed);
+            colWidthSum = Length(max<LayoutUnit>(0, colWidthSum.value() - borderAndPaddingLogicalWidth()), Fixed);
         return colWidthSum;
     }
@@ -216 +216 @@
 {
     clearIntrinsicPadding();
-    RenderBlock::setOverrideSize(LayoutSize(0, max(0, rowHeight - borderBefore() - paddingBefore() - borderAfter() - paddingAfter())));
+    RenderBlock::setOverrideSize(LayoutSize(0, max<LayoutUnit>(0, rowHeight - borderBefore() - paddingBefore() - borderAfter() - paddingAfter())));
 }
 
@@ -913 +913 @@
 }
 
-void RenderTableCell::paintCollapsedBorder(GraphicsContext* graphicsContext, const IntRect& paintRect)
+void RenderTableCell::paintCollapsedBorder(GraphicsContext* graphicsContext, const LayoutRect& paintRect)
 {
     if (!table()->currentBorderStyle() || graphicsContext->paintingDisabled())
@@ -979 +979 @@
     LayoutPoint adjustedPaintOffset = paintOffset;
     if (backgroundObject != this)
-        adjustedPaintOffset.move(location());
+        adjustedPaintOffset.moveBy(location());
 
     Color c = backgroundObject->style()->visitedDependentColor(CSSPropertyBackgroundColor);

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -97 +97 @@
     virtual void paint(PaintInfo&, const LayoutPoint&);
 
-    void paintBackgroundsBehindCell(PaintInfo&, const IntPoint&, RenderObject* backgroundObject);
+    void paintBackgroundsBehindCell(PaintInfo&, const LayoutPoint&, RenderObject* backgroundObject);
 
     int cellBaselinePosition() const;
@@ -151 +151 @@
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
 
-    void paintCollapsedBorder(GraphicsContext*, const IntRect&);
+    void paintCollapsedBorder(GraphicsContext*, const LayoutRect&);
 
     int m_row;

trunk/Source/WebCore/rendering/RenderView.h

@@ -174 +174 @@
 
     // These functions may only be accessed by LayoutStateMaintainer.
-    bool pushLayoutState(RenderBox* renderer, const IntSize& offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
+    bool pushLayoutState(RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
     {
         // We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
@@ -267 +267 @@
 public:
     // ctor to push now
-    LayoutStateMaintainer(RenderView* view, RenderBox* root, IntSize offset, bool disableState = false, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
+    LayoutStateMaintainer(RenderView* view, RenderBox* root, LayoutSize offset, bool disableState = false, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
         : m_view(view)
         , m_disabled(disableState)
@@ -292 +292 @@
     }
 
-    void push(RenderBox* root, IntSize offset, int pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
+    void push(RenderBox* root, LayoutSize offset, LayoutUnit pageHeight = 0, bool pageHeightChanged = false, ColumnInfo* colInfo = 0)
     {
         ASSERT(!m_didStart);

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -533 +533 @@
 }
 
-IntRect RootInlineBox::paddedLayoutOverflowRect(int endPadding) const
-{
-    IntRect lineLayoutOverflow = layoutOverflowRect(lineTop(), lineBottom());
+LayoutRect RootInlineBox::paddedLayoutOverflowRect(LayoutUnit endPadding) const
+{
+    LayoutRect lineLayoutOverflow = layoutOverflowRect(lineTop(), lineBottom());
     if (!endPadding)
         return lineLayoutOverflow;
     
+    // FIXME: Audit whether to use pixel snapped values when not using integers for layout: https://bugs.webkit.org/show_bug.cgi?id=63656
     if (isHorizontal()) {
         if (isLeftToRightDirection())
-            lineLayoutOverflow.shiftMaxXEdgeTo(max(lineLayoutOverflow.maxX(), pixelSnappedLogicalRight() + endPadding));
+            lineLayoutOverflow.shiftMaxXEdgeTo(max<LayoutUnit>(lineLayoutOverflow.maxX(), pixelSnappedLogicalRight() + endPadding));
         else
-            lineLayoutOverflow.shiftXEdgeTo(min(lineLayoutOverflow.x(), pixelSnappedLogicalLeft() - endPadding));
+            lineLayoutOverflow.shiftXEdgeTo(min<LayoutUnit>(lineLayoutOverflow.x(), pixelSnappedLogicalLeft() - endPadding));
     } else {
         if (isLeftToRightDirection())
-            lineLayoutOverflow.shiftMaxYEdgeTo(max(lineLayoutOverflow.maxY(), pixelSnappedLogicalRight() + endPadding));
+            lineLayoutOverflow.shiftMaxYEdgeTo(max<LayoutUnit>(lineLayoutOverflow.maxY(), pixelSnappedLogicalRight() + endPadding));
         else
-            lineLayoutOverflow.shiftYEdgeTo(min(lineLayoutOverflow.y(), pixelSnappedLogicalLeft() - endPadding));
+            lineLayoutOverflow.shiftYEdgeTo(min<LayoutUnit>(lineLayoutOverflow.y(), pixelSnappedLogicalLeft() - endPadding));
     }
     
@@ -554 +555 @@
 }
 
-static void setAscentAndDescent(int& ascent, int& descent, int newAscent, int newDescent, bool& ascentDescentSet)
+static void setAscentAndDescent(LayoutUnit& ascent, LayoutUnit& descent, LayoutUnit newAscent, LayoutUnit newDescent, bool& ascentDescentSet)
 {
     if (!ascentDescentSet) {

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -139 +139 @@
     bool hasAnnotationsAfter() const { return m_hasAnnotationsAfter; }
 
-    IntRect paddedLayoutOverflowRect(int endPadding) const;
+    LayoutRect paddedLayoutOverflowRect(LayoutUnit endPadding) const;
 
     void ascentAndDescentForBox(InlineBox*, GlyphOverflowAndFallbackFontsMap&, LayoutUnit& ascent, LayoutUnit& descent, bool& affectsAscent, bool& affectsDescent) const;