Revert of Generate StyleBackgroundData in ComputedStyleBase.

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 19 matching lines @@
 #include "core/CSSPropertyNames.h"
 #include "core/ComputedStyleBase.h"
 #include "core/CoreExport.h"
 #include "core/style/BorderValue.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "core/style/CounterDirectives.h"
 #include "core/style/DataRef.h"
 #include "core/style/LineClampValue.h"
 #include "core/style/NinePieceImage.h"
 #include "core/style/SVGComputedStyle.h"
+#include "core/style/StyleBackgroundData.h"
 #include "core/style/StyleBoxData.h"
 #include "core/style/StyleContentAlignmentData.h"
 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
 #include "core/style/StyleDifference.h"
 #include "core/style/StyleFilterData.h"
 #include "core/style/StyleFlexibleBoxData.h"
 #include "core/style/StyleGridData.h"
 #include "core/style/StyleGridItemData.h"
 #include "core/style/StyleInheritedData.h"
 #include "core/style/StyleMultiColData.h"
@@ skipping 128 matching lines @@
   friend class CSSToStyleMap;
   friend class FilterOperationResolver;
   friend class StyleBuilderConverter;
   friend class StyleResolverState;
   friend class StyleResolver;
 
  protected:
   // non-inherited attributes
   DataRef<StyleBoxData> box_data_;
   DataRef<StyleVisualData> visual_data_;
+  DataRef<StyleBackgroundData> background_data_;
   DataRef<StyleRareNonInheritedData> rare_non_inherited_data_;
 
   // inherited attributes
   DataRef<StyleRareInheritedData> rare_inherited_data_;
   DataRef<StyleInheritedData> style_inherited_data_;
 
   // list of associated pseudo styles
   std::unique_ptr<PseudoStyleCache> cached_pseudo_styles_;
 
   DataRef<SVGComputedStyle> svg_style_;
@@ skipping 210 matching lines @@
         rare_non_inherited_data_->backface_visibility_);
   }
   void SetBackfaceVisibility(EBackfaceVisibility b) {
     SET_VAR(rare_non_inherited_data_, backface_visibility_, b);
   }
 
   // Background properties.
   // background-color
   static Color InitialBackgroundColor() { return Color::kTransparent; }
   void SetBackgroundColor(const StyleColor& v) {
-    SET_VAR(background_data_, background_color_, v);
+    SET_VAR(background_data_, color_, v);
   }
 
   // background-image
   bool HasBackgroundImage() const {
-    return background_data_->background_.HasImage();
+    return background_data_->Background().HasImage();
   }
   bool HasFixedBackgroundImage() const {
-    return background_data_->background_.HasFixedImage();
+    return background_data_->Background().HasFixedImage();
   }
   bool HasEntirelyFixedBackground() const;
 
   // background-clip
   EFillBox BackgroundClip() const {
-    return static_cast<EFillBox>(background_data_->background_.Clip());
+    return static_cast<EFillBox>(background_data_->Background().Clip());
   }
 
   // Border properties.
   // -webkit-border-image
   static NinePieceImage InitialNinePieceImage() { return NinePieceImage(); }
   const NinePieceImage& BorderImage() const {
     return surround_data_->border_.GetImage();
   }
   void SetBorderImage(const NinePieceImage& b) {
     SET_VAR(surround_data_, border_.image_, b);
@@ skipping 2913 matching lines @@
   bool HasBoxDecorationBackground() const {
     return HasBackground() || HasBorderDecoration() || HasAppearance() ||
            BoxShadow();
   }
 
   // Background utility functions.
   FillLayer& AccessBackgroundLayers() {
     return background_data_.Access()->background_;
   }
   const FillLayer& BackgroundLayers() const {
-    return background_data_->background_;
+    return background_data_->Background();
   }
   void AdjustBackgroundLayers() {
     if (BackgroundLayers().Next()) {
       AccessBackgroundLayers().CullEmptyLayers();
       AccessBackgroundLayers().FillUnsetProperties();
     }
   }
   bool HasBackgroundRelatedColorReferencingCurrentColor() const {
     if (BackgroundColor().IsCurrentColor() ||
         VisitedLinkBackgroundColor().IsCurrentColor())
@@ skipping 114 matching lines @@
   }
   StyleColor BorderRightColor() const {
     return surround_data_->border_.Right().GetColor();
   }
   StyleColor BorderTopColor() const {
     return surround_data_->border_.Top().GetColor();
   }
   StyleColor BorderBottomColor() const {
     return surround_data_->border_.Bottom().GetColor();
   }
-  StyleColor BackgroundColor() const {
-    return background_data_->background_color_;
-  }
+  StyleColor BackgroundColor() const { return background_data_->GetColor(); }
   StyleAutoColor CaretColor() const {
     return rare_inherited_data_->CaretColor();
   }
   Color GetColor() const;
   StyleColor ColumnRuleColor() const {
     return rare_non_inherited_data_->multi_col_->rule_.GetColor();
   }
   StyleColor OutlineColor() const {
     return rare_non_inherited_data_->outline_.GetColor();
   }
@@ skipping 176 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h