Changeset 114470 in webkit

Timestamp:

Apr 17, 2012 5:30:04 PM (12 years ago)

Author:

leviw@chromium.org

Message:

2012-04-17 Levi Weintraub <​leviw@chromium.org>

Clean up outstanding LayoutUnit misuse in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=84209

Reviewed by Eric Seidel.

Small changes to a handful of files to prepare trunk for FractionalLayoutUnits.
For more details, see ​https://trac.webkit.org/wiki/LayoutUnit

No new tests. No change in behavior.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): minimumValueForLength preserves
sub-pixel precision, so we should avoid unnecessarily using integers.

• platform/graphics/FractionalLayoutPoint.h:

(WebCore::FractionalLayoutPoint::FractionalLayoutPoint): Adding an explicit constructor from
FractionalLayoutSizes. This mirrors a method in IntPoint.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintBorder): The rects that change come from roundedRects,
which are already pixel-snapped.

• rendering/RenderBoxModelObject.h: Removing a comment that is no longer applicable.
• rendering/RenderTable.cpp:

(WebCore::RenderTable::computeLogicalWidth): Since we layout tables using integers, we
need to explicitly calculate the width to be integral as well to avoid pushing the next element
over by a pixel that we won't later paint with our own box decorations.

• rendering/RenderText.h:

(RenderText): Correcting an unfortunate mismatch between in the return value of linesBoundingBox
between the header and implementation.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::getRoundedBorderFor): We were incorrectly not using the snapped border
rect to pass to calcRadiiFor (which takes an IntRect). Correcting this.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• platform/graphics/FractionalLayoutPoint.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/RenderText.h (modified) (1 diff)
• rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+ 2012-04-17  Levi Weintraub  <leviw@chromium.org>
+
+        Clean up outstanding LayoutUnit misuse in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=84209
+
+        Reviewed by Eric Seidel.
+
+        Small changes to a handful of files to prepare trunk for FractionalLayoutUnits.
+        For more details, see https://trac.webkit.org/wiki/LayoutUnit
+
+        No new tests. No change in behavior.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): minimumValueForLength preserves
+        sub-pixel precision, so we should avoid unnecessarily using integers.
+        * platform/graphics/FractionalLayoutPoint.h:
+        (WebCore::FractionalLayoutPoint::FractionalLayoutPoint): Adding an explicit constructor from
+        FractionalLayoutSizes. This mirrors a method in IntPoint.
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintBorder): The rects that change come from roundedRects,
+        which are already pixel-snapped.
+        * rendering/RenderBoxModelObject.h: Removing a comment that is no longer applicable.
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::computeLogicalWidth): Since we layout tables using integers, we
+        need to explicitly calculate the width to be integral as well to avoid pushing the next element
+        over by a pixel that we won't later paint with our own box decorations.
+        * rendering/RenderText.h:
+        (RenderText): Correcting an unfortunate mismatch between in the return value of linesBoundingBox
+        between the header and implementation.
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::getRoundedBorderFor): We were incorrectly not using the snapped border
+        rect to pass to calcRadiiFor (which takes an IntRect). Correcting this.
+
 2012-04-17  Luke Macpherson  <macpherson@chromium.org>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -2241 +2241 @@
             RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
             if (renderer) {
-                IntRect box = sizingBox(renderer);
+                LayoutRect box = sizingBox(renderer);
                 RenderView* renderView = m_node->document()->renderView();
                 list->append(zoomAdjustedPixelValue(minimumValueForLength(style->transformOriginX(), box.width(), renderView), style.get()));

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

@@ -44 +44 @@
     FractionalLayoutPoint(const IntPoint& point) : m_x(point.x()), m_y(point.y()) { }
     explicit FractionalLayoutPoint(const FloatPoint& size) : m_x(size.x()), m_y(size.y()) { }
+    explicit FractionalLayoutPoint(const FractionalLayoutSize& size) : m_x(size.width()), m_y(size.height()) { }
 
     static FractionalLayoutPoint zero() { return FractionalLayoutPoint(); }

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1911 +1911 @@
 
             if (haveAllDoubleEdges) {
-                LayoutRect innerThirdRect = outerBorder.rect();
-                LayoutRect outerThirdRect = outerBorder.rect();
+                IntRect innerThirdRect = outerBorder.rect();
+                IntRect outerThirdRect = outerBorder.rect();
                 for (int side = BSTop; side <= BSLeft; ++side) {
                     int outerWidth;

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -73 +73 @@
     int pixelSnappedOffsetLeft() const { return roundToInt(offsetLeft()); }
     int pixelSnappedOffsetTop() const { return roundToInt(offsetTop()); }
-    // FIXME: The implementation for these functions will change once we move to subpixel layout. See bug 60318.
     int pixelSnappedOffsetWidth() const;
     int pixelSnappedOffsetHeight() const;

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -241 +241 @@
 
         // Ensure we aren't bigger than our available width.
-        setLogicalWidth(min(availableContentLogicalWidth, maxPreferredLogicalWidth()));
+        setLogicalWidth(min<int>(availableContentLogicalWidth, maxPreferredLogicalWidth()));
     }
 
     // Ensure we aren't smaller than our min preferred width.
-    setLogicalWidth(max(logicalWidth(), minPreferredLogicalWidth()));
+    setLogicalWidth(max<int>(logicalWidth(), minPreferredLogicalWidth()));
 
     // Ensure we aren't smaller than our min-width style.
     Length styleMinLogicalWidth = style()->logicalMinWidth();
     if (styleMinLogicalWidth.isSpecified() && styleMinLogicalWidth.isPositive())
-        setLogicalWidth(max(logicalWidth(), convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth)));
+        setLogicalWidth(max<int>(logicalWidth(), convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth)));
 
     // Finally, with our true width determined, compute our margins for real.

trunk/Source/WebCore/rendering/RenderText.h

@@ -84 +84 @@
                            float& minW, float& maxW, bool& stripFrontSpaces);
 
-    virtual LayoutRect linesBoundingBox() const;
+    virtual IntRect linesBoundingBox() const;
     LayoutRect linesVisualOverflowBoundingBox() const;
 

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -931 +931 @@
     RoundedRect roundedRect(snappedBorderRect);
     if (hasBorderRadius()) {
-        RoundedRect::Radii radii = calcRadiiFor(surround->border, borderRect.size(), renderView);
+        RoundedRect::Radii radii = calcRadiiFor(surround->border, snappedBorderRect.size(), renderView);
         radii.scale(calcConstraintScaleFor(snappedBorderRect, radii));
         roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);