Use getters for StyleSurroundData members in ComputedStyle.cpp

third_party/WebKit/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 509 matching lines @@
 
   if ((!diff.NeedsFullLayout() || !diff.NeedsFullPaintInvalidation()) &&
       DiffNeedsFullLayoutAndPaintInvalidation(other)) {
     diff.SetNeedsFullLayout();
     diff.SetNeedsPaintInvalidationObject();
   }
 
   if (!diff.NeedsFullLayout() && DiffNeedsFullLayout(other))
     diff.SetNeedsFullLayout();
 
-  if (!diff.NeedsFullLayout() &&
-      surround_->margin_ != other.surround_->margin_) {
+  if (!diff.NeedsFullLayout() && Margin() != other.Margin()) {
     // Relative-positioned elements collapse their margins so need a full
     // layout.
     if (HasOutOfFlowPosition())
       diff.SetNeedsPositionedMovementLayout();
     else
       diff.SetNeedsFullLayout();
   }
 
   if (!diff.NeedsFullLayout() && GetPosition() != EPosition::kStatic &&
       !OffsetEqual(other)) {
@@ skipping 41 matching lines @@
     if (box_->Width() != other.box_->Width() ||
         box_->MinWidth() != other.box_->MinWidth() ||
         box_->MaxWidth() != other.box_->MaxWidth() ||
         box_->Height() != other.box_->Height() ||
         box_->MinHeight() != other.box_->MinHeight() ||
         box_->MaxHeight() != other.box_->MaxHeight())
       return true;
   }
 
   if (surround_.Get() != other.surround_.Get()) {
-    if (surround_->margin_ != other.surround_->margin_ || !OffsetEqual(other) ||
-        surround_->padding_ != other.surround_->padding_)
+    if (Margin() != other.Margin() || !OffsetEqual(other) ||
+        Padding() != other.Padding())
       return true;
   }
 
   if (diff.TransformChanged())
     return true;
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
     const ComputedStyle& other) const {
   // FIXME: Not all cases in this method need both full layout and paint
   // invalidation.
   // Should move cases into DiffNeedsFullLayout() if
   // - don't need paint invalidation at all;
   // - or the layoutObject knows how to exactly invalidate paints caused by the
   //   layout change instead of forced full paint invalidation.
 
   if (surround_.Get() != other.surround_.Get()) {
     // If our border widths change, then we need to layout. Other changes to
     // borders only necessitate a paint invalidation.
     if (BorderLeftWidth() != other.BorderLeftWidth() ||
         BorderTopWidth() != other.BorderTopWidth() ||
         BorderBottomWidth() != other.BorderBottomWidth() ||
         BorderRightWidth() != other.BorderRightWidth())
       return true;
 
-    if (surround_->padding_ != other.surround_->padding_)
+    if (Padding() != other.Padding())
       return true;
   }
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->appearance_ !=
             other.rare_non_inherited_data_->appearance_ ||
         rare_non_inherited_data_->margin_before_collapse !=
             other.rare_non_inherited_data_->margin_before_collapse ||
         rare_non_inherited_data_->margin_after_collapse !=
             other.rare_non_inherited_data_->margin_after_collapse ||
@@ skipping 266 matching lines @@
   }
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (Visibility() != other.Visibility() ||
       PrintColorAdjust() != other.PrintColorAdjust() ||
       InsideLink() != other.InsideLink() ||
-      !surround_->border_.VisuallyEqual(other.surround_->border_) ||
+      !Border().VisuallyEqual(other.Border()) ||
       *background_ != *other.background_)
     return true;
 
   if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
     if (rare_inherited_data_->user_modify !=
             other.rare_inherited_data_->user_modify ||
         rare_inherited_data_->user_select !=
             other.rare_inherited_data_->user_select ||
         rare_inherited_data_->image_rendering_ !=
             other.rare_inherited_data_->image_rendering_)
@@ skipping 127 matching lines @@
 
     if (!rare_non_inherited_data_->ReflectionDataEquivalent(
             *other.rare_non_inherited_data_.Get()))
       diff.SetFilterChanged();
 
     if (!rare_non_inherited_data_->outline_.VisuallyEqual(
             other.rare_non_inherited_data_->outline_))
       diff.SetNeedsRecomputeOverflow();
   }
 
