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

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

Issue 1858753003: Remove RawPtr from core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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"
(...skipping 17 matching lines...) Expand all
28 String m_mediaFeature; 28 String m_mediaFeature;
29 Vector<CSSParserToken, 4> m_valueList; 29 Vector<CSSParserToken, 4> m_valueList;
30 bool m_mediaTypeSet; 30 bool m_mediaTypeSet;
31 31
32 public: 32 public:
33 MediaQueryData(); 33 MediaQueryData();
34 void clear(); 34 void clear();
35 bool addExpression(); 35 bool addExpression();
36 bool tryAddParserToken(CSSParserTokenType, const CSSParserToken&); 36 bool tryAddParserToken(CSSParserTokenType, const CSSParserToken&);
37 void setMediaType(const String&); 37 void setMediaType(const String&);
38 RawPtr<MediaQuery> takeMediaQuery(); 38 MediaQuery* takeMediaQuery();
39 39
40 inline bool currentMediaQueryChanged() const 40 inline bool currentMediaQueryChanged() const
41 { 41 {
42 return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressi ons.size() > 0); 42 return (m_restrictor != MediaQuery::None || m_mediaTypeSet || m_expressi ons.size() > 0);
43 } 43 }
44 inline MediaQuery::RestrictorType restrictor() { return m_restrictor; } 44 inline MediaQuery::RestrictorType restrictor() { return m_restrictor; }
45 45
46 inline void setRestrictor(MediaQuery::RestrictorType restrictor) { m_restric tor = restrictor; } 46 inline void setRestrictor(MediaQuery::RestrictorType restrictor) { m_restric tor = restrictor; }
47 47
48 inline void setMediaFeature(const String& str) { m_mediaFeature = str; } 48 inline void setMediaFeature(const String& str) { m_mediaFeature = str; }
49 }; 49 };
50 50
51 class CORE_EXPORT MediaQueryParser { 51 class CORE_EXPORT MediaQueryParser {
52 STACK_ALLOCATED(); 52 STACK_ALLOCATED();
53 public: 53 public:
54 static RawPtr<MediaQuerySet> parseMediaQuerySet(const String&); 54 static MediaQuerySet* parseMediaQuerySet(const String&);
55 static RawPtr<MediaQuerySet> parseMediaQuerySet(CSSParserTokenRange); 55 static MediaQuerySet* parseMediaQuerySet(CSSParserTokenRange);
56 static RawPtr<MediaQuerySet> parseMediaCondition(CSSParserTokenRange); 56 static MediaQuerySet* parseMediaCondition(CSSParserTokenRange);
57 57
58 private: 58 private:
59 enum ParserType { 59 enum ParserType {
60 MediaQuerySetParser, 60 MediaQuerySetParser,
61 MediaConditionParser, 61 MediaConditionParser,
62 }; 62 };
63 63
64 MediaQueryParser(ParserType); 64 MediaQueryParser(ParserType);
65 virtual ~MediaQueryParser(); 65 virtual ~MediaQueryParser();
66 66
67 RawPtr<MediaQuerySet> parseImpl(CSSParserTokenRange); 67 MediaQuerySet* parseImpl(CSSParserTokenRange);
68 68
69 void processToken(const CSSParserToken&); 69 void processToken(const CSSParserToken&);
70 70
71 void readRestrictor(CSSParserTokenType, const CSSParserToken&); 71 void readRestrictor(CSSParserTokenType, const CSSParserToken&);
72 void readMediaNot(CSSParserTokenType, const CSSParserToken&); 72 void readMediaNot(CSSParserTokenType, const CSSParserToken&);
73 void readMediaType(CSSParserTokenType, const CSSParserToken&); 73 void readMediaType(CSSParserTokenType, const CSSParserToken&);
74 void readAnd(CSSParserTokenType, const CSSParserToken&); 74 void readAnd(CSSParserTokenType, const CSSParserToken&);
75 void readFeatureStart(CSSParserTokenType, const CSSParserToken&); 75 void readFeatureStart(CSSParserTokenType, const CSSParserToken&);
76 void readFeature(CSSParserTokenType, const CSSParserToken&); 76 void readFeature(CSSParserTokenType, const CSSParserToken&);
77 void readFeatureColon(CSSParserTokenType, const CSSParserToken&); 77 void readFeatureColon(CSSParserTokenType, const CSSParserToken&);
(...skipping 25 matching lines...) Expand all
103 const static State ReadFeatureEnd; 103 const static State ReadFeatureEnd;
104 const static State SkipUntilComma; 104 const static State SkipUntilComma;
105 const static State SkipUntilBlockEnd; 105 const static State SkipUntilBlockEnd;
106 const static State Done; 106 const static State Done;
107 107
108 }; 108 };
109 109
110 } // namespace blink 110 } // namespace blink
111 111
112 #endif // MediaQueryParser_h 112 #endif // MediaQueryParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698