Remove references to box_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 1499 matching lines @@
   void SetTouchAction(TouchAction t) {
     SET_VAR(rare_non_inherited_data_, touch_action_, t);
   }
 
   // vertical-align
   static EVerticalAlign InitialVerticalAlign() {
     return EVerticalAlign::kBaseline;
   }
   EVerticalAlign VerticalAlign() const { return VerticalAlignInternal(); }
   const Length& GetVerticalAlignLength() const {
-    return box_data_->vertical_align_length_;
+    return VerticalAlignLengthInternal();
   }
   void SetVerticalAlign(EVerticalAlign v) { SetVerticalAlignInternal(v); }
   void SetVerticalAlignLength(const Length& length) {
     SetVerticalAlignInternal(EVerticalAlign::kLength);
-    SET_VAR(box_data_, vertical_align_length_, length);
+    SetVerticalAlignLengthInternal(length);
   }
 
   // will-change
   const Vector<CSSPropertyID>& WillChangeProperties() const {
     return rare_non_inherited_data_->will_change_->properties_;
   }
   bool WillChangeContents() const {
     return rare_non_inherited_data_->will_change_->contents_;
   }
   bool WillChangeScrollPosition() const {
@@ skipping 10 matching lines @@
     SET_NESTED_VAR(rare_non_inherited_data_, will_change_, contents_, b);
   }
   void SetWillChangeScrollPosition(bool b) {
     SET_NESTED_VAR(rare_non_inherited_data_, will_change_, scroll_position_, b);
   }
   void SetSubtreeWillChangeContents(bool b) {
     SET_VAR(rare_inherited_data_, subtree_will_change_contents_, b);
   }
 
   // z-index
-  int ZIndex() const { return box_data_->z_index_; }
-  bool HasAutoZIndex() const { return box_data_->has_auto_z_index_; }
+  int ZIndex() const { return ZIndexInternal(); }
+  bool HasAutoZIndex() const { return HasAutoZIndexInternal(); }
   void SetZIndex(int v) {
-    SET_VAR(box_data_, has_auto_z_index_, false);
-    SET_VAR(box_data_, z_index_, v);
+    SetHasAutoZIndexInternal(false);
+    SetZIndexInternal(v);
   }
   void SetHasAutoZIndex() {
-    SET_VAR(box_data_, has_auto_z_index_, true);
-    SET_VAR(box_data_, z_index_, 0);
+    SetHasAutoZIndexInternal(true);
+    SetZIndexInternal(0);
   }
 
   // zoom
   static float InitialZoom() { return 1.0f; }
   float Zoom() const { return visual_data_->zoom_; }
   float EffectiveZoom() const { return rare_inherited_data_->effective_zoom_; }
   bool SetZoom(float);
   bool SetEffectiveZoom(float);
 
   // -webkit-app-region
@@ skipping 1110 matching lines @@
 
   // Width/height utility functions.
   const Length& LogicalWidth() const {
     return IsHorizontalWritingMode() ? Width() : Height();
   }
   const Length& LogicalHeight() const {
     return IsHorizontalWritingMode() ? Height() : Width();
   }
   void SetLogicalWidth(const Length& v) {
     if (IsHorizontalWritingMode()) {
-      SET_VAR(box_data_, width_, v);
+      SetWidth(v);
     } else {
-      SET_VAR(box_data_, height_, v);
+      SetHeight(v);
     }
   }
 
   void SetLogicalHeight(const Length& v) {
     if (IsHorizontalWritingMode()) {
-      SET_VAR(box_data_, height_, v);
+      SetHeight(v);
     } else {
-      SET_VAR(box_data_, width_, v);
+      SetWidth(v);
     }
   }
   const Length& LogicalMaxWidth() const {
     return IsHorizontalWritingMode() ? MaxWidth() : MaxHeight();
   }
   const Length& LogicalMaxHeight() const {
     return IsHorizontalWritingMode() ? MaxHeight() : MaxWidth();
   }
   const Length& LogicalMinWidth() const {
     return IsHorizontalWritingMode() ? MinWidth() : MinHeight();
@@ skipping 1055 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h