Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1733)

Unified Diff: Source/core/rendering/RenderBoxModelObject.cpp

Issue 25977004: Should not use clipOutRoundedRect when a given rounded rect is empty. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/platform/linux/fast/borders/empty-border-radius-expected.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBoxModelObject.cpp
diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
index 05f26bcdeaf193be0d16b491bb6e15f74641456e..e441a9926de41dd291f2aae2d595e9f18c9cc6fe 100644
--- a/Source/core/rendering/RenderBoxModelObject.cpp
+++ b/Source/core/rendering/RenderBoxModelObject.cpp
@@ -1885,7 +1885,7 @@ void RenderBoxModelObject::paintBorder(const PaintInfo& info, const LayoutRect&
graphicsContext->clipRoundedRect(outerBorder);
// isRenderable() check avoids issue described in https://bugs.webkit.org/show_bug.cgi?id=38787
// The inside will be clipped out later (in clipBorderSideForComplexInnerPath)
- if (innerBorder.isRenderable())
+ if (innerBorder.isRenderable() && !innerBorder.isEmpty())
graphicsContext->clipOutRoundedRect(innerBorder);
}
@@ -2349,7 +2349,9 @@ void RenderBoxModelObject::clipBorderSideForComplexInnerPath(GraphicsContext* gr
BoxSide side, const class BorderEdge edges[])
{
graphicsContext->clip(calculateSideRectIncludingInner(outerBorder, edges, side));
- graphicsContext->clipOutRoundedRect(calculateAdjustedInnerBorder(innerBorder, side));
+ RoundedRect adjustedInnerRect = calculateAdjustedInnerBorder(innerBorder, side);
+ if (!adjustedInnerRect.isEmpty())
+ graphicsContext->clipOutRoundedRect(adjustedInnerRect);
}
void RenderBoxModelObject::getBorderEdgeInfo(BorderEdge edges[], const RenderStyle* style, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
« no previous file with comments | « LayoutTests/platform/linux/fast/borders/empty-border-radius-expected.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698