Store border-image-* on SurroundData in ComputedStyle

third_party/WebKit/Source/core/style/ComputedStyle.cpp

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 70855652ed308b239705f5f8c8c408d674cd962f..0711914c3219a0b8ec4fd24881feefb3d6790f23 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -1012,7 +1012,7 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
       diff.SetNeedsRecomputeOverflow();
   }
 
-  if (!Border().VisualOverflowEqual(other.Border()))
+  if (!BorderVisualOverflowEqual(other))
     diff.SetNeedsRecomputeOverflow();
 
   if (!diff.NeedsFullPaintInvalidation()) {
@@ -1381,8 +1381,7 @@ void ComputedStyle::SetBoxShadow(PassRefPtr<ShadowList> s) {
   rare_non_inherited_data_.Access()->box_shadow_ = std::move(s);
 }
 
-static FloatRoundedRect::Radii CalcRadiiFor(const BorderData& border,
-                                            const LengthSize& top_left,
+static FloatRoundedRect::Radii CalcRadiiFor(const LengthSize& top_left,
                                             const LengthSize& top_right,
                                             const LengthSize& bottom_left,
                                             const LengthSize& bottom_right,
@@ -1429,10 +1428,9 @@ FloatRoundedRect ComputedStyle::GetRoundedBorderFor(
     bool include_logical_right_edge) const {
   FloatRoundedRect rounded_rect(PixelSnappedIntRect(border_rect));
   if (HasBorderRadius()) {
-    FloatRoundedRect::Radii radii =
-        CalcRadiiFor(Border(), BorderTopLeftRadius(), BorderTopRightRadius(),
-                     BorderBottomLeftRadius(), BorderBottomRightRadius(),
-                     border_rect.Size());
+    FloatRoundedRect::Radii radii = CalcRadiiFor(
+        BorderTopLeftRadius(), BorderTopRightRadius(), BorderBottomLeftRadius(),
+        BorderBottomRightRadius(), border_rect.Size());
     rounded_rect.IncludeLogicalEdges(radii, IsHorizontalWritingMode(),
                                      include_logical_left_edge,
                                      include_logical_right_edge);
@@ -2379,33 +2377,33 @@ LayoutRectOutsets ComputedStyle::ImageOutsets(
 }
 
 void ComputedStyle::SetBorderImageSource(StyleImage* image) {
-  if (Border().image_.GetImage() == image)
+  if (BorderImage().GetImage() == image)
     return;
-  surround_data_.Access()->border_.image_.SetImage(image);
+  MutableBorderImageInternal().SetImage(image);
 }
 
 void ComputedStyle::SetBorderImageSlices(const LengthBox& slices) {
-  if (Border().image_.ImageSlices() == slices)
+  if (BorderImage().ImageSlices() == slices)
     return;
-  surround_data_.Access()->border_.image_.SetImageSlices(slices);
+  MutableBorderImageInternal().SetImageSlices(slices);
 }
 
 void ComputedStyle::SetBorderImageSlicesFill(bool fill) {
-  if (Border().image_.Fill() == fill)
+  if (BorderImage().Fill() == fill)
     return;
-  surround_data_.Access()->border_.image_.SetFill(fill);
+  MutableBorderImageInternal().SetFill(fill);
 }
 
 void ComputedStyle::SetBorderImageWidth(const BorderImageLengthBox& slices) {
-  if (Border().image_.BorderSlices() == slices)
+  if (BorderImage().BorderSlices() == slices)
     return;
-  surround_data_.Access()->border_.image_.SetBorderSlices(slices);
+  MutableBorderImageInternal().SetBorderSlices(slices);
 }
 
 void ComputedStyle::SetBorderImageOutset(const BorderImageLengthBox& outset) {
-  if (Border().image_.Outset() == outset)
+  if (BorderImage().Outset() == outset)
     return;
-  surround_data_.Access()->border_.image_.SetOutset(outset);
+  MutableBorderImageInternal().SetOutset(outset);
 }
 
 bool ComputedStyle::BorderObscuresBackground() const {