Remove references to rare_inherited_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 987 matching lines @@
     SET_NESTED_VAR(rare_non_inherited_data_, grid_, grid_template_rows_,
                    lengths);
   }
 
   // image-orientation
   static RespectImageOrientationEnum InitialRespectImageOrientation() {
     return kDoNotRespectImageOrientation;
   }
   RespectImageOrientationEnum RespectImageOrientation() const {
     return static_cast<RespectImageOrientationEnum>(
-        rare_inherited_data_->respect_image_orientation_);
+        RespectImageOrientationInternal());
   }
   void SetRespectImageOrientation(RespectImageOrientationEnum v) {
-    SET_VAR(rare_inherited_data_, respect_image_orientation_, v);
+    SetRespectImageOrientationInternal(v);
   }
 
   // isolation
   static EIsolation InitialIsolation() { return kIsolationAuto; }
   EIsolation Isolation() const {
     return static_cast<EIsolation>(rare_non_inherited_data_->isolation_);
   }
   void SetIsolation(EIsolation v) {
     rare_non_inherited_data_.Access()->isolation_ = v;
   }
@@ skipping 439 matching lines @@
   }
   void SetTextDecorationStyle(TextDecorationStyle v) {
     SET_VAR(rare_non_inherited_data_, text_decoration_style_, v);
   }
 
   // text-underline-position
   static TextUnderlinePosition InitialTextUnderlinePosition() {
     return TextUnderlinePosition::kAuto;
   }
   TextUnderlinePosition GetTextUnderlinePosition() const {
-    return static_cast<TextUnderlinePosition>(
-        rare_inherited_data_->text_underline_position_);
+    return TextUnderlinePositionInternal();
   }
   void SetTextUnderlinePosition(TextUnderlinePosition v) {
-    SET_VAR(rare_inherited_data_, text_underline_position_,
-            static_cast<unsigned>(v));
+    SetTextUnderlinePositionInternal(v);
   }
 
   // text-decoration-skip
   static TextDecorationSkip InitialTextDecorationSkip() {
     return TextDecorationSkip::kObjects;
   }
   TextDecorationSkip GetTextDecorationSkip() const {
-    return static_cast<TextDecorationSkip>(
-        rare_inherited_data_->text_decoration_skip_);
+    return TextDecorationSkipInternal();
   }
   void SetTextDecorationSkip(TextDecorationSkip v) {
-    SET_VAR(rare_inherited_data_, text_decoration_skip_,
-            static_cast<unsigned>(v));
+    SetTextDecorationSkipInternal(v);
   }
 
   // text-overflow
   static TextOverflow InitialTextOverflow() { return kTextOverflowClip; }
   TextOverflow GetTextOverflow() const {
     return static_cast<TextOverflow>(rare_non_inherited_data_->text_overflow_);
   }
   void SetTextOverflow(TextOverflow overflow) {
     SET_VAR(rare_non_inherited_data_, text_overflow_, overflow);
   }
@@ skipping 27 matching lines @@
   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 {
     return rare_non_inherited_data_->will_change_->scroll_position_;
   }
   bool SubtreeWillChangeContents() const {
-    return rare_inherited_data_->subtree_will_change_contents_;
+    return SubtreeWillChangeContentsInternal();
   }
   void SetWillChangeProperties(const Vector<CSSPropertyID>& properties) {
     SET_NESTED_VAR(rare_non_inherited_data_, will_change_, properties_,
                    properties);
   }
   void SetWillChangeContents(bool b) {
     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);
+    SetSubtreeWillChangeContentsInternal(b);
   }
 
   // z-index
   int ZIndex() const { return ZIndexInternal(); }
   bool HasAutoZIndex() const { return HasAutoZIndexInternal(); }
   void SetZIndex(int v) {
     SetHasAutoZIndexInternal(false);
     SetZIndexInternal(v);
   }
   void SetHasAutoZIndex() {
     SetHasAutoZIndexInternal(true);
     SetZIndexInternal(0);
   }
 
   // zoom
   static float InitialZoom() { return 1.0f; }
   float Zoom() const { return ZoomInternal(); }
