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

Unified Diff: sky/engine/core/css/StyleRule.cpp

Issue 758573005: Remove CSSOM mutability in StyleRule. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/css/StyleRule.h ('k') | sky/engine/core/css/StyleRuleKeyframes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/StyleRule.cpp
diff --git a/sky/engine/core/css/StyleRule.cpp b/sky/engine/core/css/StyleRule.cpp
index 74b3ca5ce868f11acd77934774b773eb05f59c63..66777ea721f79fa027c71124f8d3432a980f1128 100644
--- a/sky/engine/core/css/StyleRule.cpp
+++ b/sky/engine/core/css/StyleRule.cpp
@@ -62,30 +62,6 @@ void StyleRuleBase::destroy()
ASSERT_NOT_REACHED();
}
-PassRefPtr<StyleRuleBase> StyleRuleBase::copy() const
-{
- switch (type()) {
- case Style:
- return toStyleRule(this)->copy();
- case FontFace:
- return toStyleRuleFontFace(this)->copy();
- case Media:
- return toStyleRuleMedia(this)->copy();
- case Supports:
- return toStyleRuleSupports(this)->copy();
- case Keyframes:
- return toStyleRuleKeyframes(this)->copy();
- case Filter:
- return toStyleRuleFilter(this)->copy();
- case Unknown:
- case Keyframe:
- ASSERT_NOT_REACHED();
- return nullptr;
- }
- ASSERT_NOT_REACHED();
- return nullptr;
-}
-
unsigned StyleRule::averageSizeInBytes()
{
return sizeof(StyleRule) + sizeof(CSSSelector) + StylePropertySet::averageSizeInBytes();
@@ -96,24 +72,10 @@ StyleRule::StyleRule()
{
}
-StyleRule::StyleRule(const StyleRule& o)
- : StyleRuleBase(o)
- , m_properties(o.m_properties->mutableCopy())
- , m_selectorList(o.m_selectorList)
-{
-}
-
StyleRule::~StyleRule()
{
}
-MutableStylePropertySet& StyleRule::mutableProperties()
-{
- if (!m_properties->isMutable())
- m_properties = m_properties->mutableCopy();
- return *toMutableStylePropertySet(m_properties.get());
-}
-
void StyleRule::setProperties(PassRefPtr<StylePropertySet> properties)
{
m_properties = properties;
@@ -124,23 +86,10 @@ StyleRuleFontFace::StyleRuleFontFace()
{
}
-StyleRuleFontFace::StyleRuleFontFace(const StyleRuleFontFace& o)
- : StyleRuleBase(o)
- , m_properties(o.m_properties->mutableCopy())
-{
-}
-
StyleRuleFontFace::~StyleRuleFontFace()
{
}
-MutableStylePropertySet& StyleRuleFontFace::mutableProperties()
-{
- if (!m_properties->isMutable())
- m_properties = m_properties->mutableCopy();
- return *toMutableStylePropertySet(m_properties);
-}
-
void StyleRuleFontFace::setProperties(PassRefPtr<StylePropertySet> properties)
{
m_properties = properties;
@@ -152,37 +101,12 @@ StyleRuleGroup::StyleRuleGroup(Type type, Vector<RefPtr<StyleRuleBase> >& adoptR
m_childRules.swap(adoptRule);
}
-StyleRuleGroup::StyleRuleGroup(const StyleRuleGroup& o)
- : StyleRuleBase(o)
- , m_childRules(o.m_childRules.size())
-{
- for (unsigned i = 0; i < m_childRules.size(); ++i)
- m_childRules[i] = o.m_childRules[i]->copy();
-}
-
-void StyleRuleGroup::wrapperInsertRule(unsigned index, PassRefPtr<StyleRuleBase> rule)
-{
- m_childRules.insert(index, rule);
-}
-
-void StyleRuleGroup::wrapperRemoveRule(unsigned index)
-{
- m_childRules.remove(index);
-}
-
StyleRuleMedia::StyleRuleMedia(PassRefPtr<MediaQuerySet> media, Vector<RefPtr<StyleRuleBase> >& adoptRules)
: StyleRuleGroup(Media, adoptRules)
, m_mediaQueries(media)
{
}
-StyleRuleMedia::StyleRuleMedia(const StyleRuleMedia& o)
- : StyleRuleGroup(o)
-{
- if (o.m_mediaQueries)
- m_mediaQueries = o.m_mediaQueries->copy();
-}
-
StyleRuleSupports::StyleRuleSupports(const String& conditionText, bool conditionIsSupported, Vector<RefPtr<StyleRuleBase> >& adoptRules)
: StyleRuleGroup(Supports, adoptRules)
, m_conditionText(conditionText)
@@ -190,37 +114,16 @@ StyleRuleSupports::StyleRuleSupports(const String& conditionText, bool condition
{
}
-StyleRuleSupports::StyleRuleSupports(const StyleRuleSupports& o)
- : StyleRuleGroup(o)
- , m_conditionText(o.m_conditionText)
- , m_conditionIsSupported(o.m_conditionIsSupported)
-{
-}
-
StyleRuleFilter::StyleRuleFilter(const String& filterName)
: StyleRuleBase(Filter)
, m_filterName(filterName)
{
}
-StyleRuleFilter::StyleRuleFilter(const StyleRuleFilter& o)
- : StyleRuleBase(o)
- , m_filterName(o.m_filterName)
- , m_properties(o.m_properties->mutableCopy())
-{
-}
-
StyleRuleFilter::~StyleRuleFilter()
{
}
-MutableStylePropertySet& StyleRuleFilter::mutableProperties()
-{
- if (!m_properties->isMutable())
- m_properties = m_properties->mutableCopy();
- return *toMutableStylePropertySet(m_properties);
-}
-
void StyleRuleFilter::setProperties(PassRefPtr<StylePropertySet> properties)
{
m_properties = properties;
« no previous file with comments | « sky/engine/core/css/StyleRule.h ('k') | sky/engine/core/css/StyleRuleKeyframes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698