Title: [165346] trunk/Source/WebCore
- Revision
- 165346
- Author
- za...@apple.com
- Date
- 2014-03-08 18:38:58 -0800 (Sat, 08 Mar 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165345 => 165346)
--- trunk/Source/WebCore/ChangeLog 2014-03-09 02:18:32 UTC (rev 165345)
+++ trunk/Source/WebCore/ChangeLog 2014-03-09 02:38:58 UTC (rev 165346)
@@ -1,3 +1,17 @@
+2014-03-08 Zalan Bujtas <za...@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 <jere...@apple.com>
Allow media element to supply the video layer after fullscreen transition has already begun.
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (165345 => 165346)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-03-09 02:18:32 UTC (rev 165345)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-03-09 02:38:58 UTC (rev 165346)
@@ -2775,7 +2775,7 @@
availableHeight = std::max<LayoutUnit>(0, contentBoxHeight);
}
} 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);
// We need to adjust for min/max height because this method does
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (165345 => 165346)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-03-09 02:18:32 UTC (rev 165345)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-03-09 02:38:58 UTC (rev 165346)
@@ -1277,7 +1277,8 @@
LayoutUnit borderBottom = isBox() ? toRenderBox(this)->borderBottom() : LayoutUnit::fromPixel(0);
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(),
std::min(newOutlineBox.maxY(), oldOutlineBox.maxY()) - decorationsHeight,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
