Changeset 112936 in webkit

Timestamp:

Apr 2, 2012 2:00:08 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Correct remaining LayoutUnit misuse in RenderReplaced and RenderFlexibleBox
​https://bugs.webkit.org/show_bug.cgi?id=82899

Reviewed by Darin Adler.

Removing remaining LayoutUnit misuse and compiler errors that exist in RenderReplaced
and RenderFlexibleBox once LayoutUnit becomes sub-pixel.

No new tests. No change in behavior.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::repositionLogicalHeightDependentFlexItems): Switching
a raw zero in a ternary operation to zeroLayoutUnit.
(WebCore::RenderFlexibleBox::applyStretchAlignmentToChild): Ditto for std::max.

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::paint): Adding missing pixel snapping before painting.
(WebCore::RenderReplaced::computeReplacedLogicalWidth): Like above, switching
a raw zero to zeroLayoutUnit.
(WebCore::RenderReplaced::computePreferredLogicalWidths): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (2 diffs)
• rendering/RenderReplaced.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-02  Levi Weintraub  <leviw@chromium.org>
+
+        Correct remaining LayoutUnit misuse in RenderReplaced and RenderFlexibleBox
+        https://bugs.webkit.org/show_bug.cgi?id=82899
+
+        Reviewed by Darin Adler.
+
+        Removing remaining LayoutUnit misuse and compiler errors that exist in RenderReplaced
+        and RenderFlexibleBox once LayoutUnit becomes sub-pixel.
+
+        No new tests. No change in behavior.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::repositionLogicalHeightDependentFlexItems): Switching
+        a raw zero in a ternary operation to zeroLayoutUnit.
+        (WebCore::RenderFlexibleBox::applyStretchAlignmentToChild): Ditto for std::max.
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::paint): Adding missing pixel snapping before painting.
+        (WebCore::RenderReplaced::computeReplacedLogicalWidth): Like above, switching
+        a raw zero to zeroLayoutUnit.
+        (WebCore::RenderReplaced::computePreferredLogicalWidths): Ditto.
+
 2012-04-02  Ken Buchanan  <kenrb@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -297 +297 @@
 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts, LayoutUnit& oldClientAfterEdge)
 {
-    LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? 0 : lineContexts[0].crossAxisOffset;
+    LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? zeroLayoutUnit : lineContexts[0].crossAxisOffset;
     packFlexLines(iterator, lineContexts);
 
@@ -1121 +1121 @@
         // FIXME: Handle min-width and max-width.
         LayoutUnit childWidth = lineCrossAxisExtent - crossAxisMarginExtentForChild(child);
-        child->setOverrideWidth(std::max(0, childWidth));
+        child->setOverrideWidth(std::max(zeroLayoutUnit, childWidth));
         child->setChildNeedsLayout(true);
         child->layoutIfNeeded();

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -162 +162 @@
         LayoutRect selectionPaintingRect = localSelectionRect();
         selectionPaintingRect.moveBy(adjustedPaintOffset);
-        paintInfo.context->fillRect(selectionPaintingRect, selectionBackgroundColor(), style()->colorSpace());
+        paintInfo.context->fillRect(pixelSnappedIntRect(selectionPaintingRect), selectionBackgroundColor(), style()->colorSpace());
     }
 }
@@ -361 +361 @@
                 LayoutUnit marginStart = minimumValueForLength(style()->marginStart(), logicalWidth);
                 LayoutUnit marginEnd = minimumValueForLength(style()->marginEnd(), logicalWidth);
-                logicalWidth = max(0, logicalWidth - (marginStart + marginEnd + (width() - clientWidth())));
+                logicalWidth = max(zeroLayoutUnit, logicalWidth - (marginStart + marginEnd + (width() - clientWidth())));
                 if (isPercentageIntrinsicSize)
                     logicalWidth = roundToInt(logicalWidth * intrinsicSize.width() / 100);
@@ -426 +426 @@
 
     if (style()->maxWidth().isFixed())
-        m_maxPreferredLogicalWidth = min(m_maxPreferredLogicalWidth, style()->maxWidth().value() + (style()->boxSizing() == CONTENT_BOX ? borderAndPadding : zeroLayoutUnit));
+        m_maxPreferredLogicalWidth = min<LayoutUnit>(m_maxPreferredLogicalWidth, style()->maxWidth().value() + (style()->boxSizing() == CONTENT_BOX ? borderAndPadding : zeroLayoutUnit));
 
     if (hasRelativeDimensions())