Remove references to surround_data_ in ComputedStyle.

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 465 matching lines @@
   // TODO(nainar): Move all fixed point logic to a separate class.
   // border-top-width
   float BorderTopWidth() const {
     if (surround_data_->border_.top_.Style() == kBorderStyleNone ||
         surround_data_->border_.top_.Style() == kBorderStyleHidden)
       return 0;
     return static_cast<float>(BorderTopWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderTopWidth(float v) {
-    surround_data_.Access()->border_top_width_ = WidthToFixedPoint(v);
+    SetBorderTopWidthInternal(WidthToFixedPoint(v));
   }
 
   // border-bottom-width
   float BorderBottomWidth() const {
     if (surround_data_->border_.bottom_.Style() == kBorderStyleNone ||
         surround_data_->border_.bottom_.Style() == kBorderStyleHidden)
       return 0;
     return static_cast<float>(BorderBottomWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderBottomWidth(float v) {
-    surround_data_.Access()->border_bottom_width_ = WidthToFixedPoint(v);
+    SetBorderBottomWidthInternal(WidthToFixedPoint(v));
   }
 
   // border-left-width
   float BorderLeftWidth() const {
     if (surround_data_->border_.left_.Style() == kBorderStyleNone ||
         surround_data_->border_.left_.Style() == kBorderStyleHidden)
       return 0;
     return static_cast<float>(BorderLeftWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderLeftWidth(float v) {
-    surround_data_.Access()->border_left_width_ = WidthToFixedPoint(v);
+    SetBorderLeftWidthInternal(WidthToFixedPoint(v));
   }
 
   // border-right-width
   float BorderRightWidth() const {
     if (surround_data_->border_.right_.Style() == kBorderStyleNone ||
         surround_data_->border_.right_.Style() == kBorderStyleHidden)
       return 0;
     return static_cast<float>(BorderRightWidthInternal()) /
            kBorderWidthDenominator;
   }
   void SetBorderRightWidth(float v) {
-    surround_data_.Access()->border_right_width_ = WidthToFixedPoint(v);
+    SetBorderRightWidthInternal(WidthToFixedPoint(v));
   }
 
   // Border style properties.
   static EBorderStyle InitialBorderStyle() { return kBorderStyleNone; }
 
   // border-top-style
   EBorderStyle BorderTopStyle() const {
     return surround_data_->border_.Top().Style();
   }
   void SetBorderTopStyle(EBorderStyle v) {
@@ skipping 2250 matching lines @@
     return LengthBox::Over(GetWritingMode(), PaddingTop(), PaddingRight());
   }
   const Length& PaddingUnder() const {
     return LengthBox::Under(GetWritingMode(), PaddingBottom(), PaddingLeft());
   }
   bool HasPadding() const {
     return !PaddingLeft().IsZero() || !PaddingRight().IsZero() ||
            !PaddingTop().IsZero() || !PaddingBottom().IsZero();
   }
   void ResetPadding() {
-    SET_VAR(surround_data_, padding_top_, kFixed);
-    SET_VAR(surround_data_, padding_bottom_, kFixed);
-    SET_VAR(surround_data_, padding_left_, kFixed);
-    SET_VAR(surround_data_, padding_right_, kFixed);
+    SetPaddingTop(kFixed);
+    SetPaddingBottom(kFixed);
+    SetPaddingLeft(kFixed);
+    SetPaddingRight(kFixed);
   }
   void SetPadding(const LengthBox& b) {
-    SET_VAR(surround_data_, padding_top_, b.top_);
-    SET_VAR(surround_data_, padding_bottom_, b.bottom_);
-    SET_VAR(surround_data_, padding_left_, b.left_);
-    SET_VAR(surround_data_, padding_right_, b.right_);
+    SetPaddingTop(b.top_);
+    SetPaddingBottom(b.bottom_);
+    SetPaddingLeft(b.left_);
+    SetPaddingRight(b.right_);
   }
   bool PaddingEqual(const ComputedStyle& other) const {
     return PaddingTop() == other.PaddingTop() &&
            PaddingLeft() == other.PaddingLeft() &&
            PaddingRight() == other.PaddingRight() &&
            PaddingBottom() == other.PaddingBottom();
   }
   bool PaddingEqual(const LengthBox& other) const {
     return PaddingTop() == other.Top() && PaddingLeft() == other.Left() &&
            PaddingRight() == other.Right() && PaddingBottom() == other.Bottom();
@@ skipping 958 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h