Move StyleRareInheritedData accessors to be inline 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 1837 matching lines @@
     SET_VAR(rare_inherited_data_, text_emphasis_fill, fill);
   }
   void SetTextEmphasisMark(TextEmphasisMark 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);
   }
 
   // -webkit-text-emphasis-color (aka -epub-text-emphasis-color)
-  void SetTextEmphasisColor(const StyleColor& c) {
-    SET_VAR_WITH_SETTER(rare_inherited_data_, TextEmphasisColor,
-                        SetTextEmphasisColor, c);
+  void SetTextEmphasisColor(const StyleColor& color) {
+    SET_VAR(rare_inherited_data_, text_emphasis_color_, color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_, text_emphasis_color_is_current_color_,
+            color.IsCurrentColor());
   }
 
   // -webkit-text-emphasis-position
   static TextEmphasisPosition InitialTextEmphasisPosition() {
     return kTextEmphasisPositionOver;
   }
   TextEmphasisPosition GetTextEmphasisPosition() const {
     return static_cast<TextEmphasisPosition>(
         rare_inherited_data_->text_emphasis_position);
   }
@@ skipping 31 matching lines @@
   // -webkit-tap-highlight-color
   static Color InitialTapHighlightColor();
   Color TapHighlightColor() const {
     return rare_inherited_data_->tap_highlight_color;
   }
   void SetTapHighlightColor(const 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);
+  void SetTextFillColor(const StyleColor& color) {
+    SET_VAR(rare_inherited_data_, text_fill_color_, color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_, text_fill_color_is_current_color_,
+            color.IsCurrentColor());
   }
 
   // -webkit-text-security
   static ETextSecurity InitialTextSecurity() { return TSNONE; }
   ETextSecurity TextSecurity() const {
     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);
   }
 
   // -webkit-text-stroke-color
