Rename StyleInheritedData members.

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 111 matching lines @@
   rare_non_inherited_data_.Access()->flexible_box_.Init();
   rare_non_inherited_data_.Access()->multi_col_.Init();
   rare_non_inherited_data_.Access()->transform_.Init();
   rare_non_inherited_data_.Access()->will_change_.Init();
   rare_non_inherited_data_.Access()->filter_.Init();
   rare_non_inherited_data_.Access()->backdrop_filter_.Init();
   rare_non_inherited_data_.Access()->grid_.Init();
   rare_non_inherited_data_.Access()->grid_item_.Init();
   rare_non_inherited_data_.Access()->scroll_snap_.Init();
   rare_inherited_data_.Init();
-  style_inherited_data_.Init();
+  inherited_data_.Init();
   svg_style_.Init();
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
     : ComputedStyleBase(o),
       RefCounted<ComputedStyle>(),
       box_data_(o.box_data_),
       visual_data_(o.visual_data_),
       background_data_(o.background_data_),
       rare_non_inherited_data_(o.rare_non_inherited_data_),
       rare_inherited_data_(o.rare_inherited_data_),
-      style_inherited_data_(o.style_inherited_data_),
+      inherited_data_(o.inherited_data_),
       svg_style_(o.svg_style_) {}
 
 static StyleRecalcChange DiffPseudoStyles(const ComputedStyle& old_style,
                                           const ComputedStyle& new_style) {
   // If the pseudoStyles have changed, ensure layoutObject triggers setStyle.
   if (!old_style.HasAnyPublicPseudoStyles() &&
       !new_style.HasAnyPublicPseudoStyles())
     return kNoChange;
   for (PseudoId pseudo_id = kFirstPublicPseudoId;
        pseudo_id < kFirstInternalPseudoId;
@@ skipping 162 matching lines @@
   ComputedStyleBase::InheritFrom(inherit_parent, is_at_shadow_boundary);
   if (is_at_shadow_boundary == kAtShadowBoundary) {
     // Even if surrounding content is user-editable, shadow DOM should act as a
     // single unit, and not necessarily be editable
     EUserModify current_user_modify = UserModify();
     rare_inherited_data_ = inherit_parent.rare_inherited_data_;
     SetUserModify(current_user_modify);
   } else {
     rare_inherited_data_ = inherit_parent.rare_inherited_data_;
   }
-  style_inherited_data_ = inherit_parent.style_inherited_data_;
+  inherited_data_ = inherit_parent.inherited_data_;
   if (svg_style_ != inherit_parent.svg_style_)
     svg_style_.Access()->InheritFrom(inherit_parent.svg_style_.Get());
 }
 
 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
   ComputedStyleBase::CopyNonInheritedFromCached(other);
   box_data_ = other.box_data_;
   visual_data_ = other.visual_data_;
   background_data_ = other.background_data_;
   rare_non_inherited_data_ = other.rare_non_inherited_data_;
@@ skipping 118 matching lines @@
 }
 
 bool ComputedStyle::IndependentInheritedEqual(
     const ComputedStyle& other) const {
   return ComputedStyleBase::IndependentInheritedEqual(other);
 }
 
 bool ComputedStyle::NonIndependentInheritedEqual(
     const ComputedStyle& other) const {
   return ComputedStyleBase::NonIndependentInheritedEqual(other) &&
-         style_inherited_data_ == other.style_inherited_data_ &&
+         inherited_data_ == other.inherited_data_ &&
          svg_style_->InheritedEqual(*other.svg_style_) &&
          rare_inherited_data_ == other.rare_inherited_data_;
 }
 
 bool ComputedStyle::LoadingCustomFontsEqual(const ComputedStyle& other) const {
   return GetFont().LoadingCustomFonts() == other.GetFont().LoadingCustomFonts();
 }
 
 bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const {
   // compare everything except the pseudoStyle pointer
   return ComputedStyleBase::NonInheritedEqual(other) &&
          OriginalDisplay() ==
              other.OriginalDisplay() &&  // Not generated in ComputedStyleBase
          VerticalAlign() == other.VerticalAlign() &&  // Not generated in
                                                       // ComputedStyleBase
          box_data_ == other.box_data_ &&
          visual_data_ == other.visual_data_ &&
          background_data_ == other.background_data_ &&
          rare_non_inherited_data_ == other.rare_non_inherited_data_ &&
          svg_style_->NonInheritedEqual(*other.svg_style_);
 }
 
 bool ComputedStyle::InheritedDataShared(const ComputedStyle& other) const {
   // This is a fast check that only looks if the data structures are shared.
   // TODO(sashab): Should ComputedStyleBase have an inheritedDataShared method?
   return ComputedStyleBase::InheritedEqual(other) &&
-         style_inherited_data_.Get() == other.style_inherited_data_.Get() &&
+         inherited_data_.Get() == other.inherited_data_.Get() &&
          svg_style_.Get() == other.svg_style_.Get() &&
          rare_inherited_data_.Get() == other.rare_inherited_data_.Get();
 }
 
 static bool DependenceOnContentHeightHasChanged(const ComputedStyle& a,
                                                 const ComputedStyle& b) {
   // If top or bottom become auto/non-auto then it means we either have to solve
   // height based on the content or stop doing so
   // (http://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-height)
   // - either way requires a layout.
@@ skipping 244 matching lines @@
 
     if (!rare_inherited_data_->ShadowDataEquivalent(
             *other.rare_inherited_data_.Get()))
       return true;
 
     if (!rare_inherited_data_->QuotesDataEquivalent(
             *other.rare_inherited_data_.Get()))
       return true;
   }
 
