Index: third_party/WebKit/Source/core/style/ComputedStyle.h |
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h |
index c9d7d779a46a127bb172985f3541507bd10c2fed..6ff0d44f7d69962b2e143d2ff90739c53f87323f 100644 |
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h |
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h |
@@ -37,6 +37,7 @@ |
#include "core/style/AppliedTextDecorationList.h" |
#include "core/style/BorderValue.h" |
#include "core/style/ComputedStyleConstants.h" |
+#include "core/style/ContentData.h" |
#include "core/style/CounterDirectives.h" |
#include "core/style/CursorData.h" |
#include "core/style/CursorList.h" |
@@ -556,6 +557,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
return rare_non_inherited_data_->box_shadow_.Get(); |
} |
void SetBoxShadow(RefPtr<ShadowList>); |
+ bool BoxShadowDataEquivalent(const ComputedStyle& other) const { |
+ return DataEquivalent(BoxShadow(), other.BoxShadow()); |
+ } |
// clip |
static LengthBox InitialClip() { return LengthBox(); } |
@@ -1377,6 +1381,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
return; |
rare_non_inherited_data_.Access()->shape_outside_ = value; |
} |
+ bool ShapeOutsideDataEquivalent(const ComputedStyle& other) const { |
+ return DataEquivalent(ShapeOutside(), other.ShapeOutside()); |
+ } |
// size |
const FloatSize& PageSize() const { |
@@ -1549,6 +1556,9 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
if (rare_non_inherited_data_->clip_path_ != operation) |
rare_non_inherited_data_.Access()->clip_path_ = std::move(operation); |
} |
+ bool ClipPathDataEquivalent(const ComputedStyle& other) const { |
+ return DataEquivalent(ClipPath(), other.ClipPath()); |
+ } |
// Mask properties. |
// -webkit-mask-box-image-outset |
@@ -2277,8 +2287,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
} |
bool HasBoxReflect() const { return BoxReflect(); } |
bool ReflectionDataEquivalent(const ComputedStyle& other) const { |
- return rare_non_inherited_data_->ReflectionDataEquivalent( |
- *other.rare_non_inherited_data_); |
+ return DataEquivalent(BoxReflect(), other.BoxReflect()); |
} |
// Mask utility functions. |
@@ -3058,8 +3067,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase<ComputedStyle>, |
// Content utility functions. |
bool ContentDataEquivalent(const ComputedStyle& other) const { |
- return rare_non_inherited_data_->ContentDataEquivalent( |
- *other.rare_non_inherited_data_); |
+ return DataEquivalent(GetContentData(), other.GetContentData()); |
} |
// Contain utility functions. |