| 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 6864f7d5337cd7d43f4b1c7923ccb44aec98803c..2fa033db5432a20938b2671dcaa246f17912a2e5 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_data_.Init();
|
| visual_data_.Init();
|
| background_data_.Init();
|
| - surround_data_.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_data_(o.box_data_),
|
| visual_data_(o.visual_data_),
|
| background_data_(o.background_data_),
|
| - surround_data_(o.surround_data_),
|
| 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_data_ = other.box_data_;
|
| visual_data_ = other.visual_data_;
|
| background_data_ = other.background_data_;
|
| - surround_data_ = other.surround_data_;
|
| rare_non_inherited_data_ = other.rare_non_inherited_data_;
|
|
|
| // The flags are copied one-by-one because they contain
|
| @@ -485,7 +482,6 @@ bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const {
|
| box_data_ == other.box_data_ &&
|
| visual_data_ == other.visual_data_ &&
|
| background_data_ == other.background_data_ &&
|
| - surround_data_ == other.surround_data_ &&
|
| rare_non_inherited_data_ == other.rare_non_inherited_data_ &&
|
| svg_style_->NonInheritedEqual(*other.svg_style_);
|
| }
|
|
|