(DO NOT LAND) Revert of Generate StyleBackgroundData in ComputedStyleBase.

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 98 matching lines @@
 }
 
 PassRefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) {
   return AdoptRef(new ComputedStyle(other));
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle()
     : ComputedStyleBase(), RefCounted<ComputedStyle>() {
   box_data_.Init();
   visual_data_.Init();
+  background_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();
   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_),
       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())
@@ skipping 174 matching lines @@
   }
   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_;
 
   // 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
   SetHasViewportUnits(other.HasViewportUnits());
   SetHasRemUnitsInternal(other.HasRemUnits());
 
@@ skipping 121 matching lines @@
 
 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) &&
          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) &&
          inherited_data_.Get() == other.inherited_data_.Get() &&
          svg_style_.Get() == other.svg_style_.Get() &&
@@ skipping 2005 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink