Remove references to inherited_data_ in ComputedStyle.

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 1390 matching lines @@
 
 StyleImage* ComputedStyle::ListStyleImage() const {
   return rare_inherited_data_->list_style_image_.Get();
 }
 void ComputedStyle::SetListStyleImage(StyleImage* v) {
   if (rare_inherited_data_->list_style_image_ != v)
     rare_inherited_data_.Access()->list_style_image_ = v;
 }
 
 Color ComputedStyle::GetColor() const {
-  return inherited_data_->color_;
+  return ColorInternal();
 }
 void ComputedStyle::SetColor(const Color& v) {
-  SET_VAR(inherited_data_, color_, v);
+  SetColorInternal(v);
 }
 
 FloatRoundedRect ComputedStyle::GetRoundedBorderFor(
     const LayoutRect& border_rect,
     bool include_logical_left_edge,
     bool include_logical_right_edge) const {
   FloatRoundedRect rounded_rect(PixelSnappedIntRect(border_rect));
   if (HasBorderRadius()) {
     FloatRoundedRect::Radii radii =
         CalcRadiiFor(Border(), BorderTopLeftRadius(), BorderTopRightRadius(),
@@ skipping 227 matching lines @@
 }
 
 CSSTransitionData& ComputedStyle::AccessTransitions() {
   if (!rare_non_inherited_data_.Access()->transitions_)
     rare_non_inherited_data_.Access()->transitions_ =
         CSSTransitionData::Create();
   return *rare_non_inherited_data_->transitions_;
 }
 
 const Font& ComputedStyle::GetFont() const {
-  return inherited_data_->font_;
+  return FontInternal();
 }
 const FontDescription& ComputedStyle::GetFontDescription() const {
-  return inherited_data_->font_.GetFontDescription();
+  return FontInternal().GetFontDescription();
 }
 float ComputedStyle::SpecifiedFontSize() const {
   return GetFontDescription().SpecifiedSize();
 }
 float ComputedStyle::ComputedFontSize() const {
   return GetFontDescription().ComputedSize();
 }
 LayoutUnit ComputedStyle::ComputedFontSizeAsFixed() const {
   return LayoutUnit::FromFloatRound(GetFontDescription().ComputedSize());
 }
@@ skipping 172 matching lines @@
 }
 
 float ComputedStyle::WordSpacing() const {
   return GetFontDescription().WordSpacing();
 }
 float ComputedStyle::LetterSpacing() const {
   return GetFontDescription().LetterSpacing();
 }
 
 bool ComputedStyle::SetFontDescription(const FontDescription& v) {
-  if (inherited_data_->font_.GetFontDescription() != v) {
-    inherited_data_.Access()->font_ = Font(v);
+  if (FontInternal().GetFontDescription() != v) {
+    SetFontInternal(Font(v));
     return true;
   }
   return false;
 }
 
 void ComputedStyle::SetFont(const Font& font) {
-  inherited_data_.Access()->font_ = font;
+  SetFontInternal(font);
 }
 
 bool ComputedStyle::HasIdenticalAscentDescentAndLineGap(
     const ComputedStyle& other) const {
   const SimpleFontData* font_data = GetFont().PrimaryFont();
   const SimpleFontData* other_font_data = other.GetFont().PrimaryFont();
   return font_data && other_font_data &&
          font_data->GetFontMetrics().HasIdenticalAscentDescentAndLineGap(
              other_font_data->GetFontMetrics());
 }
 
 const Length& ComputedStyle::SpecifiedLineHeight() const {
-  return inherited_data_->line_height_;
+  return LineHeightInternal();
 }
 Length ComputedStyle::LineHeight() const {
-  const Length& lh = inherited_data_->line_height_;
+  const Length& lh = LineHeightInternal();
   // Unlike getFontDescription().computedSize() and hence fontSize(), this is
   // recalculated on demand as we only store the specified line height.
   // FIXME: Should consider scaling the fixed part of any calc expressions
   // too, though this involves messily poking into CalcExpressionLength.
   if (lh.IsFixed()) {
     float multiplier = TextAutosizingMultiplier();
     return Length(
         TextAutosizer::ComputeAutosizedFontSize(lh.Value(), multiplier),
         kFixed);
   }
 
   return lh;
 }
 
 void ComputedStyle::SetLineHeight(const Length& specified_line_height) {
-  SET_VAR(inherited_data_, line_height_, specified_line_height);
+  SetLineHeightInternal(specified_line_height);
 }
 
 int ComputedStyle::ComputedLineHeight() const {
   const Length& lh = LineHeight();
 
   // Negative value means the line height is not set. Use the font's built-in
   // spacing, if avalible.
   if (lh.IsNegative() && GetFont().PrimaryFont())
     return GetFont().PrimaryFont()->GetFontMetrics().LineSpacing();
 
@@ skipping 27 matching lines @@
 
 void ComputedStyle::SetLetterSpacing(float letter_spacing) {
   FontSelector* current_font_selector = GetFont().GetFontSelector();
   FontDescription desc(GetFontDescription());
   desc.SetLetterSpacing(letter_spacing);
   SetFontDescription(desc);
   GetFont().Update(current_font_selector);
 }
 
 void ComputedStyle::SetTextAutosizingMultiplier(float multiplier) {
-  SET_VAR(inherited_data_, text_autosizing_multiplier_, multiplier);
+  SetTextAutosizingMultiplierInternal(multiplier);
 
   float size = SpecifiedFontSize();
 
   DCHECK(std::isfinite(size));
   if (!std::isfinite(size) || size < 0)
     size = 0;
   else
     size = std::min(kMaximumAllowedFontSize, size);
 
   FontSelector* current_font_selector = GetFont().GetFontSelector();
@@ skipping 525 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink