| 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 b5ab770317cabc093a7b0c1be6f5ba91342dfac2..ba02a3849ad153d66217000a32fc18022ac3753b 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -334,6 +334,8 @@ void ComputedStyle::InheritFrom(const ComputedStyle& inherit_parent,
|
| }
|
|
|
| void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
|
| + DCHECK(MatchedPropertiesCache::IsStyleCacheable(other));
|
| +
|
| ComputedStyleBase::CopyNonInheritedFromCached(other);
|
| rare_non_inherited_data_ = other.rare_non_inherited_data_;
|
|
|
| @@ -352,13 +354,6 @@ void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
|
| // Set correctly while computing style for children:
|
| // m_explicitInheritance
|
|
|
| - // unique() styles are not cacheable.
|
| - DCHECK(!other.Unique());
|
| -
|
| - // styles with non inherited properties that reference variables are not
|
| - // cacheable.
|
| - DCHECK(!other.HasVariableReferenceFromNonInheritedProperty());
|
| -
|
| // The following flags are set during matching before we decide that we get a
|
| // match in the MatchedPropertiesCache which in turn calls this method. The
|
| // reason why we don't copy these flags is that they're already correctly set
|
| @@ -380,7 +375,6 @@ void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
|
|
|
| if (svg_style_ != other.svg_style_)
|
| svg_style_.Access()->CopyNonInheritedFromCached(other.svg_style_.Get());
|
| - DCHECK_EQ(Zoom(), InitialZoom());
|
| }
|
|
|
| bool ComputedStyle::operator==(const ComputedStyle& o) const {
|
|
|