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

Unified Diff: Source/core/style/ComputedStyle.cpp

Issue 1137513003: Apply bleed-avoidance insets _after_ constraining the border (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: One more TE. Created 5 years, 7 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 | « Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/ComputedStyle.cpp
diff --git a/Source/core/style/ComputedStyle.cpp b/Source/core/style/ComputedStyle.cpp
index 0dd637c5d032543bc5d727b228699d93667b8f9f..56aa024d3c1bb872e05f65a835e36e9c2b947417 100644
--- a/Source/core/style/ComputedStyle.cpp
+++ b/Source/core/style/ComputedStyle.cpp
@@ -1010,18 +1010,11 @@ void ComputedStyle::setHorizontalBorderSpacing(short v) { SET_VAR(inherited, hor
void ComputedStyle::setVerticalBorderSpacing(short v) { SET_VAR(inherited, vertical_border_spacing, v); }
FloatRoundedRect ComputedStyle::getRoundedBorderFor(const LayoutRect& borderRect,
- bool includeLogicalLeftEdge, bool includeLogicalRightEdge, const FloatRectOutsets* insets) const
+ bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
{
- FloatRect rect(pixelSnappedIntRect(borderRect));
- if (insets)
- rect.expand(*insets);
-
- FloatRoundedRect roundedRect(rect);
+ FloatRoundedRect roundedRect(pixelSnappedIntRect(borderRect));
if (hasBorderRadius()) {
FloatRoundedRect::Radii radii = calcRadiiFor(surround->border, borderRect.size());
- if (insets)
- radii.shrink(-insets->top(), -insets->bottom(), -insets->left(), -insets->right());
-
roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);
roundedRect.constrainRadii();
}
« no previous file with comments | « Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698