-  if (style_inherited_data_->text_autosizing_multiplier !=
-      other.style_inherited_data_->text_autosizing_multiplier)
+  if (inherited_data_->text_autosizing_multiplier_ !=
+      other.inherited_data_->text_autosizing_multiplier_)
     return true;
 
-  if (style_inherited_data_->font.LoadingCustomFonts() !=
-      other.style_inherited_data_->font.LoadingCustomFonts())
+  if (inherited_data_->font_.LoadingCustomFonts() !=
+      other.inherited_data_->font_.LoadingCustomFonts())
     return true;
 
-  if (style_inherited_data_.Get() != other.style_inherited_data_.Get()) {
-    if (style_inherited_data_->line_height !=
-            other.style_inherited_data_->line_height ||
-        style_inherited_data_->font != other.style_inherited_data_->font ||
-        style_inherited_data_->horizontal_border_spacing !=
-            other.style_inherited_data_->horizontal_border_spacing ||
-        style_inherited_data_->vertical_border_spacing !=
-            other.style_inherited_data_->vertical_border_spacing)
+  if (inherited_data_.Get() != other.inherited_data_.Get()) {
+    if (inherited_data_->line_height_ != other.inherited_data_->line_height_ ||
+        inherited_data_->font_ != other.inherited_data_->font_ ||
+        inherited_data_->horizontal_border_spacing_ !=
+            other.inherited_data_->horizontal_border_spacing_ ||
+        inherited_data_->vertical_border_spacing_ !=
+            other.inherited_data_->vertical_border_spacing_)
       return true;
   }
 
   if (BoxDirection() != other.BoxDirection() ||
       RtlOrdering() != other.RtlOrdering() ||
       GetTextAlign() != other.GetTextAlign() ||
       TextTransform() != other.TextTransform() ||
       Direction() != other.Direction() || WhiteSpace() != other.WhiteSpace() ||
       GetWritingMode() != other.GetWritingMode())
     return true;
@@ skipping 262 matching lines @@
 
     if (!rare_non_inherited_data_->outline_.VisuallyEqual(
             other.rare_non_inherited_data_->outline_))
       diff.SetNeedsRecomputeOverflow();
   }
 
   if (!Border().VisualOverflowEqual(other.Border()))
     diff.SetNeedsRecomputeOverflow();
 
   if (!diff.NeedsFullPaintInvalidation()) {
-    if (style_inherited_data_->color != other.style_inherited_data_->color ||
-        style_inherited_data_->visited_link_color !=
-            other.style_inherited_data_->visited_link_color ||
+    if (inherited_data_->color_ != other.inherited_data_->color_ ||
+        inherited_data_->visited_link_color_ !=
+            other.inherited_data_->visited_link_color_ ||
         HasSimpleUnderlineInternal() != other.HasSimpleUnderlineInternal() ||
         visual_data_->text_decoration != other.visual_data_->text_decoration) {
       diff.SetTextDecorationOrColorChanged();
     } else if (rare_non_inherited_data_.Get() !=
                    other.rare_non_inherited_data_.Get() &&
                (rare_non_inherited_data_->text_decoration_style_ !=
                     other.rare_non_inherited_data_->text_decoration_style_ ||
                 rare_non_inherited_data_->text_decoration_color_ !=
                     other.rare_non_inherited_data_->text_decoration_color_ ||
                 rare_non_inherited_data_->visited_link_text_decoration_color_ !=
@@ skipping 355 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 style_inherited_data_->color;
+  return inherited_data_->color_;
 }
 Color ComputedStyle::VisitedLinkColor() const {
-  return style_inherited_data_->visited_link_color;
+  return inherited_data_->visited_link_color_;
 }
 void ComputedStyle::SetColor(const Color& v) {
-  SET_VAR(style_inherited_data_, color, v);
+  SET_VAR(inherited_data_, color_, v);
 }
 void ComputedStyle::SetVisitedLinkColor(const Color& v) {
-  SET_VAR(style_inherited_data_, visited_link_color, v);
+  SET_VAR(inherited_data_, visited_link_color_, v);
 }
 
 short ComputedStyle::HorizontalBorderSpacing() const {
-  return style_inherited_data_->horizontal_border_spacing;
+  return inherited_data_->horizontal_border_spacing_;
 }
 short ComputedStyle::VerticalBorderSpacing() const {
-  return style_inherited_data_->vertical_border_spacing;
+  return inherited_data_->vertical_border_spacing_;
 }
 void ComputedStyle::SetHorizontalBorderSpacing(short v) {
-  SET_VAR(style_inherited_data_, horizontal_border_spacing, v);
+  SET_VAR(inherited_data_, horizontal_border_spacing_, v);
 }
 void ComputedStyle::SetVerticalBorderSpacing(short v) {
-  SET_VAR(style_inherited_data_, vertical_border_spacing, v);
+  SET_VAR(inherited_data_, vertical_border_spacing_, 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(), border_rect.Size());
     rounded_rect.IncludeLogicalEdges(radii, IsHorizontalWritingMode(),
@@ skipping 203 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 style_inherited_data_->font;
+  return inherited_data_->font_;
 }
 const FontDescription& ComputedStyle::GetFontDescription() const {
-  return style_inherited_data_->font.GetFontDescription();
+  return inherited_data_->font_.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 173 matching lines @@
 }
 
 float ComputedStyle::WordSpacing() const {
   return GetFontDescription().WordSpacing();
 }
 float ComputedStyle::LetterSpacing() const {
   return GetFontDescription().LetterSpacing();
 }
 
 bool ComputedStyle::SetFontDescription(const FontDescription& v) {
-  if (style_inherited_data_->font.GetFontDescription() != v) {
-    style_inherited_data_.Access()->font = Font(v);
+  if (inherited_data_->font_.GetFontDescription() != v) {
+    inherited_data_.Access()->font_ = Font(v);
     return true;
   }
   return false;
 }
 
 void ComputedStyle::SetFont(const Font& font) {
-  style_inherited_data_.Access()->font = font;
+  inherited_data_.Access()->font_ = 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 style_inherited_data_->line_height;
+  return inherited_data_->line_height_;
 }
 Length ComputedStyle::LineHeight() const {
-  const Length& lh = style_inherited_data_->line_height;
+  const Length& lh = inherited_data_->line_height_;
   // 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(style_inherited_data_, line_height, specified_line_height);
+  SET_VAR(inherited_data_, line_height_, 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(style_inherited_data_, text_autosizing_multiplier, multiplier);
+  SET_VAR(inherited_data_, text_autosizing_multiplier_, 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 524 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink