Apply bleed-avoidance insets _after_ constraining the border

Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 992 matching lines @@
 Color ComputedStyle::visitedLinkColor() const { return inherited->visitedLinkColor; }
 void ComputedStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); }
 void ComputedStyle::setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v); }
 
 short ComputedStyle::horizontalBorderSpacing() const { return inherited->horizontal_border_spacing; }
 short ComputedStyle::verticalBorderSpacing() const { return inherited->vertical_border_spacing; }
 void ComputedStyle::setHorizontalBorderSpacing(short v) { SET_VAR(inherited, horizontal_border_spacing, v); }
 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();
     }
     return roundedRect;
 }
 
 FloatRoundedRect ComputedStyle::getRoundedInnerBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
 {
     bool horizontal = isHorizontalWritingMode();
 
@@ skipping 701 matching lines @@
         horizontal || includeLogicalRightEdge);
 
     edges[BSLeft] = BorderEdge(borderLeftWidth(),
         visitedDependentColor(CSSPropertyBorderLeftColor),
         borderLeftStyle(),
         borderLeftIsTransparent(),
         !horizontal || includeLogicalLeftEdge);
 }
 
 } // namespace blink