-  float EffectiveZoom() const { return rare_inherited_data_->effective_zoom_; }
+  float EffectiveZoom() const { return EffectiveZoomInternal(); }
   bool SetZoom(float);
   bool SetEffectiveZoom(float);
 
   // -webkit-app-region
   DraggableRegionMode GetDraggableRegionMode() const {
     return static_cast<DraggableRegionMode>(
         rare_non_inherited_data_->draggable_region_mode_);
   }
   void SetDraggableRegionMode(DraggableRegionMode v) {
     SET_VAR(rare_non_inherited_data_, draggable_region_mode_,
@@ skipping 68 matching lines @@
   void SetLineHeight(const Length& specified_line_height);
 
   // List style properties.
   // list-style-image
   static StyleImage* InitialListStyleImage() { return 0; }
   StyleImage* ListStyleImage() const;
   void SetListStyleImage(StyleImage*);
 
   // quotes
   static QuotesData* InitialQuotes() { return 0; }
-  QuotesData* Quotes() const { return rare_inherited_data_->quotes_.Get(); }
+  QuotesData* Quotes() const { return QuotesInternal().Get(); }
   void SetQuotes(RefPtr<QuotesData>);
 
   bool QuotesDataEquivalent(const ComputedStyle&) const;
 
   // text-justify
   static TextJustify InitialTextJustify() { return kTextJustifyAuto; }
-  TextJustify GetTextJustify() const {
-    return static_cast<TextJustify>(rare_inherited_data_->text_justify_);
-  }
-  void SetTextJustify(TextJustify v) {
-    SET_VAR(rare_inherited_data_, text_justify_, v);
-  }
-
-  // text-orientation (aka -webkit-text-orientation, -epub-text-orientation)
-  bool SetTextOrientation(ETextOrientation);
+  TextJustify GetTextJustify() const { return TextJustifyInternal(); }
+  void SetTextJustify(TextJustify v) { SetTextJustifyInternal(v); }
 
   // text-shadow
   static ShadowList* InitialTextShadow() { return 0; }
-  ShadowList* TextShadow() const {
-    return rare_inherited_data_->text_shadow_.Get();
-  }
+  ShadowList* TextShadow() const { return TextShadowInternal().Get(); }
   void SetTextShadow(RefPtr<ShadowList>);
 
   bool TextShadowDataEquivalent(const ComputedStyle&) const;
 
   // Text emphasis properties.
   static TextEmphasisMark InitialTextEmphasisMark() {
     return TextEmphasisMark::kNone;
   }
   TextEmphasisMark GetTextEmphasisMark() const;
   void SetTextEmphasisMark(TextEmphasisMark mark) {
-    SET_VAR(rare_inherited_data_, text_emphasis_mark_,
-            static_cast<unsigned>(mark));
+    SetTextEmphasisMarkInternal(mark);
   }
   const AtomicString& TextEmphasisMarkString() const;
 
   // -webkit-text-emphasis-color (aka -epub-text-emphasis-color)
   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());
+    SetTextEmphasisColorInternal(color.Resolve(Color()));
+    SetTextEmphasisColorIsCurrentColorInternal(color.IsCurrentColor());
   }
 
   // -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-text-fill-color
   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());
+    SetTextFillColorInternal(color.Resolve(Color()));
+    SetTextFillColorIsCurrentColorInternal(color.IsCurrentColor());
   }
 
   // -webkit-text-stroke-color
   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());
+    SetTextStrokeColorInternal(color.Resolve(Color()));
+    SetTextStrokeColorIsCurrentColorInternal(color.IsCurrentColor());
   }
 
   // -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);
   }
 
   // caret-color
   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());
+    SetCaretColorInternal(color.Resolve(Color()));
+    SetCaretColorIsCurrentColorInternal(color.IsCurrentColor());
+    SetCaretColorIsAutoInternal(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 270 matching lines @@
   void SetIsStackingContext(bool b) {
     SET_VAR(rare_non_inherited_data_, is_stacking_context_, b);
   }
 
   float TextAutosizingMultiplier() const {
     return TextAutosizingMultiplierInternal();
   }
   void SetTextAutosizingMultiplier(float);
 
   bool SelfOrAncestorHasDirAutoAttribute() const {
-    return rare_inherited_data_->self_or_ancestor_has_dir_auto_attribute_;
+    return SelfOrAncestorHasDirAutoAttributeInternal();
   }
   void SetSelfOrAncestorHasDirAutoAttribute(bool v) {
-    SET_VAR(rare_inherited_data_, self_or_ancestor_has_dir_auto_attribute_, v);
+    SetSelfOrAncestorHasDirAutoAttributeInternal(v);
   }
 
   // Animation flags.
   bool HasCurrentOpacityAnimation() const {
     return rare_non_inherited_data_->has_current_opacity_animation_;
   }
   void SetHasCurrentOpacityAnimation(bool b = true) {
     SET_VAR(rare_non_inherited_data_, has_current_opacity_animation_, b);
   }
 
@@ skipping 920 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();
-  }
+  CursorList* Cursors() const { return CursorDataInternal().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);
   void ClearAppliedTextDecorations();
@@ skipping 317 matching lines @@
     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& 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());
+    SetVisitedLinkTextEmphasisColorInternal(color.Resolve(Color()));
+    SetVisitedLinkTextEmphasisColorIsCurrentColorInternal(
+        color.IsCurrentColor());
   }
   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());
+    SetVisitedLinkTextFillColorInternal(color.Resolve(Color()));
+    SetVisitedLinkTextFillColorIsCurrentColorInternal(color.IsCurrentColor());
   }
   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());
+    SetVisitedLinkTextStrokeColorInternal(color.Resolve(Color()));
+    SetVisitedLinkTextStrokeColorIsCurrentColorInternal(color.IsCurrentColor());
   }
   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());
+    SetVisitedLinkCaretColorInternal(color.Resolve(Color()));
+    SetVisitedLinkCaretColorIsCurrentColorInternal(color.IsCurrentColor());
+    SetVisitedLinkCaretColorIsAutoInternal(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 46 matching lines @@
                : StyleColor(BorderTopColorInternal());
   }
   StyleColor BorderBottomColor() const {
     return BorderBottomColorIsCurrentColor()
                ? StyleColor::CurrentColor()
                : StyleColor(BorderBottomColorInternal());
   }
 
   StyleColor BackgroundColor() const { return BackgroundColorInternal(); }
   StyleAutoColor CaretColor() const {
-    if (rare_inherited_data_->caret_color_is_current_color_)
+    if (CaretColorIsCurrentColorInternal())
       return StyleAutoColor::CurrentColor();
-    if (rare_inherited_data_->caret_color_is_auto_)
+    if (CaretColorIsAutoInternal())
       return StyleAutoColor::AutoColor();
-    return StyleAutoColor(rare_inherited_data_->caret_color_);
+    return StyleAutoColor(CaretColorInternal());
   }
   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_->text_emphasis_color_is_current_color_
+    return TextEmphasisColorIsCurrentColorInternal()
                ? StyleColor::CurrentColor()
-               : StyleColor(rare_inherited_data_->text_emphasis_color_);
+               : StyleColor(TextEmphasisColorInternal());
   }
   StyleColor TextFillColor() const {
-    return rare_inherited_data_->text_fill_color_is_current_color_
+    return TextFillColorIsCurrentColorInternal()
                ? StyleColor::CurrentColor()
-               : StyleColor(rare_inherited_data_->text_fill_color_);
+               : StyleColor(TextFillColorInternal());
   }
   StyleColor TextStrokeColor() const {
-    return rare_inherited_data_->text_stroke_color_is_current_color_
+    return TextStrokeColorIsCurrentColorInternal()
                ? StyleColor::CurrentColor()
-               : StyleColor(rare_inherited_data_->text_stroke_color_);
+               : StyleColor(TextStrokeColorInternal());
   }
   StyleAutoColor VisitedLinkCaretColor() const {
-    if (rare_inherited_data_->visited_link_caret_color_is_current_color_)
+    if (VisitedLinkCaretColorIsCurrentColorInternal())
       return StyleAutoColor::CurrentColor();
-    if (rare_inherited_data_->visited_link_caret_color_is_auto_)
+    if (VisitedLinkCaretColorIsAutoInternal())
       return StyleAutoColor::AutoColor();
-    return StyleAutoColor(rare_inherited_data_->visited_link_caret_color_);
+    return StyleAutoColor(VisitedLinkCaretColorInternal());
   }
   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 10 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_
