Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index 75bf14fcddd65d3f0a4bad216044b609c37f6463..38fe58722b4c57a7fe180f0a064c0261bdc4ddb3 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -1501,8 +1501,8 @@ bool RenderObject::repaintAfterLayoutIfNeeded(const RenderLayerModelObject* repa |
if (!fullRepaint && style()->hasBorderRadius()) { |
// If a border-radius exists and width/height is smaller than |
// radius width/height, we cannot use delta-repaint. |
- RoundedRect oldRoundedRect = style()->getRoundedBorderFor(oldBounds, v); |
- RoundedRect newRoundedRect = style()->getRoundedBorderFor(newBounds, v); |
+ RoundedRect oldRoundedRect = style()->getRoundedBorderFor(oldBounds); |
+ RoundedRect newRoundedRect = style()->getRoundedBorderFor(newBounds); |
fullRepaint = oldRoundedRect.radii() != newRoundedRect.radii(); |
} |
if (!fullRepaint) { |
@@ -1566,7 +1566,7 @@ bool RenderObject::repaintAfterLayoutIfNeeded(const RenderLayerModelObject* repa |
int borderRight = isBox() ? toRenderBox(this)->borderRight() : 0; |
LayoutUnit boxWidth = isBox() ? toRenderBox(this)->width() : LayoutUnit(); |
LayoutUnit minInsetRightShadowExtent = min<LayoutUnit>(-insetShadowExtent.right(), min<LayoutUnit>(newBounds.width(), oldBounds.width())); |
- LayoutUnit borderWidth = max<LayoutUnit>(borderRight, max<LayoutUnit>(valueForLength(style()->borderTopRightRadius().width(), boxWidth, v), valueForLength(style()->borderBottomRightRadius().width(), boxWidth, v))); |
+ LayoutUnit borderWidth = max<LayoutUnit>(borderRight, max<LayoutUnit>(valueForLength(style()->borderTopRightRadius().width(), boxWidth), valueForLength(style()->borderBottomRightRadius().width(), boxWidth))); |
LayoutUnit decorationsWidth = max<LayoutUnit>(-outlineStyle->outlineOffset(), borderWidth + minInsetRightShadowExtent) + max<LayoutUnit>(outlineWidth, shadowRight); |
LayoutRect rightRect(newOutlineBox.x() + min(newOutlineBox.width(), oldOutlineBox.width()) - decorationsWidth, |
newOutlineBox.y(), |
@@ -1586,7 +1586,7 @@ bool RenderObject::repaintAfterLayoutIfNeeded(const RenderLayerModelObject* repa |
int borderBottom = isBox() ? toRenderBox(this)->borderBottom() : 0; |
LayoutUnit boxHeight = isBox() ? toRenderBox(this)->height() : LayoutUnit(); |
LayoutUnit minInsetBottomShadowExtent = min<LayoutUnit>(-insetShadowExtent.bottom(), min<LayoutUnit>(newBounds.height(), oldBounds.height())); |
- LayoutUnit borderHeight = max<LayoutUnit>(borderBottom, max<LayoutUnit>(valueForLength(style()->borderBottomLeftRadius().height(), boxHeight, v), valueForLength(style()->borderBottomRightRadius().height(), boxHeight, v))); |
+ LayoutUnit borderHeight = max<LayoutUnit>(borderBottom, max<LayoutUnit>(valueForLength(style()->borderBottomLeftRadius().height(), boxHeight), valueForLength(style()->borderBottomRightRadius().height(), boxHeight))); |
LayoutUnit decorationsHeight = max<LayoutUnit>(-outlineStyle->outlineOffset(), borderHeight + minInsetBottomShadowExtent) + max<LayoutUnit>(outlineWidth, shadowBottom); |
LayoutRect bottomRect(newOutlineBox.x(), |
min(newOutlineBox.maxY(), oldOutlineBox.maxY()) - decorationsHeight, |