Changeset 165346 in webkit

Timestamp:

Mar 8, 2014 6:38:58 PM (10 years ago)

Author:

Alan Bujtas

Message:

RenderElement::valueForLength() callers misuse bool parameter.
​https://bugs.webkit.org/show_bug.cgi?id=129982

Reviewed by Andreas Kling.

Remove bogus RenderView* parameter.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computePercentageLogicalHeight):

• rendering/RenderElement.cpp:

(WebCore::RenderElement::repaintAfterLayoutIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-08  Zalan Bujtas  <zalan@apple.com>
+
+        RenderElement::valueForLength() callers misuse bool parameter.
+        https://bugs.webkit.org/show_bug.cgi?id=129982
+
+        Reviewed by Andreas Kling.
+
+        Remove bogus RenderView* parameter.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::repaintAfterLayoutIfNeeded):
+
 2014-03-08  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2776 +2776 @@
         }
     } else if (cbstyle.logicalHeight().isViewportPercentage()) {
-        LayoutUnit heightWithScrollbar = valueForLength(cbstyle.logicalHeight(), 0, &view());
+        LayoutUnit heightWithScrollbar = valueForLength(cbstyle.logicalHeight(), 0);
         if (heightWithScrollbar != -1) {
             LayoutUnit contentBoxHeightWithScrollbar = cb->adjustContentBoxLogicalHeightForBoxSizing(heightWithScrollbar);

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -1278 +1278 @@
         LayoutUnit boxHeight = isBox() ? toRenderBox(this)->height() : LayoutUnit();
         LayoutUnit minInsetBottomShadowExtent = std::min<LayoutUnit>(-insetShadowExtent.bottom(), std::min<LayoutUnit>(newBounds.height(), oldBounds.height()));
-        LayoutUnit borderHeight = std::max<LayoutUnit>(borderBottom, std::max<LayoutUnit>(valueForLength(style().borderBottomLeftRadius().height(), boxHeight), valueForLength(style().borderBottomRightRadius().height(), boxHeight, &view())));
+        LayoutUnit borderHeight = std::max<LayoutUnit>(borderBottom, std::max<LayoutUnit>(valueForLength(style().borderBottomLeftRadius().height(), boxHeight),
+            valueForLength(style().borderBottomRightRadius().height(), boxHeight)));
         LayoutUnit decorationsHeight = std::max<LayoutUnit>(-outlineStyle.outlineOffset(), borderHeight + minInsetBottomShadowExtent) + std::max<LayoutUnit>(outlineWidth, shadowBottom);
         LayoutRect bottomRect(newOutlineBox.x(),