-                   ->visited_link_text_emphasis_color_is_current_color_
+    return VisitedLinkTextEmphasisColorIsCurrentColorInternal()
                ? StyleColor::CurrentColor()
-               : StyleColor(
-                     rare_inherited_data_->visited_link_text_emphasis_color_);
+               : StyleColor(VisitedLinkTextEmphasisColorInternal());
   }
   StyleColor VisitedLinkTextFillColor() const {
-    return rare_inherited_data_->visited_link_text_fill_color_is_current_color_
+    return VisitedLinkTextFillColorIsCurrentColorInternal()
                ? StyleColor::CurrentColor()
-               : StyleColor(
-                     rare_inherited_data_->visited_link_text_fill_color_);
+               : StyleColor(VisitedLinkTextFillColorInternal());
   }
   StyleColor VisitedLinkTextStrokeColor() const {
-    return rare_inherited_data_
-                   ->visited_link_text_stroke_color_is_current_color_
+    return VisitedLinkTextStrokeColorIsCurrentColorInternal()
                ? StyleColor::CurrentColor()
-               : StyleColor(
-                     rare_inherited_data_->visited_link_text_stroke_color_);
+               : StyleColor(VisitedLinkTextStrokeColorInternal());
   }
 
   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 68 matching lines @@
     return false;
   SetZoomInternal(f);
   SetEffectiveZoom(EffectiveZoom() * Zoom());
   return true;
 }
 
 inline bool ComputedStyle::SetEffectiveZoom(float f) {
   // Clamp the effective zoom value to a smaller (but hopeful still large
   // enough) range, to avoid overflow in derived computations.
   float clamped_effective_zoom = clampTo<float>(f, 1e-6, 1e6);
-  if (compareEqual(rare_inherited_data_->effective_zoom_,
-                   clamped_effective_zoom))
+  if (compareEqual(EffectiveZoomInternal(), clamped_effective_zoom))
     return false;
-  rare_inherited_data_.Access()->effective_zoom_ = clamped_effective_zoom;
+  SetEffectiveZoomInternal(clamped_effective_zoom);
   return true;
 }
 
 inline bool ComputedStyle::IsSharable() const {
   if (Unique())
     return false;
   if (HasUniquePseudoStyle())
     return false;
   return true;
 }
 
-inline bool ComputedStyle::SetTextOrientation(
-    ETextOrientation text_orientation) {
-  if (compareEqual(rare_inherited_data_->text_orientation_,
-                   static_cast<unsigned>(text_orientation)))
-    return false;
-
-  rare_inherited_data_.Access()->text_orientation_ =
-      static_cast<unsigned>(text_orientation);
-  return true;
-}
-
 inline bool ComputedStyle::HasAnyPublicPseudoStyles() const {
   return PseudoBitsInternal() != kPseudoIdNone;
 }
 
 inline bool ComputedStyle::HasPseudoStyle(PseudoId pseudo) const {
   DCHECK(pseudo >= kFirstPublicPseudoId);
   DCHECK(pseudo < kFirstInternalPseudoId);
   return (1 << (pseudo - kFirstPublicPseudoId)) & PseudoBitsInternal();
 }
 
 inline void ComputedStyle::SetHasPseudoStyle(PseudoId pseudo) {
   DCHECK(pseudo >= kFirstPublicPseudoId);
   DCHECK(pseudo < kFirstInternalPseudoId);
   // TODO: Fix up this code. It is hard to understand.
   SetPseudoBitsInternal(static_cast<PseudoId>(
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h