Rename members in StyleRareInheritedData.

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 660 matching lines @@
       // correctly on LayoutInlines (we will need to add a
       // selfNeedsSimplifiedLayout bit in order to not get confused and taint
       // every line).  In addition we need to solve the floating object issue
       // when layers come and go. Right now a full layout is necessary to keep
       // floating object lists sane.
       return true;
     }
   }
 
   if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
-    if (rare_inherited_data_->highlight !=
-            other.rare_inherited_data_->highlight ||
-        rare_inherited_data_->indent != other.rare_inherited_data_->indent ||
+    if (rare_inherited_data_->highlight_ !=
+            other.rare_inherited_data_->highlight_ ||
+        rare_inherited_data_->indent_ != other.rare_inherited_data_->indent_ ||
         rare_inherited_data_->text_align_last_ !=
             other.rare_inherited_data_->text_align_last_ ||
         rare_inherited_data_->text_indent_line_ !=
             other.rare_inherited_data_->text_indent_line_ ||
         rare_inherited_data_->effective_zoom_ !=
             other.rare_inherited_data_->effective_zoom_ ||
-        rare_inherited_data_->word_break !=
-            other.rare_inherited_data_->word_break ||
-        rare_inherited_data_->overflow_wrap !=
-            other.rare_inherited_data_->overflow_wrap ||
-        rare_inherited_data_->line_break !=
-            other.rare_inherited_data_->line_break ||
-        rare_inherited_data_->text_security !=
-            other.rare_inherited_data_->text_security ||
-        rare_inherited_data_->hyphens != other.rare_inherited_data_->hyphens ||
-        rare_inherited_data_->hyphenation_limit_before !=
-            other.rare_inherited_data_->hyphenation_limit_before ||
-        rare_inherited_data_->hyphenation_limit_after !=
-            other.rare_inherited_data_->hyphenation_limit_after ||
-        rare_inherited_data_->hyphenation_string !=
-            other.rare_inherited_data_->hyphenation_string ||
+        rare_inherited_data_->word_break_ !=
+            other.rare_inherited_data_->word_break_ ||
+        rare_inherited_data_->overflow_wrap_ !=
+            other.rare_inherited_data_->overflow_wrap_ ||
+        rare_inherited_data_->line_break_ !=
+            other.rare_inherited_data_->line_break_ ||
+        rare_inherited_data_->text_security_ !=
+            other.rare_inherited_data_->text_security_ ||
+        rare_inherited_data_->hyphens_ !=
+            other.rare_inherited_data_->hyphens_ ||
+        rare_inherited_data_->hyphenation_limit_before_ !=
+            other.rare_inherited_data_->hyphenation_limit_before_ ||
+        rare_inherited_data_->hyphenation_limit_after_ !=
+            other.rare_inherited_data_->hyphenation_limit_after_ ||
+        rare_inherited_data_->hyphenation_string_ !=
+            other.rare_inherited_data_->hyphenation_string_ ||
         rare_inherited_data_->respect_image_orientation_ !=
             other.rare_inherited_data_->respect_image_orientation_ ||
         rare_inherited_data_->ruby_position_ !=
             other.rare_inherited_data_->ruby_position_ ||
-        rare_inherited_data_->text_emphasis_mark !=
-            other.rare_inherited_data_->text_emphasis_mark ||
-        rare_inherited_data_->text_emphasis_position !=
-            other.rare_inherited_data_->text_emphasis_position ||
-        rare_inherited_data_->text_emphasis_custom_mark !=
-            other.rare_inherited_data_->text_emphasis_custom_mark ||
+        rare_inherited_data_->text_emphasis_mark_ !=
+            other.rare_inherited_data_->text_emphasis_mark_ ||
+        rare_inherited_data_->text_emphasis_position_ !=
+            other.rare_inherited_data_->text_emphasis_position_ ||
+        rare_inherited_data_->text_emphasis_custom_mark_ !=
+            other.rare_inherited_data_->text_emphasis_custom_mark_ ||
         rare_inherited_data_->text_justify_ !=
             other.rare_inherited_data_->text_justify_ ||
         rare_inherited_data_->text_orientation_ !=
             other.rare_inherited_data_->text_orientation_ ||
         rare_inherited_data_->text_combine_ !=
             other.rare_inherited_data_->text_combine_ ||
         rare_inherited_data_->tab_size_ !=
             other.rare_inherited_data_->tab_size_ ||
         rare_inherited_data_->text_size_adjust_ !=
             other.rare_inherited_data_->text_size_adjust_ ||
-        rare_inherited_data_->list_style_image !=
-            other.rare_inherited_data_->list_style_image ||
+        rare_inherited_data_->list_style_image_ !=
+            other.rare_inherited_data_->list_style_image_ ||
         rare_inherited_data_->line_height_step_ !=
             other.rare_inherited_data_->line_height_step_ ||
-        rare_inherited_data_->text_stroke_width !=
-            other.rare_inherited_data_->text_stroke_width)
+        rare_inherited_data_->text_stroke_width_ !=
+            other.rare_inherited_data_->text_stroke_width_)
       return true;
 
     if (!rare_inherited_data_->ShadowDataEquivalent(
             *other.rare_inherited_data_.Get()))
       return true;
 
     if (!rare_inherited_data_->QuotesDataEquivalent(
             *other.rare_inherited_data_.Get()))
       return true;
   }
