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 3b4017542939f1c02322e8aff0c8ca067b6ba86e..3ebd030233fde97ad41fc2e21ef4435d95782466 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp |
@@ -138,7 +138,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle() |
rare_non_inherited_data_.Access()->grid_.Init(); |
rare_non_inherited_data_.Access()->grid_item_.Init(); |
rare_non_inherited_data_.Access()->scroll_snap_.Init(); |
- rare_inherited_data_.Init(); |
svg_style_.Init(); |
} |
@@ -146,7 +145,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o) |
: ComputedStyleBase(o), |
RefCounted<ComputedStyle>(), |
rare_non_inherited_data_(o.rare_non_inherited_data_), |
- rare_inherited_data_(o.rare_inherited_data_), |
svg_style_(o.svg_style_) {} |
static StyleRecalcChange DiffPseudoStyles(const ComputedStyle& old_style, |
@@ -322,7 +320,6 @@ void ComputedStyle::InheritFrom(const ComputedStyle& inherit_parent, |
EUserModify current_user_modify = UserModify(); |
ComputedStyleBase::InheritFrom(inherit_parent, is_at_shadow_boundary); |
- rare_inherited_data_ = inherit_parent.rare_inherited_data_; |
if (svg_style_ != inherit_parent.svg_style_) |
svg_style_.Access()->InheritFrom(inherit_parent.svg_style_.Get()); |
@@ -462,8 +459,7 @@ bool ComputedStyle::IndependentInheritedEqual( |
bool ComputedStyle::NonIndependentInheritedEqual( |
const ComputedStyle& other) const { |
return ComputedStyleBase::NonIndependentInheritedEqual(other) && |
- svg_style_->InheritedEqual(*other.svg_style_) && |
- rare_inherited_data_ == other.rare_inherited_data_; |
+ svg_style_->InheritedEqual(*other.svg_style_); |
} |
bool ComputedStyle::LoadingCustomFontsEqual(const ComputedStyle& other) const { |
@@ -480,8 +476,7 @@ bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const { |
bool ComputedStyle::InheritedDataShared(const ComputedStyle& other) const { |
// This is a fast check that only looks if the data structures are shared. |
return ComputedStyleBase::InheritedDataShared(other) && |
- svg_style_.Get() == other.svg_style_.Get() && |
- rare_inherited_data_.Get() == other.rare_inherited_data_.Get(); |
+ svg_style_.Get() == other.svg_style_.Get(); |
} |
static bool DependenceOnContentHeightHasChanged(const ComputedStyle& a, |