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

Unified Diff: sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 709213002: Remove ContentData. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/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: sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
diff --git a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
index 2e38772aec85a9c56744302e7351c8f4fbf622ef..d7964e1a35e3f0d15f19118e09149726dae08a8a 100644
--- a/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/sky/engine/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -22,7 +22,6 @@
#include "config.h"
#include "core/rendering/style/StyleRareNonInheritedData.h"
-#include "core/rendering/style/ContentData.h"
#include "core/rendering/style/DataEquivalency.h"
#include "core/rendering/style/RenderStyle.h"
#include "core/rendering/style/ShadowList.h"
@@ -97,7 +96,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_transform(o.m_transform)
, m_willChange(o.m_willChange)
, m_filter(o.m_filter)
- , m_content(o.m_content ? o.m_content->clone() : nullptr)
, m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
, m_boxShadow(o.m_boxShadow)
, m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations) : nullptr)
@@ -164,7 +162,6 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_transform == o.m_transform
&& m_willChange == o.m_willChange
&& m_filter == o.m_filter
- && contentDataEquivalent(o)
&& counterDataEquivalent(o)
&& shadowDataEquivalent(o)
&& animationDataEquivalent(o)
@@ -210,19 +207,6 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_hasInlineTransform == o.m_hasInlineTransform;
}
-bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
-{
- ContentData* a = m_content.get();
- ContentData* b = o.m_content.get();
-
- while (a && b && *a == *b) {
- a = a->next();
- b = b->next();
- }
-
- return !a && !b;
-}
-
bool StyleRareNonInheritedData::counterDataEquivalent(const StyleRareNonInheritedData& o) const
{
return dataEquivalent(m_counterDirectives, o.m_counterDirectives);
« no previous file with comments | « sky/engine/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698