@@ skipping 142 matching lines @@
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (Visibility() != other.Visibility() ||
       PrintColorAdjust() != other.PrintColorAdjust() ||
       InsideLink() != other.InsideLink() ||
       !Border().VisuallyEqual(other.Border()) || !RadiiEqual(other) ||
       !BorderSizeEquals(other) || *background_data_ != *other.background_data_)
     return true;
 
   if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get()) {
-    if (rare_inherited_data_->user_modify !=
-            other.rare_inherited_data_->user_modify ||
-        rare_inherited_data_->user_select !=
-            other.rare_inherited_data_->user_select ||
+    if (rare_inherited_data_->user_modify_ !=
+            other.rare_inherited_data_->user_modify_ ||
+        rare_inherited_data_->user_select_ !=
+            other.rare_inherited_data_->user_select_ ||
         rare_inherited_data_->image_rendering_ !=
             other.rare_inherited_data_->image_rendering_)
       return true;
   }
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->user_drag !=
             other.rare_non_inherited_data_->user_drag ||
         rare_non_inherited_data_->object_fit_ !=
             other.rare_non_inherited_data_->object_fit_ ||
@@ skipping 167 matching lines @@
              rare_inherited_data_->TextStrokeColor() !=
                  other.rare_inherited_data_->TextStrokeColor() ||
              rare_inherited_data_->TextEmphasisColor() !=
                  other.rare_inherited_data_->TextEmphasisColor() ||
              rare_inherited_data_->VisitedLinkTextFillColor() !=
                  other.rare_inherited_data_->VisitedLinkTextFillColor() ||
              rare_inherited_data_->VisitedLinkTextStrokeColor() !=
                  other.rare_inherited_data_->VisitedLinkTextStrokeColor() ||
              rare_inherited_data_->VisitedLinkTextEmphasisColor() !=
                  other.rare_inherited_data_->VisitedLinkTextEmphasisColor() ||
-             rare_inherited_data_->text_emphasis_fill !=
-                 other.rare_inherited_data_->text_emphasis_fill ||
+             rare_inherited_data_->text_emphasis_fill_ !=
+                 other.rare_inherited_data_->text_emphasis_fill_ ||
              rare_inherited_data_->text_underline_position_ !=
                  other.rare_inherited_data_->text_underline_position_ ||
              rare_inherited_data_->text_decoration_skip_ !=
                  other.rare_inherited_data_->text_decoration_skip_ ||
-             rare_inherited_data_->applied_text_decorations !=
-                 other.rare_inherited_data_->applied_text_decorations ||
+             rare_inherited_data_->applied_text_decorations_ !=
+                 other.rare_inherited_data_->applied_text_decorations_ ||
              rare_inherited_data_->CaretColor() !=
                  other.rare_inherited_data_->CaretColor() ||
              rare_inherited_data_->VisitedLinkCaretColor() !=
                  other.rare_inherited_data_->VisitedLinkCaretColor())) {
           diff.SetTextDecorationOrColorChanged();
         }
       }
     }
   }
 
   bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_;
   bool other_has_clip =
       other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_;
   if (has_clip != other_has_clip ||
       (has_clip && visual_data_->clip_ != other.visual_data_->clip_))
     diff.SetCSSClipChanged();
 }
 
 void ComputedStyle::AddPaintImage(StyleImage* image) {
   if (!rare_non_inherited_data_.Access()->paint_images_) {
     rare_non_inherited_data_.Access()->paint_images_ =
         WTF::MakeUnique<Vector<Persistent<StyleImage>>>();
   }
   rare_non_inherited_data_.Access()->paint_images_->push_back(image);
 }
 
 void ComputedStyle::AddCursor(StyleImage* image,
                               bool hot_spot_specified,
                               const IntPoint& hot_spot) {
-  if (!rare_inherited_data_.Access()->cursor_data)
-    rare_inherited_data_.Access()->cursor_data = new CursorList;
-  rare_inherited_data_.Access()->cursor_data->push_back(
+  if (!rare_inherited_data_.Access()->cursor_data_)
+    rare_inherited_data_.Access()->cursor_data_ = new CursorList;
+  rare_inherited_data_.Access()->cursor_data_->push_back(
       CursorData(image, hot_spot_specified, hot_spot));
 }
 
 void ComputedStyle::SetCursorList(CursorList* other) {
-  rare_inherited_data_.Access()->cursor_data = other;
+  rare_inherited_data_.Access()->cursor_data_ = other;
 }
 
 void ComputedStyle::SetQuotes(PassRefPtr<QuotesData> q) {
-  rare_inherited_data_.Access()->quotes = std::move(q);
+  rare_inherited_data_.Access()->quotes_ = std::move(q);
 }
 
 void ComputedStyle::ClearCursorList() {
-  if (rare_inherited_data_->cursor_data)
-    rare_inherited_data_.Access()->cursor_data = nullptr;
+  if (rare_inherited_data_->cursor_data_)
+    rare_inherited_data_.Access()->cursor_data_ = nullptr;
 }
 
 static bool HasPropertyThatCreatesStackingContext(
     const Vector<CSSPropertyID>& properties) {
   for (CSSPropertyID property : properties) {
     switch (property) {
       case CSSPropertyOpacity:
       case CSSPropertyTransform:
       case CSSPropertyAliasWebkitTransform:
       case CSSPropertyTransformStyle:
@@ skipping 239 matching lines @@
   transform.Translate(point.X() - origin_x + origin_shift_x,
                       point.Y() - origin_y + origin_shift_y);
   transform.Rotate(angle + motion_data.rotation_.angle);
 
   if (position.X() != Length(kAuto) || anchor.X() != Length(kAuto))
     // Shift the origin back to transform-origin.
     transform.Translate(-origin_shift_x, -origin_shift_y);
 }
 
 void ComputedStyle::SetTextShadow(PassRefPtr<ShadowList> s) {
-  rare_inherited_data_.Access()->text_shadow = std::move(s);
+  rare_inherited_data_.Access()->text_shadow_ = std::move(s);
 }
 
 void ComputedStyle::SetBoxShadow(PassRefPtr<ShadowList> s) {
   rare_non_inherited_data_.Access()->box_shadow_ = std::move(s);
 }
 
 static FloatRoundedRect::Radii CalcRadiiFor(const BorderData& border,
                                             const LengthSize& top_left,
                                             const LengthSize& top_right,
                                             const LengthSize& bottom_left,
                                             const LengthSize& bottom_right,
                                             LayoutSize size) {
   return FloatRoundedRect::Radii(
       FloatSize(
           FloatValueForLength(top_left.Width(), size.Width().ToFloat()),
           FloatValueForLength(top_left.Height(), size.Height().ToFloat())),
       FloatSize(
           FloatValueForLength(top_right.Width(), size.Width().ToFloat()),
           FloatValueForLength(top_right.Height(), size.Height().ToFloat())),
       FloatSize(
           FloatValueForLength(bottom_left.Width(), size.Width().ToFloat()),
           FloatValueForLength(bottom_left.Height(), size.Height().ToFloat())),
       FloatSize(
           FloatValueForLength(bottom_right.Width(), size.Width().ToFloat()),
           FloatValueForLength(bottom_right.Height(), size.Height().ToFloat())));
 }
 
 StyleImage* ComputedStyle::ListStyleImage() const {
-  return rare_inherited_data_->list_style_image.Get();
+  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;
+  if (rare_inherited_data_->list_style_image_ != v)
+    rare_inherited_data_.Access()->list_style_image_ = v;
 }
 
 Color ComputedStyle::GetColor() const {
   return inherited_data_->color_;
 }
 Color ComputedStyle::VisitedLinkColor() const {
   return inherited_data_->visited_link_color_;
 }
 void ComputedStyle::SetColor(const Color& v) {
   SET_VAR(inherited_data_, color_, v);
@@ skipping 164 matching lines @@
 }
 
 Hyphenation* ComputedStyle::GetHyphenation() const {
   return GetHyphens() == kHyphensAuto
              ? GetFontDescription().LocaleOrDefault().GetHyphenation()
              : nullptr;
 }
 
 const AtomicString& ComputedStyle::HyphenString() const {
   const AtomicString& hyphenation_string =
-      rare_inherited_data_.Get()->hyphenation_string;
+      rare_inherited_data_.Get()->hyphenation_string_;
   if (!hyphenation_string.IsNull())
     return hyphenation_string;
 
   // FIXME: This should depend on locale.
   DEFINE_STATIC_LOCAL(AtomicString, hyphen_minus_string,
                       (&kHyphenMinusCharacter, 1));
   DEFINE_STATIC_LOCAL(AtomicString, hyphen_string, (&kHyphenCharacter, 1));
   const SimpleFontData* primary_font = GetFont().PrimaryFont();
   DCHECK(primary_font);
   return primary_font && primary_font->GlyphForCharacter(kHyphenCharacter)
@@ skipping 101 matching lines @@
 FontWeight ComputedStyle::GetFontWeight() const {
   return GetFontDescription().Weight();
 }
 FontStretch ComputedStyle::GetFontStretch() const {
   return GetFontDescription().Stretch();
 }
 
 TextDecoration ComputedStyle::TextDecorationsInEffect() const {
   if (HasSimpleUnderlineInternal())
     return kTextDecorationUnderline;
-  if (!rare_inherited_data_->applied_text_decorations)
+  if (!rare_inherited_data_->applied_text_decorations_)
     return kTextDecorationNone;
 
   int decorations = 0;
 
   const Vector<AppliedTextDecoration>& applied = AppliedTextDecorations();
 
   for (size_t i = 0; i < applied.size(); ++i)
     decorations |= applied[i].Lines();
 
   return static_cast<TextDecoration>(decorations);
 }
 
 const Vector<AppliedTextDecoration>& ComputedStyle::AppliedTextDecorations()
     const {
   if (HasSimpleUnderlineInternal()) {
     DEFINE_STATIC_LOCAL(
         Vector<AppliedTextDecoration>, underline,
         (1, AppliedTextDecoration(
                 kTextDecorationUnderline, kTextDecorationStyleSolid,
                 VisitedDependentColor(CSSPropertyTextDecorationColor))));
     // Since we only have one of these in memory, just update the color before
     // returning.
     underline.at(0).SetColor(
         VisitedDependentColor(CSSPropertyTextDecorationColor));
     return underline;
   }
-  if (!rare_inherited_data_->applied_text_decorations) {
+  if (!rare_inherited_data_->applied_text_decorations_) {
     DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, empty, ());
     return empty;
   }
 
-  return rare_inherited_data_->applied_text_decorations->GetVector();
+  return rare_inherited_data_->applied_text_decorations_->GetVector();
 }
 
 StyleInheritedVariables* ComputedStyle::InheritedVariables() const {
-  return rare_inherited_data_->variables.Get();
+  return rare_inherited_data_->variables_.Get();
 }
 
 StyleNonInheritedVariables* ComputedStyle::NonInheritedVariables() const {
   return rare_non_inherited_data_->variables_.get();
 }
 
 StyleInheritedVariables& ComputedStyle::MutableInheritedVariables() {
   RefPtr<StyleInheritedVariables>& variables =
-      rare_inherited_data_.Access()->variables;
+      rare_inherited_data_.Access()->variables_;
   if (!variables)
     variables = StyleInheritedVariables::Create();
   else if (!variables->HasOneRef())
     variables = variables->Copy();
   return *variables;
 }
 
 StyleNonInheritedVariables& ComputedStyle::MutableNonInheritedVariables() {
   std::unique_ptr<StyleNonInheritedVariables>& variables =
       rare_non_inherited_data_.Access()->variables_;
@@ skipping 212 matching lines @@
       TextAutosizer::ComputeAutosizedFontSize(size, multiplier);
   desc.SetComputedSize(std::min(kMaximumAllowedFontSize, autosized_font_size));
 
   SetFontDescription(desc);
   GetFont().Update(current_font_selector);
 }
 
 void ComputedStyle::AddAppliedTextDecoration(
     const AppliedTextDecoration& decoration) {
   RefPtr<AppliedTextDecorationList>& list =
-      rare_inherited_data_.Access()->applied_text_decorations;
+      rare_inherited_data_.Access()->applied_text_decorations_;
 
   if (!list)
     list = AppliedTextDecorationList::Create();
   else if (!list->HasOneRef())
     list = list->Copy();
 
   list->push_back(decoration);
 }
 
 void ComputedStyle::OverrideTextDecorationColors(Color override_color) {
   RefPtr<AppliedTextDecorationList>& list =
-      rare_inherited_data_.Access()->applied_text_decorations;
+      rare_inherited_data_.Access()->applied_text_decorations_;
   DCHECK(list);
   if (!list->HasOneRef())
     list = list->Copy();
 
   for (size_t i = 0; i < list->size(); ++i)
     list->at(i).SetColor(override_color);
 }
 
 void ComputedStyle::ApplyTextDecorations(
     const Color& parent_text_decoration_color,
     bool override_existing_colors) {
   if (GetTextDecoration() == kTextDecorationNone &&
       !HasSimpleUnderlineInternal() &&
-      !rare_inherited_data_->applied_text_decorations)
+      !rare_inherited_data_->applied_text_decorations_)
     return;
 
   // If there are any color changes or decorations set by this element, stop
   // using m_hasSimpleUnderline.
   Color current_text_decoration_color =
       VisitedDependentColor(CSSPropertyTextDecorationColor);
   if (HasSimpleUnderlineInternal() &&
       (GetTextDecoration() != kTextDecorationNone ||
        current_text_decoration_color != parent_text_decoration_color)) {
     SetHasSimpleUnderlineInternal(false);
     AddAppliedTextDecoration(AppliedTextDecoration(
         kTextDecorationUnderline, kTextDecorationStyleSolid,
         parent_text_decoration_color));
   }
   if (override_existing_colors &&
-      rare_inherited_data_->applied_text_decorations)
+      rare_inherited_data_->applied_text_decorations_)
     OverrideTextDecorationColors(current_text_decoration_color);
   if (GetTextDecoration() == kTextDecorationNone)
     return;
   DCHECK(!HasSimpleUnderlineInternal());
   // To save memory, we don't use AppliedTextDecoration objects in the common
   // case of a single simple underline of currentColor.
   TextDecoration decoration_lines = GetTextDecoration();
   TextDecorationStyle decoration_style = GetTextDecorationStyle();
   bool is_simple_underline = decoration_lines == kTextDecorationUnderline &&
                              decoration_style == kTextDecorationStyleSolid &&
                              TextDecorationColor().IsCurrentColor();
-  if (is_simple_underline && !rare_inherited_data_->applied_text_decorations) {
+  if (is_simple_underline && !rare_inherited_data_->applied_text_decorations_) {
     SetHasSimpleUnderlineInternal(true);
     return;
   }
 
   AddAppliedTextDecoration(AppliedTextDecoration(
       decoration_lines, decoration_style, current_text_decoration_color));
 }
 
 void ComputedStyle::ClearAppliedTextDecorations() {
   SetHasSimpleUnderlineInternal(false);
 
-  if (rare_inherited_data_->applied_text_decorations)
-    rare_inherited_data_.Access()->applied_text_decorations = nullptr;
+  if (rare_inherited_data_->applied_text_decorations_)
+    rare_inherited_data_.Access()->applied_text_decorations_ = nullptr;
 }
 
 void ComputedStyle::RestoreParentTextDecorations(
     const ComputedStyle& parent_style) {
   SetHasSimpleUnderlineInternal(parent_style.HasSimpleUnderlineInternal());
-  if (rare_inherited_data_->applied_text_decorations !=
-      parent_style.rare_inherited_data_->applied_text_decorations)
-    rare_inherited_data_.Access()->applied_text_decorations =
-        parent_style.rare_inherited_data_->applied_text_decorations;
+  if (rare_inherited_data_->applied_text_decorations_ !=
+      parent_style.rare_inherited_data_->applied_text_decorations_) {
+    rare_inherited_data_.Access()->applied_text_decorations_ =
+        parent_style.rare_inherited_data_->applied_text_decorations_;
+  }
 }
 
 void ComputedStyle::ClearMultiCol() {
   rare_non_inherited_data_.Access()->multi_col_ = nullptr;
   rare_non_inherited_data_.Access()->multi_col_.Init();
 }
 
 StyleColor ComputedStyle::DecorationColorIncludingFallback(
     bool visited_link) const {
   StyleColor style_color =
@@ skipping 265 matching lines @@
 bool ComputedStyle::ColumnRuleEquivalent(
     const ComputedStyle* other_style) const {
   return ColumnRuleStyle() == other_style->ColumnRuleStyle() &&
          ColumnRuleWidth() == other_style->ColumnRuleWidth() &&
          VisitedDependentColor(CSSPropertyColumnRuleColor) ==
              other_style->VisitedDependentColor(CSSPropertyColumnRuleColor);
 }
 
 TextEmphasisMark ComputedStyle::GetTextEmphasisMark() const {
   TextEmphasisMark mark =
-      static_cast<TextEmphasisMark>(rare_inherited_data_->text_emphasis_mark);
+      static_cast<TextEmphasisMark>(rare_inherited_data_->text_emphasis_mark_);
   if (mark != kTextEmphasisMarkAuto)
     return mark;
 
   if (IsHorizontalWritingMode())
     return kTextEmphasisMarkDot;
 
   return kTextEmphasisMarkSesame;
 }
 
 Color ComputedStyle::InitialTapHighlightColor() {
@@ skipping 136 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink