Index: third_party/WebKit/Source/core/style/ComputedStyle.h |
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h |
index 7c64b5b52a6a099ea9572aac8dff273cf33c5a3c..221444d69c8ce5ad0b0c6ca7ba2efdf2f60a16a8 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h |
@@ -37,6 +37,7 @@ |
#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" |
@@ -185,6 +186,7 @@ |
// non-inherited attributes |
DataRef<StyleBoxData> box_data_; |
DataRef<StyleVisualData> visual_data_; |
+ DataRef<StyleBackgroundData> background_data_; |
DataRef<StyleRareNonInheritedData> rare_non_inherited_data_; |
// inherited attributes |
@@ -415,21 +417,21 @@ |
// 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. |
@@ -3363,7 +3365,7 @@ |
return background_data_.Access()->background_; |
} |
const FillLayer& BackgroundLayers() const { |
- return background_data_->background_; |
+ return background_data_->Background(); |
} |
void AdjustBackgroundLayers() { |
if (BackgroundLayers().Next()) { |
@@ -3498,9 +3500,7 @@ |
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(); |
} |