Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2869633002: (DO NOT LAND) Revert of Generate StyleBackgroundData in ComputedStyleBase. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 7c4e644cc623f5a4e0cfb0eab6db8e0dfbc34ac9..8440e967d80a6c07f217756695667f63a1db1455 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -116,6 +116,7 @@
: 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();
@@ -137,6 +138,7 @@
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_),
@@ -331,6 +333,7 @@
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
@@ -472,6 +475,7 @@
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_);
}
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698