-  void SetTextStrokeColor(const StyleColor& c) {
-    SET_VAR_WITH_SETTER(rare_inherited_data_, TextStrokeColor,
-                        SetTextStrokeColor, c);
+  void SetTextStrokeColor(const StyleColor& color) {
+    SET_VAR(rare_inherited_data_, text_stroke_color_, color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_, text_stroke_color_is_current_color_,
+            color.IsCurrentColor());
   }
 
   // -webkit-text-stroke-width
   static float InitialTextStrokeWidth() { return 0; }
   float TextStrokeWidth() const {
     return rare_inherited_data_->text_stroke_width;
   }
   void SetTextStrokeWidth(float w) {
     SET_VAR(rare_inherited_data_, text_stroke_width, w);
   }
@@ skipping 19 matching lines @@
   // -webkit-user-select
   static EUserSelect InitialUserSelect() { return SELECT_TEXT; }
   EUserSelect UserSelect() const {
     return static_cast<EUserSelect>(rare_inherited_data_->user_select);
   }
   void SetUserSelect(EUserSelect 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);
+  void SetCaretColor(const StyleAutoColor& color) {
+    SET_VAR(rare_inherited_data_, caret_color_, color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_, caret_color_is_current_color_,
+            color.IsCurrentColor());
+    SET_VAR(rare_inherited_data_, caret_color_is_auto_, color.IsAutoColor());
   }
 
   // Font properties.
   const Font& GetFont() const;
   void SetFont(const Font&);
   const FontDescription& GetFontDescription() const;
   bool SetFontDescription(const FontDescription&);
   bool HasIdenticalAscentDescentAndLineGap(const ComputedStyle& other) const;
 
   // font-size
@@ skipping 1404 matching lines @@
   void SetVisitedLinkOutlineColor(const StyleColor& v) {
     SET_VAR(rare_non_inherited_data_, visited_link_outline_color_, v);
   }
   void SetVisitedLinkColumnRuleColor(const StyleColor& v) {
     SET_NESTED_VAR(rare_non_inherited_data_, multi_col_,
                    visited_link_column_rule_color_, v);
   }
   void SetVisitedLinkTextDecorationColor(const StyleColor& v) {
     SET_VAR(rare_non_inherited_data_, visited_link_text_decoration_color_, v);
   }
-  void SetVisitedLinkTextEmphasisColor(const StyleColor& v) {
-    SET_VAR_WITH_SETTER(rare_inherited_data_, VisitedLinkTextEmphasisColor,
-                        SetVisitedLinkTextEmphasisColor, v);
+  void SetVisitedLinkTextEmphasisColor(const StyleColor& color) {
+    SET_VAR(rare_inherited_data_, visited_link_text_emphasis_color_,
+            color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_,
+            visited_link_text_emphasis_color_is_current_color_,
+            color.IsCurrentColor());
   }
-  void SetVisitedLinkTextFillColor(const StyleColor& v) {
-    SET_VAR_WITH_SETTER(rare_inherited_data_, VisitedLinkTextFillColor,
-                        SetVisitedLinkTextFillColor, v);
+  void SetVisitedLinkTextFillColor(const StyleColor& color) {
+    SET_VAR(rare_inherited_data_, visited_link_text_fill_color_,
+            color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_,
+            visited_link_text_fill_color_is_current_color_,
+            color.IsCurrentColor());
   }
-  void SetVisitedLinkTextStrokeColor(const StyleColor& v) {
-    SET_VAR_WITH_SETTER(rare_inherited_data_, VisitedLinkTextStrokeColor,
-                        SetVisitedLinkTextStrokeColor, v);
+  void SetVisitedLinkTextStrokeColor(const StyleColor& color) {
+    SET_VAR(rare_inherited_data_, visited_link_text_stroke_color_,
+            color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_,
+            visited_link_text_stroke_color_is_current_color_,
+            color.IsCurrentColor());
   }
-  void SetVisitedLinkCaretColor(const StyleAutoColor& v) {
-    SET_VAR_WITH_SETTER(rare_inherited_data_, VisitedLinkCaretColor,
-                        SetVisitedLinkCaretColor, v);
+  void SetVisitedLinkCaretColor(const StyleAutoColor& color) {
+    SET_VAR(rare_inherited_data_, visited_link_caret_color_,
+            color.Resolve(Color()));
+    SET_VAR(rare_inherited_data_, visited_link_caret_color_is_current_color_,
+            color.IsCurrentColor());
+    SET_VAR(rare_inherited_data_, visited_link_caret_color_is_auto_,
+            color.IsAutoColor());
   }
 
   static bool IsDisplayBlockContainer(EDisplay display) {
     return display == EDisplay::kBlock || display == EDisplay::kListItem ||
            display == EDisplay::kInlineBlock ||
            display == EDisplay::kFlowRoot || display == EDisplay::kTableCell ||
            display == EDisplay::kTableCaption;
   }
 
   static bool IsDisplayFlexibleBox(EDisplay display) {
@@ skipping 39 matching lines @@
   StyleColor BorderTopColor() const {
     return surround_data_->border_.Top().GetColor();
   }
   StyleColor BorderBottomColor() const {
     return surround_data_->border_.Bottom().GetColor();
   }
   StyleColor BackgroundColor() const {
     return background_data_->background_color_;
   }
   StyleAutoColor CaretColor() const {
-    return rare_inherited_data_->CaretColor();
+    if (rare_inherited_data_->caret_color_is_current_color_)
+      return StyleAutoColor::CurrentColor();
+    if (rare_inherited_data_->caret_color_is_auto_)
+      return StyleAutoColor::AutoColor();
+    return StyleAutoColor(rare_inherited_data_->caret_color_);
   }
   Color GetColor() const;
   StyleColor ColumnRuleColor() const {
     return rare_non_inherited_data_->multi_col_->rule_.GetColor();
   }
   StyleColor OutlineColor() const {
     return rare_non_inherited_data_->outline_.GetColor();
   }
   StyleColor TextEmphasisColor() const {
-    return rare_inherited_data_->TextEmphasisColor();
+    return rare_inherited_data_->text_emphasis_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(rare_inherited_data_->text_emphasis_color_);
   }
   StyleColor TextFillColor() const {
-    return rare_inherited_data_->TextFillColor();
+    return rare_inherited_data_->text_fill_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(rare_inherited_data_->text_fill_color_);
   }
   StyleColor TextStrokeColor() const {
-    return rare_inherited_data_->TextStrokeColor();
+    return rare_inherited_data_->text_stroke_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(rare_inherited_data_->text_stroke_color_);
   }
   StyleAutoColor VisitedLinkCaretColor() const {
-    return rare_inherited_data_->VisitedLinkCaretColor();
+    if (rare_inherited_data_->visited_link_caret_color_is_current_color_)
+      return StyleAutoColor::CurrentColor();
+    if (rare_inherited_data_->visited_link_caret_color_is_auto_)
+      return StyleAutoColor::AutoColor();
+    return StyleAutoColor(rare_inherited_data_->visited_link_caret_color_);
   }
   Color VisitedLinkColor() const;
   StyleColor VisitedLinkBackgroundColor() const {
     return rare_non_inherited_data_->visited_link_background_color_;
   }
   StyleColor VisitedLinkBorderLeftColor() const {
     return rare_non_inherited_data_->visited_link_border_left_color_;
   }
   StyleColor VisitedLinkBorderRightColor() const {
     return rare_non_inherited_data_->visited_link_border_right_color_;
@@ skipping 11 matching lines @@
     return rare_non_inherited_data_->multi_col_
         ->visited_link_column_rule_color_;
   }
   StyleColor TextDecorationColor() const {
     return rare_non_inherited_data_->text_decoration_color_;
   }
   StyleColor VisitedLinkTextDecorationColor() const {
     return rare_non_inherited_data_->visited_link_text_decoration_color_;
   }
   StyleColor VisitedLinkTextEmphasisColor() const {
-    return rare_inherited_data_->VisitedLinkTextEmphasisColor();
+    return rare_inherited_data_
+                   ->visited_link_text_emphasis_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(
+                     rare_inherited_data_->visited_link_text_emphasis_color_);
   }
   StyleColor VisitedLinkTextFillColor() const {
-    return rare_inherited_data_->VisitedLinkTextFillColor();
+    return rare_inherited_data_->visited_link_text_fill_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(
+                     rare_inherited_data_->visited_link_text_fill_color_);
   }
   StyleColor VisitedLinkTextStrokeColor() const {
-    return rare_inherited_data_->VisitedLinkTextStrokeColor();
+    return rare_inherited_data_
+                   ->visited_link_text_stroke_color_is_current_color_
+               ? StyleColor::CurrentColor()
+               : StyleColor(
+                     rare_inherited_data_->visited_link_text_stroke_color_);
   }
 
   StyleColor DecorationColorIncludingFallback(bool visited_link) const;
   Color ColorIncludingFallback(int color_property, bool visited_link) const;
 
   Color StopColor() const { return SvgStyle().StopColor(); }
   Color FloodColor() const { return SvgStyle().FloodColor(); }
   Color LightingColor() const { return SvgStyle().LightingColor(); }
 
   void AddAppliedTextDecoration(const AppliedTextDecoration&);
@@ skipping 117 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h