Remove public methods on StyleBoxData and rename member.

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 588 matching lines @@
 
   // box-shadow (aka -webkit-box-shadow)
   static ShadowList* InitialBoxShadow() { return 0; }
   ShadowList* BoxShadow() const {
     return rare_non_inherited_data_->box_shadow_.Get();
   }
   void SetBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
   static EBoxSizing InitialBoxSizing() { return EBoxSizing::kContentBox; }
-  EBoxSizing BoxSizing() const { return box_data_->BoxSizing(); }
+  EBoxSizing BoxSizing() const {
+    return static_cast<EBoxSizing>(box_data_->box_sizing_);
+  }
   void SetBoxSizing(EBoxSizing s) {
     SET_VAR(box_data_, box_sizing_, static_cast<unsigned>(s));
   }
 
   // clip
   static LengthBox InitialClip() { return LengthBox(); }
   const LengthBox& Clip() const { return visual_data_->clip; }
   void SetClip(const LengthBox& box) {
     SET_VAR(visual_data_, has_auto_clip, false);
     SET_VAR(visual_data_, clip, box);
@@ skipping 191 matching lines @@
   void SetBoxAlign(EBoxAlignment a) {
     SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_, align,
                    a);
   }
 
   // -webkit-box-decoration-break
   static EBoxDecorationBreak InitialBoxDecorationBreak() {
     return kBoxDecorationBreakSlice;
   }
   EBoxDecorationBreak BoxDecorationBreak() const {
-    return box_data_->BoxDecorationBreak();
+    return static_cast<EBoxDecorationBreak>(box_data_->box_decoration_break_);
   }
   void SetBoxDecorationBreak(EBoxDecorationBreak b) {
-    SET_VAR(box_data_, box_decoration_break_, b);
+    SET_VAR(box_data_, box_decoration_break_, static_cast<unsigned>(b));
   }
 
   // -webkit-box-lines
   static EBoxLines InitialBoxLines() { return SINGLE; }
   EBoxLines BoxLines() const {
     return static_cast<EBoxLines>(
         rare_non_inherited_data_->deprecated_flexible_box_->lines);
   }
   void SetBoxLines(EBoxLines lines) {
     SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_, lines,
@@ skipping 174 matching lines @@
   }
   void SetGridTemplateRows(const Vector<GridTrackSize>& lengths) {
     SET_NESTED_VAR(rare_non_inherited_data_, grid_, grid_template_rows_,
                    lengths);
   }
 
   // Width/height properties.
 
   // width
   static Length InitialWidth() { return Length(); }
-  const Length& Width() const { return box_data_->Width(); }
+  const Length& Width() const { return box_data_->width_; }
   void SetWidth(const Length& v) { SET_VAR(box_data_, width_, v); }
 
   // height
   static Length InitialHeight() { return Length(); }
-  const Length& Height() const { return box_data_->Height(); }
+  const Length& Height() const { return box_data_->height_; }
   void SetHeight(const Length& v) { SET_VAR(box_data_, height_, v); }
 
   // max-width
   static Length InitialMaxWidth() { return Length(kMaxSizeNone); }
-  const Length& MaxWidth() const { return box_data_->MaxWidth(); }
+  const Length& MaxWidth() const { return box_data_->max_width_; }
   void SetMaxWidth(const Length& v) { SET_VAR(box_data_, max_width_, v); }
 
   // max-height
   static Length InitialMaxHeight() { return Length(kMaxSizeNone); }
-  const Length& MaxHeight() const { return box_data_->MaxHeight(); }
+  const Length& MaxHeight() const { return box_data_->max_height_; }
   void SetMaxHeight(const Length& v) { SET_VAR(box_data_, max_height_, v); }
 
   // min-width
   static Length InitialMinWidth() { return Length(); }
-  const Length& MinWidth() const { return box_data_->MinWidth(); }
+  const Length& MinWidth() const { return box_data_->min_width_; }
   void SetMinWidth(const Length& v) { SET_VAR(box_data_, min_width_, v); }
 
   // min-height
   static Length InitialMinHeight() { return Length(); }
-  const Length& MinHeight() const { return box_data_->MinHeight(); }
+  const Length& MinHeight() const { return box_data_->min_height_; }
   void SetMinHeight(const Length& v) { SET_VAR(box_data_, min_height_, v); }
 
   // image-orientation
   static RespectImageOrientationEnum InitialRespectImageOrientation() {
     return kDoNotRespectImageOrientation;
   }
   RespectImageOrientationEnum RespectImageOrientation() const {
     return static_cast<RespectImageOrientationEnum>(
         rare_inherited_data_->respect_image_orientation_);
   }
@@ skipping 509 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_->VerticalAlign();
+    return box_data_->vertical_align_length_;
   }
   void SetVerticalAlign(EVerticalAlign v) { SetVerticalAlignInternal(v); }
   void SetVerticalAlignLength(const Length& length) {
     SetVerticalAlignInternal(EVerticalAlign::kLength);
-    SET_VAR(box_data_, vertical_align_, length);
+    SET_VAR(box_data_, vertical_align_length_, 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_->ZIndex(); }
-  bool HasAutoZIndex() const { return box_data_->HasAutoZIndex(); }
+  int ZIndex() const { return box_data_->z_index_; }
+  bool HasAutoZIndex() const { return box_data_->has_auto_z_index_; }
   void SetZIndex(int v) {
     SET_VAR(box_data_, has_auto_z_index_, false);
     SET_VAR(box_data_, z_index_, v);
   }
   void SetHasAutoZIndex() {
     SET_VAR(box_data_, has_auto_z_index_, true);
     SET_VAR(box_data_, z_index_, 0);
   }
 
   // zoom
@@ skipping 2071 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h