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

Unified Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 669093002: RenderStyle operator== incorrect for shape-outside and clip-path. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/StyleRareNonInheritedData.cpp
diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
index b48bb00fb9199a15bead70a5be5f03355af3487f..b07bf9ec4b18c0b7cf6692ddad8d952147bbf7a1 100644
--- a/Source/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -204,10 +204,10 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_mask == o.m_mask
&& m_maskBoxImage == o.m_maskBoxImage
&& m_pageSize == o.m_pageSize
- && m_shapeOutside == o.m_shapeOutside
+ && shapeOutsideDataEquivalent(o)
&& m_shapeMargin == o.m_shapeMargin
&& m_shapeImageThreshold == o.m_shapeImageThreshold
- && m_clipPath == o.m_clipPath
+ && clipPathDataEquivalent(o)
&& m_textDecorationColor == o.m_textDecorationColor
&& m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
&& m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
@@ -305,4 +305,14 @@ bool StyleRareNonInheritedData::hasFilters() const
return m_filter.get() && !m_filter->m_operations.isEmpty();
}
+bool StyleRareNonInheritedData::shapeOutsideDataEquivalent(const StyleRareNonInheritedData& o) const
+{
+ return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
+}
+
+bool StyleRareNonInheritedData::clipPathDataEquivalent(const StyleRareNonInheritedData& o) const
+{
+ return dataEquivalent(m_clipPath, o.m_clipPath);
+}
+
} // namespace blink
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698