Use getters for StyleSurroundData members in ComputedStyle.cpp

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 00549a4949717687b14c4b2a7ab89a02392721c4..4a85875cb8a816068468ede562c02cf001617686 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -528,8 +528,7 @@ StyleDifference ComputedStyle::visualInvalidationDiff(
   if (!diff.needsFullLayout() && diffNeedsFullLayout(other))
     diff.setNeedsFullLayout();
 
-  if (!diff.needsFullLayout() &&
-      m_surround->m_margin != other.m_surround->m_margin) {
+  if (!diff.needsFullLayout() && margin() != other.margin()) {
     // Relative-positioned elements collapse their margins so need a full
     // layout.
     if (hasOutOfFlowPosition())
@@ -588,9 +587,8 @@ bool ComputedStyle::scrollAnchorDisablingPropertyChanged(
   }
 
   if (m_surround.get() != other.m_surround.get()) {
-    if (m_surround->m_margin != other.m_surround->m_margin ||
-        !offsetEqual(other) ||
-        m_surround->m_padding != other.m_surround->m_padding)
+    if (margin() != other.margin() || !offsetEqual(other) ||

[Bugs Nash, 2017/04/03 00:12:48]

what methods are these margin() and padding() calling to? They don't seem to
exist in ComputedStyle

[shend, 2017/04/03 00:58:48]

It's being added in a parent patch (https://codereview.chromium.org/2787183002).
They just return m_surround->m_margin and m_surround->m_padding.

+        padding() != other.padding())
       return true;
   }
 
@@ -618,7 +616,7 @@ bool ComputedStyle::diffNeedsFullLayoutAndPaintInvalidation(
         borderRightWidth() != other.borderRightWidth())
       return true;
 
-    if (m_surround->m_padding != other.m_surround->m_padding)
+    if (padding() != other.padding())
       return true;
   }
 
@@ -906,7 +904,7 @@ bool ComputedStyle::diffNeedsPaintInvalidationObject(
   if (visibility() != other.visibility() ||
       printColorAdjust() != other.printColorAdjust() ||
       insideLink() != other.insideLink() ||
-      !m_surround->m_border.visuallyEqual(other.m_surround->m_border) ||
+      !border().visuallyEqual(other.border()) ||
       *m_background != *other.m_background)
     return true;
 
@@ -1039,7 +1037,7 @@ void ComputedStyle::updatePropertySpecificDifferences(
       diff.setNeedsRecomputeOverflow();
   }
 
-  if (!m_surround->m_border.visualOverflowEqual(other.m_surround->m_border))
+  if (border().visualOverflowEqual(other.border()))
     diff.setNeedsRecomputeOverflow();
 
   if (!diff.needsFullPaintInvalidation()) {
@@ -1450,8 +1448,7 @@ FloatRoundedRect ComputedStyle::getRoundedBorderFor(
     bool includeLogicalRightEdge) const {
   FloatRoundedRect roundedRect(pixelSnappedIntRect(borderRect));
   if (hasBorderRadius()) {
-    FloatRoundedRect::Radii radii =
-        calcRadiiFor(m_surround->m_border, borderRect.size());
+    FloatRoundedRect::Radii radii = calcRadiiFor(border(), borderRect.size());
     roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(),
                                     includeLogicalLeftEdge,
                                     includeLogicalRightEdge);
@@ -2360,31 +2357,31 @@ LayoutRectOutsets ComputedStyle::imageOutsets(
 }
 
 void ComputedStyle::setBorderImageSource(StyleImage* image) {
-  if (m_surround->m_border.m_image.image() == image)
+  if (border().m_image.image() == image)
     return;
   m_surround.access()->m_border.m_image.setImage(image);
 }
 
 void ComputedStyle::setBorderImageSlices(const LengthBox& slices) {
-  if (m_surround->m_border.m_image.imageSlices() == slices)
+  if (border().m_image.imageSlices() == slices)
     return;
   m_surround.access()->m_border.m_image.setImageSlices(slices);
 }
 
 void ComputedStyle::setBorderImageSlicesFill(bool fill) {
-  if (m_surround->m_border.m_image.fill() == fill)
+  if (border().m_image.fill() == fill)
     return;
   m_surround.access()->m_border.m_image.setFill(fill);
 }
 
 void ComputedStyle::setBorderImageWidth(const BorderImageLengthBox& slices) {
-  if (m_surround->m_border.m_image.borderSlices() == slices)
+  if (border().m_image.borderSlices() == slices)
     return;
   m_surround.access()->m_border.m_image.setBorderSlices(slices);
 }
 
 void ComputedStyle::setBorderImageOutset(const BorderImageLengthBox& outset) {
-  if (m_surround->m_border.m_image.outset() == outset)
+  if (border().m_image.outset() == outset)
     return;
   m_surround.access()->m_border.m_image.setOutset(outset);
 }