Give consistent names to subgroups of 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 96 matching lines @@
   new_style->SetDisplay(display);
   return new_style;
 }
 
 PassRefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) {
   return AdoptRef(new ComputedStyle(other));
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle()
     : ComputedStyleBase(), RefCounted<ComputedStyle>() {
-  box_.Init();
-  visual_.Init();
-  background_.Init();
-  surround_.Init();
+  box_data_.Init();
+  visual_data_.Init();
+  background_data_.Init();
+  surround_data_.Init();
   rare_non_inherited_data_.Init();
   rare_non_inherited_data_.Access()->deprecated_flexible_box_.Init();
   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();
   svg_style_.Init();
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
     : ComputedStyleBase(o),
       RefCounted<ComputedStyle>(),
-      box_(o.box_),
-      visual_(o.visual_),
-      background_(o.background_),
-      surround_(o.surround_),
+      box_data_(o.box_data_),
+      visual_data_(o.visual_data_),
+      background_data_(o.background_data_),
+      surround_data_(o.surround_data_),
       rare_non_inherited_data_(o.rare_non_inherited_data_),
       rare_inherited_data_(o.rare_inherited_data_),
       style_inherited_data_(o.style_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())
@@ skipping 172 matching lines @@
   } else {
     rare_inherited_data_ = inherit_parent.rare_inherited_data_;
   }
   style_inherited_data_ = inherit_parent.style_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_ = other.box_;
-  visual_ = other.visual_;
-  background_ = other.background_;
-  surround_ = other.surround_;
+  box_data_ = other.box_data_;
+  visual_data_ = other.visual_data_;
+  background_data_ = other.background_data_;
+  surround_data_ = other.surround_data_;
   rare_non_inherited_data_ = other.rare_non_inherited_data_;
 
   // The flags are copied one-by-one because they contain
   // bunch of stuff other than real style data.
   // See comments for each skipped flag below.
 
   // These are not generated in ComputedStyleBase
   SetOriginalDisplay(other.OriginalDisplay());
   SetVerticalAlign(other.VerticalAlign());
   SetHasViewportUnits(other.HasViewportUnits());
@@ skipping 125 matching lines @@
   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_ == other.box_ &&
-         visual_ == other.visual_ && background_ == other.background_ &&
-         surround_ == other.surround_ &&
+         box_data_ == other.box_data_ &&
+         visual_data_ == other.visual_data_ &&
+         background_data_ == other.background_data_ &&
+         surround_data_ == other.surround_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() &&
          svg_style_.Get() == other.svg_style_.Get() &&
@@ skipping 73 matching lines @@
 
   return diff;
 }
 
 bool ComputedStyle::ScrollAnchorDisablingPropertyChanged(
     const ComputedStyle& other,
     const StyleDifference& diff) const {
   if (GetPosition() != other.GetPosition())
     return true;
 
-  if (box_.Get() != other.box_.Get()) {
-    if (box_->Width() != other.box_->Width() ||
-        box_->MinWidth() != other.box_->MinWidth() ||
-        box_->MaxWidth() != other.box_->MaxWidth() ||
-        box_->Height() != other.box_->Height() ||
-        box_->MinHeight() != other.box_->MinHeight() ||
-        box_->MaxHeight() != other.box_->MaxHeight())
+  if (box_data_.Get() != other.box_data_.Get()) {
+    if (box_data_->Width() != other.box_data_->Width() ||
+        box_data_->MinWidth() != other.box_data_->MinWidth() ||
+        box_data_->MaxWidth() != other.box_data_->MaxWidth() ||
+        box_data_->Height() != other.box_data_->Height() ||
+        box_data_->MinHeight() != other.box_data_->MinHeight() ||
+        box_data_->MaxHeight() != other.box_data_->MaxHeight())
       return true;
   }
 
-  if (surround_.Get() != other.surround_.Get()) {
+  if (surround_data_.Get() != other.surround_data_.Get()) {
     if (!MarginEqual(other) || !OffsetEqual(other) || !PaddingEqual(other))
       return true;
   }
 
   if (diff.TransformChanged())
     return true;
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayoutAndPaintInvalidation(
     const ComputedStyle& other) const {
   // FIXME: Not all cases in this method need both full layout and paint
   // invalidation.
   // Should move cases into DiffNeedsFullLayout() if
   // - don't need paint invalidation at all;
   // - or the layoutObject knows how to exactly invalidate paints caused by the
   //   layout change instead of forced full paint invalidation.
 
-  if (surround_.Get() != other.surround_.Get()) {
+  if (surround_data_.Get() != other.surround_data_.Get()) {
     // If our border widths change, then we need to layout. Other changes to
     // borders only necessitate a paint invalidation.
     if (BorderLeftWidth() != other.BorderLeftWidth() ||
         BorderTopWidth() != other.BorderTopWidth() ||
         BorderBottomWidth() != other.BorderBottomWidth() ||
         BorderRightWidth() != other.BorderRightWidth())
       return true;
 
     if (!PaddingEqual(other))
       return true;
@@ skipping 210 matching lines @@
       other.HasPseudoStyle(kPseudoIdScrollbar))
     return true;
 
   // Movement of non-static-positioned object is special cased in
   // ComputedStyle::VisualInvalidationDiff().
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsFullLayout(const ComputedStyle& other) const {
-  if (box_.Get() != other.box_.Get()) {
-    if (box_->Width() != other.box_->Width() ||
-        box_->MinWidth() != other.box_->MinWidth() ||
-        box_->MaxWidth() != other.box_->MaxWidth() ||
-        box_->Height() != other.box_->Height() ||
-        box_->MinHeight() != other.box_->MinHeight() ||
-        box_->MaxHeight() != other.box_->MaxHeight())
+  if (box_data_.Get() != other.box_data_.Get()) {
+    if (box_data_->Width() != other.box_data_->Width() ||
+        box_data_->MinWidth() != other.box_data_->MinWidth() ||
+        box_data_->MaxWidth() != other.box_data_->MaxWidth() ||
+        box_data_->Height() != other.box_data_->Height() ||
+        box_data_->MinHeight() != other.box_data_->MinHeight() ||
+        box_data_->MaxHeight() != other.box_data_->MaxHeight())
       return true;
 
-    if (box_->VerticalAlign() != other.box_->VerticalAlign())
+    if (box_data_->VerticalAlign() != other.box_data_->VerticalAlign())
       return true;
 
-    if (box_->BoxSizing() != other.box_->BoxSizing())
+    if (box_data_->BoxSizing() != other.box_data_->BoxSizing())
       return true;
   }
 
   if (VerticalAlign() != other.VerticalAlign() ||
       GetPosition() != other.GetPosition())
     return true;
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     if (rare_non_inherited_data_->align_content_ !=
             other.rare_non_inherited_data_->align_content_ ||
@@ skipping 33 matching lines @@
 
   return false;
 }
 
 bool ComputedStyle::DiffNeedsPaintInvalidationObject(
     const ComputedStyle& other) const {
   if (Visibility() != other.Visibility() ||
       PrintColorAdjust() != other.PrintColorAdjust() ||
       InsideLink() != other.InsideLink() ||
       !Border().VisuallyEqual(other.Border()) ||
-      *background_ != *other.background_)
+      *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 ||
         rare_inherited_data_->image_rendering_ !=
             other.rare_inherited_data_->image_rendering_)
       return true;
@@ skipping 85 matching lines @@
   // Need to update visual rect of the resizer.
   if (Resize() != other.Resize())
     return true;
 
   return false;
 }
 
 void ComputedStyle::UpdatePropertySpecificDifferences(
     const ComputedStyle& other,
     StyleDifference& diff) const {
-  if (box_->ZIndex() != other.box_->ZIndex() ||
+  if (box_data_->ZIndex() != other.box_data_->ZIndex() ||
       IsStackingContext() != other.IsStackingContext())
     diff.SetZIndexChanged();
 
   if (rare_non_inherited_data_.Get() != other.rare_non_inherited_data_.Get()) {
     // It's possible for the old and new style transform data to be equivalent
     // while hasTransform() differs, as it checks a number of conditions aside
     // from just the matrix, including but not limited to animation state.
     if (HasTransform() != other.HasTransform() ||
         !TransformDataEquivalent(other) ||
         rare_non_inherited_data_->perspective_ !=
@@ skipping 28 matching lines @@
   }
 
   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 ||
         HasSimpleUnderlineInternal() != other.HasSimpleUnderlineInternal() ||
-        visual_->text_decoration != other.visual_->text_decoration) {
+        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_ !=
                     other.rare_non_inherited_data_
                         ->visited_link_text_decoration_color_)) {
@@ skipping 21 matching lines @@
                 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_->has_auto_clip;
+  bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip;
   bool other_has_clip =
-      other.HasOutOfFlowPosition() && !other.visual_->has_auto_clip;
+      other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip;
   if (has_clip != other_has_clip ||
-      (has_clip && visual_->clip != other.visual_->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);
 }
@@ skipping 1265 matching lines @@
       NinePieceImage::ComputeOutset(image.Outset().Top(), BorderTopWidth()),
       NinePieceImage::ComputeOutset(image.Outset().Right(), BorderRightWidth()),
       NinePieceImage::ComputeOutset(image.Outset().Bottom(),
                                     BorderBottomWidth()),
       NinePieceImage::ComputeOutset(image.Outset().Left(), BorderLeftWidth()));
 }
 
 void ComputedStyle::SetBorderImageSource(StyleImage* image) {
   if (Border().image_.GetImage() == image)
     return;
-  surround_.Access()->border_.image_.SetImage(image);
+  surround_data_.Access()->border_.image_.SetImage(image);
 }
 
 void ComputedStyle::SetBorderImageSlices(const LengthBox& slices) {
   if (Border().image_.ImageSlices() == slices)
     return;
-  surround_.Access()->border_.image_.SetImageSlices(slices);
+  surround_data_.Access()->border_.image_.SetImageSlices(slices);
 }
 
 void ComputedStyle::SetBorderImageSlicesFill(bool fill) {
   if (Border().image_.Fill() == fill)
     return;
-  surround_.Access()->border_.image_.SetFill(fill);
+  surround_data_.Access()->border_.image_.SetFill(fill);
 }
 
 void ComputedStyle::SetBorderImageWidth(const BorderImageLengthBox& slices) {
   if (Border().image_.BorderSlices() == slices)
     return;
-  surround_.Access()->border_.image_.SetBorderSlices(slices);
+  surround_data_.Access()->border_.image_.SetBorderSlices(slices);
 }
 
 void ComputedStyle::SetBorderImageOutset(const BorderImageLengthBox& outset) {
   if (Border().image_.Outset() == outset)
     return;
-  surround_.Access()->border_.image_.SetOutset(outset);
+  surround_data_.Access()->border_.image_.SetOutset(outset);
 }
 
 bool ComputedStyle::BorderObscuresBackground() const {
   if (!HasBorder())
     return false;
 
   // Bail if we have any border-image for now. We could look at the image alpha
   // to improve this.
   if (BorderImage().GetImage())
     return false;
@@ skipping 73 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink