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

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

Issue 2786883002: Generate subgroup StyleSurroundData in ComputedStyle. (Closed)
Patch Set: Fix things Created 3 years, 8 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
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 e62168104424eef3b4739ca41bcbf003abce0b94..7449ddcf18b54911051f03bea4cf11a9affaec1a 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -117,7 +117,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle()
box_.Init();
visual_.Init();
background_.Init();
- surround_.Init();
rare_non_inherited_data_.Init();
rare_non_inherited_data_.Access()->deprecated_flexible_box_.Init();
rare_non_inherited_data_.Access()->flexible_box_.Init();
@@ -140,7 +139,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
box_(o.box_),
visual_(o.visual_),
background_(o.background_),
- surround_(o.surround_),
rare_non_inherited_data_(o.rare_non_inherited_data_),
rare_inherited_data_(o.rare_inherited_data_),
style_inherited_data_(o.style_inherited_data_),
@@ -336,7 +334,6 @@ void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
box_ = other.box_;
visual_ = other.visual_;
background_ = other.background_;
- surround_ = other.surround_;
rare_non_inherited_data_ = other.rare_non_inherited_data_;
// The flags are copied one-by-one because they contain
@@ -484,7 +481,6 @@ bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const {
other.VerticalAlign() && // Not generated in ComputedStyleBase
box_ == other.box_ &&
visual_ == other.visual_ && background_ == other.background_ &&
- surround_ == other.surround_ &&
rare_non_inherited_data_ == other.rare_non_inherited_data_ &&
svg_style_->NonInheritedEqual(*other.svg_style_);
}

Powered by Google App Engine
This is Rietveld 408576698