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

Side by Side Diff: Source/core/css/parser/MediaQueryParser.h

Issue 1176393005: Remove usage of CSSParserValue in MediaQueryParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « Source/core/css/MediaQueryExp.cpp ('k') | Source/core/css/parser/MediaQueryParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MediaQueryParser_h 5 #ifndef MediaQueryParser_h
6 #define MediaQueryParser_h 6 #define MediaQueryParser_h
7 7
8 #include "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "core/css/MediaList.h" 9 #include "core/css/MediaList.h"
10 #include "core/css/MediaQuery.h" 10 #include "core/css/MediaQuery.h"
11 #include "core/css/MediaQueryExp.h" 11 #include "core/css/MediaQueryExp.h"
12 #include "core/css/parser/CSSParserToken.h" 12 #include "core/css/parser/CSSParserToken.h"
13 #include "core/css/parser/CSSParserTokenRange.h" 13 #include "core/css/parser/CSSParserTokenRange.h"
14 #include "core/css/parser/CSSParserValues.h"
15 #include "core/css/parser/MediaQueryBlockWatcher.h" 14 #include "core/css/parser/MediaQueryBlockWatcher.h"
16 #include "wtf/text/WTFString.h" 15 #include "wtf/text/WTFString.h"
17 16
18 namespace blink { 17 namespace blink {
19 18
20 class MediaQuerySet; 19 class MediaQuerySet;
21 20
22 class MediaQueryData { 21 class MediaQueryData {
23 STACK_ALLOCATED(); 22 STACK_ALLOCATED();
24 private: 23 private:
25 MediaQuery::Restrictor m_restrictor; 24 MediaQuery::Restrictor m_restrictor;
26 String m_mediaType; 25 String m_mediaType;
27 OwnPtrWillBeMember<ExpressionHeapVector> m_expressions; 26 OwnPtrWillBeMember<ExpressionHeapVector> m_expressions;
28 String m_mediaFeature; 27 String m_mediaFeature;
29 CSSParserValueList m_valueList; 28 Vector<CSSParserToken, 4> m_valueList;
30 bool m_mediaTypeSet; 29 bool m_mediaTypeSet;
31 30
32 public: 31 public:
33 MediaQueryData(); 32 MediaQueryData();
34 void clear(); 33 void clear();
35 bool addExpression(); 34 bool addExpression();
36 bool tryAddParserValue(CSSParserTokenType, const CSSParserToken&); 35 bool tryAddParserToken(CSSParserTokenType, const CSSParserToken&);
37 void setMediaType(const String&); 36 void setMediaType(const String&);
38 PassOwnPtrWillBeRawPtr<MediaQuery> takeMediaQuery(); 37 PassOwnPtrWillBeRawPtr<MediaQuery> takeMediaQuery();
39 38
40 inline bool currentMediaQueryChanged() const 39 inline bool currentMediaQueryChanged() const
41 { 40 {
42 return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressi ons->size() > 0); 41 return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressi ons->size() > 0);
43 } 42 }
44 inline MediaQuery::Restrictor restrictor() { return m_restrictor; } 43 inline MediaQuery::Restrictor restrictor() { return m_restrictor; }
45 44
46 inline void setRestrictor(MediaQuery::Restrictor restrictor) { m_restrictor = restrictor; } 45 inline void setRestrictor(MediaQuery::Restrictor restrictor) { m_restrictor = restrictor; }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 const static State ReadFeatureEnd; 102 const static State ReadFeatureEnd;
104 const static State SkipUntilComma; 103 const static State SkipUntilComma;
105 const static State SkipUntilBlockEnd; 104 const static State SkipUntilBlockEnd;
106 const static State Done; 105 const static State Done;
107 106
108 }; 107 };
109 108
110 } // namespace blink 109 } // namespace blink
111 110
112 #endif // MediaQueryParser_h 111 #endif // MediaQueryParser_h
OLDNEW
« no previous file with comments | « Source/core/css/MediaQueryExp.cpp ('k') | Source/core/css/parser/MediaQueryParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698