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

Unified Diff: sky/engine/core/css/parser/BisonCSSParser-in.cpp

Issue 807703003: Remove @media rules. (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/parser/BisonCSSParser.h ('k') | sky/engine/core/css/parser/BisonCSSParserTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/parser/BisonCSSParser-in.cpp
diff --git a/sky/engine/core/css/parser/BisonCSSParser-in.cpp b/sky/engine/core/css/parser/BisonCSSParser-in.cpp
index e29a8491a8eaa6a33d8c56ac4afed1b83970bee1..e60c694ac41f9ac6c0805093a011860e33726ea0 100644
--- a/sky/engine/core/css/parser/BisonCSSParser-in.cpp
+++ b/sky/engine/core/css/parser/BisonCSSParser-in.cpp
@@ -57,8 +57,6 @@
#include "sky/engine/core/css/CSSValueList.h"
#include "sky/engine/core/css/CSSValuePool.h"
#include "sky/engine/core/css/HashTools.h"
-#include "sky/engine/core/css/MediaList.h"
-#include "sky/engine/core/css/MediaQueryExp.h"
#include "sky/engine/core/css/Pair.h"
#include "sky/engine/core/css/Rect.h"
#include "sky/engine/core/css/StylePropertySet.h"
@@ -978,19 +976,6 @@ bool BisonCSSParser::parseDeclaration(MutableStylePropertySet* declaration, cons
return ok;
}
-PassRefPtr<MediaQuerySet> BisonCSSParser::parseMediaQueryList(const String& string)
-{
- ASSERT(!m_mediaList);
-
- // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.
- // instead insert one " " (which is caught by maybe_space in CSSGrammar.y)
- setupParser("@-internal-medialist ", string, "");
- cssyyparse(this);
-
- ASSERT(m_mediaList);
- return m_mediaList.release();
-}
-
bool BisonCSSParser::parseAttributeMatchType(CSSSelector::AttributeMatchType& matchType, const String& string)
{
if (!RuntimeEnabledFeatures::cssAttributeCaseSensitivityEnabled() && !isUASheetBehavior(m_context.mode()))
@@ -1374,52 +1359,6 @@ CSSParserValue& BisonCSSParser::sinkFloatingValue(CSSParserValue& value)
return value;
}
-MediaQueryExp* BisonCSSParser::createFloatingMediaQueryExp(const AtomicString& mediaFeature, CSSParserValueList* values)
-{
- m_floatingMediaQueryExp = MediaQueryExp::createIfValid(mediaFeature, values);
- return m_floatingMediaQueryExp.get();
-}
-
-PassOwnPtr<MediaQueryExp> BisonCSSParser::sinkFloatingMediaQueryExp(MediaQueryExp* expression)
-{
- ASSERT_UNUSED(expression, expression == m_floatingMediaQueryExp);
- return m_floatingMediaQueryExp.release();
-}
-
-Vector<OwnPtr<MediaQueryExp> >* BisonCSSParser::createFloatingMediaQueryExpList()
-{
- m_floatingMediaQueryExpList = adoptPtr(new Vector<OwnPtr<MediaQueryExp> >);
- return m_floatingMediaQueryExpList.get();
-}
-
-PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > BisonCSSParser::sinkFloatingMediaQueryExpList(Vector<OwnPtr<MediaQueryExp> >* list)
-{
- ASSERT_UNUSED(list, list == m_floatingMediaQueryExpList);
- return m_floatingMediaQueryExpList.release();
-}
-
-MediaQuery* BisonCSSParser::createFloatingMediaQuery(MediaQuery::Restrictor restrictor, const AtomicString& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > expressions)
-{
- m_floatingMediaQuery = adoptPtr(new MediaQuery(restrictor, mediaType, expressions));
- return m_floatingMediaQuery.get();
-}
-
-MediaQuery* BisonCSSParser::createFloatingMediaQuery(PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > expressions)
-{
- return createFloatingMediaQuery(MediaQuery::None, AtomicString("all", AtomicString::ConstructFromLiteral), expressions);
-}
-
-MediaQuery* BisonCSSParser::createFloatingNotAllQuery()
-{
- return createFloatingMediaQuery(MediaQuery::Not, AtomicString("all", AtomicString::ConstructFromLiteral), sinkFloatingMediaQueryExpList(createFloatingMediaQueryExpList()));
-}
-
-PassOwnPtr<MediaQuery> BisonCSSParser::sinkFloatingMediaQuery(MediaQuery* query)
-{
- ASSERT_UNUSED(query, query == m_floatingMediaQuery);
- return m_floatingMediaQuery.release();
-}
-
Vector<RefPtr<StyleKeyframe> >* BisonCSSParser::createFloatingKeyframeVector()
{
m_floatingKeyframeVector = adoptPtr(new Vector<RefPtr<StyleKeyframe> >());
@@ -1432,29 +1371,6 @@ PassOwnPtr<Vector<RefPtr<StyleKeyframe> > > BisonCSSParser::sinkFloatingKeyframe
return m_floatingKeyframeVector.release();
}
-MediaQuerySet* BisonCSSParser::createMediaQuerySet()
-{
- RefPtr<MediaQuerySet> queries = MediaQuerySet::create();
- MediaQuerySet* result = queries.get();
- m_parsedMediaQuerySets.append(queries.release());
- return result;
-}
-
-StyleRuleBase* BisonCSSParser::createMediaRule(MediaQuerySet* media, RuleList* rules)
-{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
- RefPtr<StyleRuleMedia> rule = nullptr;
- if (rules) {
- rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create().get(), *rules);
- } else {
- RuleList emptyRules;
- rule = StyleRuleMedia::create(media ? media : MediaQuerySet::create().get(), emptyRules);
- }
- StyleRuleMedia* result = rule.get();
- m_parsedRules.append(rule.release());
- return result;
-}
-
StyleRuleBase* BisonCSSParser::createSupportsRule(bool conditionIsSupported, RuleList* rules)
{
m_allowImportRules = m_allowNamespaceDeclarations = false;
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser.h ('k') | sky/engine/core/css/parser/BisonCSSParserTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698