-  if (!surround_->border_.VisualOverflowEqual(other.surround_->border_))
+  if (!Border().VisualOverflowEqual(other.Border()))
     diff.SetNeedsRecomputeOverflow();
 
   if (!diff.NeedsFullPaintInvalidation()) {
     if (style_inherited_data_->color != other.style_inherited_data_->color ||
         style_inherited_data_->visited_link_color !=
             other.style_inherited_data_->visited_link_color ||
         has_simple_underline_ != other.has_simple_underline_ ||
         visual_->text_decoration != other.visual_->text_decoration) {
       diff.SetTextDecorationOrColorChanged();
     } else if (rare_non_inherited_data_.Get() !=
@@ skipping 390 matching lines @@
 void ComputedStyle::SetVerticalBorderSpacing(short v) {
   SET_VAR(style_inherited_data_, vertical_border_spacing, v);
 }
 
 FloatRoundedRect ComputedStyle::GetRoundedBorderFor(
     const LayoutRect& border_rect,
     bool include_logical_left_edge,
     bool include_logical_right_edge) const {
   FloatRoundedRect rounded_rect(PixelSnappedIntRect(border_rect));
   if (HasBorderRadius()) {
-    FloatRoundedRect::Radii radii =
-        CalcRadiiFor(surround_->border_, border_rect.Size());
+    FloatRoundedRect::Radii radii = CalcRadiiFor(Border(), border_rect.Size());
     rounded_rect.IncludeLogicalEdges(radii, IsHorizontalWritingMode(),
                                      include_logical_left_edge,
                                      include_logical_right_edge);
     rounded_rect.ConstrainRadii();
   }
   return rounded_rect;
 }
 
 FloatRoundedRect ComputedStyle::GetRoundedInnerBorderFor(
     const LayoutRect& border_rect,
@@ skipping 903 matching lines @@
     const NinePieceImage& image) const {
   return LayoutRectOutsets(
       NinePieceImage::ComputeOutset(image.Outset().Top(), BorderTopWidth()),
       NinePieceImage::ComputeOutset(image.Outset().Right(), BorderRightWidth()),
       NinePieceImage::ComputeOutset(image.Outset().Bottom(),
                                     BorderBottomWidth()),
       NinePieceImage::ComputeOutset(image.Outset().Left(), BorderLeftWidth()));
 }
 
 void ComputedStyle::SetBorderImageSource(StyleImage* image) {
-  if (surround_->border_.image_.GetImage() == image)
+  if (Border().image_.GetImage() == image)
     return;
   surround_.Access()->border_.image_.SetImage(image);
 }
 
 void ComputedStyle::SetBorderImageSlices(const LengthBox& slices) {
-  if (surround_->border_.image_.ImageSlices() == slices)
+  if (Border().image_.ImageSlices() == slices)
     return;
   surround_.Access()->border_.image_.SetImageSlices(slices);
 }
 
 void ComputedStyle::SetBorderImageSlicesFill(bool fill) {
-  if (surround_->border_.image_.Fill() == fill)
+  if (Border().image_.Fill() == fill)
     return;
   surround_.Access()->border_.image_.SetFill(fill);
 }
 
 void ComputedStyle::SetBorderImageWidth(const BorderImageLengthBox& slices) {
-  if (surround_->border_.image_.BorderSlices() == slices)
+  if (Border().image_.BorderSlices() == slices)
     return;
   surround_.Access()->border_.image_.SetBorderSlices(slices);
 }
 
 void ComputedStyle::SetBorderImageOutset(const BorderImageLengthBox& outset) {
-  if (surround_->border_.image_.Outset() == outset)
+  if (Border().image_.Outset() == outset)
     return;
   surround_.Access()->border_.image_.SetOutset(outset);
 }
 
 bool ComputedStyle::BorderObscuresBackground() const {
   if (!HasBorder())
     return false;
 
   // Bail if we have any border-image for now. We could look at the image alpha
   // to improve this.
@@ skipping 75 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink