Rename members in StyleRareInheritedData.

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 1663 matching lines @@
   short VerticalBorderSpacing() const;
   void SetVerticalBorderSpacing(short);
 
   // color
   static Color InitialColor() { return Color::kBlack; }
   void SetColor(const Color&);
 
   // hyphens
   static Hyphens InitialHyphens() { return kHyphensManual; }
   Hyphens GetHyphens() const {
-    return static_cast<Hyphens>(rare_inherited_data_->hyphens);
+    return static_cast<Hyphens>(rare_inherited_data_->hyphens_);
   }
-  void SetHyphens(Hyphens h) { SET_VAR(rare_inherited_data_, hyphens, h); }
+  void SetHyphens(Hyphens h) { SET_VAR(rare_inherited_data_, hyphens_, h); }
 
   // -webkit-hyphenate-character
   static const AtomicString& InitialHyphenationString() { return g_null_atom; }
   const AtomicString& HyphenationString() const {
-    return rare_inherited_data_->hyphenation_string;
+    return rare_inherited_data_->hyphenation_string_;
   }
   void SetHyphenationString(const AtomicString& h) {
-    SET_VAR(rare_inherited_data_, hyphenation_string, h);
+    SET_VAR(rare_inherited_data_, hyphenation_string_, h);
   }
 
   // line-height
   static Length InitialLineHeight() { return Length(-100.0, kPercent); }
   Length LineHeight() const;
   void SetLineHeight(const Length& specified_line_height);
 
   // List style properties.
   // list-style-image
   static StyleImage* InitialListStyleImage() { return 0; }
   StyleImage* ListStyleImage() const;
   void SetListStyleImage(StyleImage*);
 
   // orphans
   static short InitialOrphans() { return 2; }
-  short Orphans() const { return rare_inherited_data_->orphans; }
-  void SetOrphans(short o) { SET_VAR(rare_inherited_data_, orphans, o); }
+  short Orphans() const { return rare_inherited_data_->orphans_; }
+  void SetOrphans(short o) { SET_VAR(rare_inherited_data_, orphans_, o); }
 
   // widows
   static short InitialWidows() { return 2; }
-  short Widows() const { return rare_inherited_data_->widows; }
-  void SetWidows(short w) { SET_VAR(rare_inherited_data_, widows, w); }
+  short Widows() const { return rare_inherited_data_->widows_; }
+  void SetWidows(short w) { SET_VAR(rare_inherited_data_, widows_, w); }
 
   // overflow-wrap (aka word-wrap)
   static EOverflowWrap InitialOverflowWrap() { return kNormalOverflowWrap; }
   EOverflowWrap OverflowWrap() const {
-    return static_cast<EOverflowWrap>(rare_inherited_data_->overflow_wrap);
+    return static_cast<EOverflowWrap>(rare_inherited_data_->overflow_wrap_);
   }
   void SetOverflowWrap(EOverflowWrap b) {
-    SET_VAR(rare_inherited_data_, overflow_wrap, b);
+    SET_VAR(rare_inherited_data_, overflow_wrap_, b);
   }
 
   // quotes
   static QuotesData* InitialQuotes() { return 0; }
-  QuotesData* Quotes() const { return rare_inherited_data_->quotes.Get(); }
+  QuotesData* Quotes() const { return rare_inherited_data_->quotes_.Get(); }
   void SetQuotes(PassRefPtr<QuotesData>);
 
   // line-height-step
   static uint8_t InitialLineHeightStep() { return 0; }
   uint8_t LineHeightStep() const {
     return rare_inherited_data_->line_height_step_;
   }
   void SetLineHeightStep(uint8_t unit) {
     SET_VAR(rare_inherited_data_, line_height_step_, unit);
   }
 
   // speak
   static ESpeak InitialSpeak() { return kSpeakNormal; }
   ESpeak Speak() const {
-    return static_cast<ESpeak>(rare_inherited_data_->speak);
+    return static_cast<ESpeak>(rare_inherited_data_->speak_);
   }
-  void SetSpeak(ESpeak s) { SET_VAR(rare_inherited_data_, speak, s); }
+  void SetSpeak(ESpeak s) { SET_VAR(rare_inherited_data_, speak_, s); }
 
   // tab-size
   static TabSize InitialTabSize() { return TabSize(8); }
   TabSize GetTabSize() const { return rare_inherited_data_->tab_size_; }
   void SetTabSize(TabSize size) {
     SET_VAR(rare_inherited_data_, tab_size_, size);
   }
 
   // text-align-last
   static TextAlignLast InitialTextAlignLast() { return kTextAlignLastAuto; }
@@ skipping 10 matching lines @@
     return static_cast<TextCombine>(rare_inherited_data_->text_combine_);
   }
   void SetTextCombine(TextCombine v) {
     SET_VAR(rare_inherited_data_, text_combine_, v);
   }
 
   // text-indent
   static Length InitialTextIndent() { return Length(kFixed); }
   static TextIndentLine InitialTextIndentLine() { return kTextIndentFirstLine; }
   static TextIndentType InitialTextIndentType() { return kTextIndentNormal; }
-  const Length& TextIndent() const { return rare_inherited_data_->indent; }
+  const Length& TextIndent() const { return rare_inherited_data_->indent_; }
   TextIndentLine GetTextIndentLine() const {
     return static_cast<TextIndentLine>(rare_inherited_data_->text_indent_line_);
   }
   TextIndentType GetTextIndentType() const {
     return static_cast<TextIndentType>(rare_inherited_data_->text_indent_type_);
   }
   void SetTextIndent(const Length& v) {
-    SET_VAR(rare_inherited_data_, indent, v);
+    SET_VAR(rare_inherited_data_, indent_, v);
   }
   void SetTextIndentLine(TextIndentLine v) {
     SET_VAR(rare_inherited_data_, text_indent_line_, v);
   }
   void SetTextIndentType(TextIndentType v) {
     SET_VAR(rare_inherited_data_, text_indent_type_, v);
   }
 
   // text-justify
   static TextJustify InitialTextJustify() { return kTextJustifyAuto; }
@@ skipping 10 matching lines @@
   }
   TextOrientation GetTextOrientation() const {
     return static_cast<TextOrientation>(
         rare_inherited_data_->text_orientation_);
   }
   bool SetTextOrientation(TextOrientation);
 
   // text-shadow
   static ShadowList* InitialTextShadow() { return 0; }
   ShadowList* TextShadow() const {
-    return rare_inherited_data_->text_shadow.Get();
+    return rare_inherited_data_->text_shadow_.Get();
   }
   void SetTextShadow(PassRefPtr<ShadowList>);
 
   // text-size-adjust (aka -webkit-text-size-adjust)
   static TextSizeAdjust InitialTextSizeAdjust() {
     return TextSizeAdjust::AdjustAuto();
   }
   TextSizeAdjust GetTextSizeAdjust() const {
     return rare_inherited_data_->text_size_adjust_;
   }
   void SetTextSizeAdjust(TextSizeAdjust size_adjust) {
     SET_VAR(rare_inherited_data_, text_size_adjust_, size_adjust);
   }
 
   // word-break inherited (aka -epub-word-break)
   static EWordBreak InitialWordBreak() { return kNormalWordBreak; }
   EWordBreak WordBreak() const {
-    return static_cast<EWordBreak>(rare_inherited_data_->word_break);
+    return static_cast<EWordBreak>(rare_inherited_data_->word_break_);
   }
   void SetWordBreak(EWordBreak b) {
-    SET_VAR(rare_inherited_data_, word_break, b);
+    SET_VAR(rare_inherited_data_, word_break_, b);
   }
 
   // -webkit-line-break
   static LineBreak InitialLineBreak() { return kLineBreakAuto; }
   LineBreak GetLineBreak() const {
-    return static_cast<LineBreak>(rare_inherited_data_->line_break);
+    return static_cast<LineBreak>(rare_inherited_data_->line_break_);
   }
   void SetLineBreak(LineBreak b) {
-    SET_VAR(rare_inherited_data_, line_break, b);
+    SET_VAR(rare_inherited_data_, line_break_, b);
   }
 
   // Text emphasis properties.
   static TextEmphasisFill InitialTextEmphasisFill() {
     return kTextEmphasisFillFilled;
   }
   static TextEmphasisMark InitialTextEmphasisMark() {
     return kTextEmphasisMarkNone;
   }
   static const AtomicString& InitialTextEmphasisCustomMark() {
     return g_null_atom;
   }
   TextEmphasisFill GetTextEmphasisFill() const {
     return static_cast<TextEmphasisFill>(
-        rare_inherited_data_->text_emphasis_fill);
+        rare_inherited_data_->text_emphasis_fill_);
   }
   TextEmphasisMark GetTextEmphasisMark() const;
   const AtomicString& TextEmphasisCustomMark() const {
-    return rare_inherited_data_->text_emphasis_custom_mark;
+    return rare_inherited_data_->text_emphasis_custom_mark_;
   }
   const AtomicString& TextEmphasisMarkString() const;
   void SetTextEmphasisFill(TextEmphasisFill fill) {
-    SET_VAR(rare_inherited_data_, text_emphasis_fill, fill);
+    SET_VAR(rare_inherited_data_, text_emphasis_fill_, fill);
   }
   void SetTextEmphasisMark(TextEmphasisMark mark) {
-    SET_VAR(rare_inherited_data_, text_emphasis_mark, mark);
+    SET_VAR(rare_inherited_data_, text_emphasis_mark_, mark);
   }
   void SetTextEmphasisCustomMark(const AtomicString& mark) {
-    SET_VAR(rare_inherited_data_, text_emphasis_custom_mark, mark);
+    SET_VAR(rare_inherited_data_, text_emphasis_custom_mark_, mark);
   }
 
   // -webkit-text-emphasis-color (aka -epub-text-emphasis-color)
   void SetTextEmphasisColor(const StyleColor& c) {
     SET_VAR_WITH_SETTER(rare_inherited_data_, TextEmphasisColor,
                         SetTextEmphasisColor, c);
   }
 
   // -webkit-text-emphasis-position
   static TextEmphasisPosition InitialTextEmphasisPosition() {
     return kTextEmphasisPositionOver;
   }
   TextEmphasisPosition GetTextEmphasisPosition() const {
     return static_cast<TextEmphasisPosition>(
-        rare_inherited_data_->text_emphasis_position);
+        rare_inherited_data_->text_emphasis_position_);
   }
   void SetTextEmphasisPosition(TextEmphasisPosition position) {
-    SET_VAR(rare_inherited_data_, text_emphasis_position, position);
+    SET_VAR(rare_inherited_data_, text_emphasis_position_, position);
   }
 
   // -webkit-highlight
   static const AtomicString& InitialHighlight() { return g_null_atom; }
   const AtomicString& Highlight() const {
-    return rare_inherited_data_->highlight;
+    return rare_inherited_data_->highlight_;
   }
   void SetHighlight(const AtomicString& h) {
-    SET_VAR(rare_inherited_data_, highlight, h);
+    SET_VAR(rare_inherited_data_, highlight_, h);
   }
 
   // -webkit-line-clamp
   static LineClampValue InitialLineClamp() { return LineClampValue(); }
   const LineClampValue& LineClamp() const {
     return rare_non_inherited_data_->line_clamp;
   }
   void SetLineClamp(LineClampValue c) {
     SET_VAR(rare_non_inherited_data_, line_clamp, c);
   }
 
   // -webkit-ruby-position
   static RubyPosition InitialRubyPosition() { return kRubyPositionBefore; }
   RubyPosition GetRubyPosition() const {
     return static_cast<RubyPosition>(rare_inherited_data_->ruby_position_);
   }
   void SetRubyPosition(RubyPosition position) {
     SET_VAR(rare_inherited_data_, ruby_position_, position);
   }
 
   // -webkit-tap-highlight-color
   static Color InitialTapHighlightColor();
   Color TapHighlightColor() const {
-    return rare_inherited_data_->tap_highlight_color;
+    return rare_inherited_data_->tap_highlight_color_;
   }
   void SetTapHighlightColor(const Color& c) {
-    SET_VAR(rare_inherited_data_, tap_highlight_color, c);
+    SET_VAR(rare_inherited_data_, tap_highlight_color_, c);
   }
 
   // -webkit-text-fill-color
   void SetTextFillColor(const StyleColor& c) {
     SET_VAR_WITH_SETTER(rare_inherited_data_, TextFillColor, SetTextFillColor,
                         c);
   }
 
   // -webkit-text-security
   static ETextSecurity InitialTextSecurity() { return TSNONE; }
   ETextSecurity TextSecurity() const {
-    return static_cast<ETextSecurity>(rare_inherited_data_->text_security);
+    return static_cast<ETextSecurity>(rare_inherited_data_->text_security_);
   }
   void SetTextSecurity(ETextSecurity a_text_security) {
-    SET_VAR(rare_inherited_data_, text_security, a_text_security);
+    SET_VAR(rare_inherited_data_, text_security_, a_text_security);
   }
 
   // -webkit-text-stroke-color
   void SetTextStrokeColor(const StyleColor& c) {
     SET_VAR_WITH_SETTER(rare_inherited_data_, TextStrokeColor,
                         SetTextStrokeColor, c);
   }
 
   // -webkit-text-stroke-width
   static float InitialTextStrokeWidth() { return 0; }
   float TextStrokeWidth() const {
-    return rare_inherited_data_->text_stroke_width;
+    return rare_inherited_data_->text_stroke_width_;
   }
   void SetTextStrokeWidth(float w) {
-    SET_VAR(rare_inherited_data_, text_stroke_width, w);
+    SET_VAR(rare_inherited_data_, text_stroke_width_, w);
   }
 
   // -webkit-user-drag
   static EUserDrag InitialUserDrag() { return DRAG_AUTO; }
   EUserDrag UserDrag() const {
     return static_cast<EUserDrag>(rare_non_inherited_data_->user_drag);
   }
   void SetUserDrag(EUserDrag d) {
     SET_VAR(rare_non_inherited_data_, user_drag, d);
   }
 
   // -webkit-user-modify
   static EUserModify InitialUserModify() { return READ_ONLY; }
   EUserModify UserModify() const {
-    return static_cast<EUserModify>(rare_inherited_data_->user_modify);
+    return static_cast<EUserModify>(rare_inherited_data_->user_modify_);
   }
   void SetUserModify(EUserModify u) {
-    SET_VAR(rare_inherited_data_, user_modify, u);
+    SET_VAR(rare_inherited_data_, user_modify_, u);
   }
 
   // -webkit-user-select
   static EUserSelect InitialUserSelect() { return SELECT_TEXT; }
   EUserSelect UserSelect() const {
-    return static_cast<EUserSelect>(rare_inherited_data_->user_select);
+    return static_cast<EUserSelect>(rare_inherited_data_->user_select_);
   }
   void SetUserSelect(EUserSelect s) {
-    SET_VAR(rare_inherited_data_, user_select, s);
+    SET_VAR(rare_inherited_data_, user_select_, s);
   }
 
   // caret-color
   void SetCaretColor(const StyleAutoColor& c) {
     SET_VAR_WITH_SETTER(rare_inherited_data_, CaretColor, SetCaretColor, c);
   }
 
   // Font properties.
   const Font& GetFont() const;
   void SetFont(const Font&);
@@ skipping 1088 matching lines @@
   bool IsDisplayFlexibleBox() const { return IsDisplayFlexibleBox(Display()); }
 
   // Isolation utility functions.
   bool HasIsolation() const { return Isolation() != kIsolationAuto; }
 
   // Content utility functions.
   bool HasContent() const { return GetContentData(); }
 
   // Cursor utility functions.
   CursorList* Cursors() const {
-    return rare_inherited_data_->cursor_data.Get();
+    return rare_inherited_data_->cursor_data_.Get();
   }
   void AddCursor(StyleImage*,
                  bool hot_spot_specified,
                  const IntPoint& hot_spot = IntPoint());
   void SetCursorList(CursorList*);
   void ClearCursorList();
 
   // Text decoration utility functions.
   void ApplyTextDecorations(const Color& parent_text_decoration_color,
                             bool override_existing_colors);
@@ skipping 585 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h