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

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

Issue 217423005: Get Media Query parser to handle parens, brackets and braces blocks correctly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed algorithm and more tests Created 6 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 MediaQueryToken_h 5 #ifndef MediaQueryToken_h
6 #define MediaQueryToken_h 6 #define MediaQueryToken_h
7 7
8 #include "core/css/CSSPrimitiveValue.h" 8 #include "core/css/CSSPrimitiveValue.h"
9 #include "wtf/text/WTFString.h" 9 #include "wtf/text/WTFString.h"
10 10
11 namespace WebCore { 11 namespace WebCore {
12 12
13 enum MediaQueryTokenType { 13 enum MediaQueryTokenType {
14 IdentToken = 0, 14 IdentToken = 0,
15 FunctionToken = 1, 15 FunctionToken = 1,
16 DelimiterToken = 2, 16 DelimiterToken = 2,
17 NumberToken = 3, 17 NumberToken = 3,
18 PercentageToken = 4, 18 PercentageToken = 4,
19 DimensionToken = 5, 19 DimensionToken = 5,
20 WhitespaceToken = 6, 20 WhitespaceToken = 6,
21 ColonToken = 7, 21 ColonToken = 7,
22 SemicolonToken = 8, 22 SemicolonToken = 8,
23 CommaToken = 9, 23 CommaToken = 9,
24 LeftParenthesisToken = 10, 24 LeftParenthesisToken = 10,
25 RightParenthesisToken = 11, 25 RightParenthesisToken = 11,
26 EOFToken = 12, 26 LeftBracketToken = 12,
27 CommentToken = 13, 27 RightBracketToken = 13,
28 LeftBraceToken = 14,
29 RightBraceToken = 15,
30 EOFToken = 16,
31 CommentToken = 17,
28 }; 32 };
29 33
30 enum NumericValueType { 34 enum NumericValueType {
31 IntegerValueType, 35 IntegerValueType,
32 NumberValueType, 36 NumberValueType,
33 }; 37 };
34 38
35 class MediaQueryToken { 39 class MediaQueryToken {
36 public: 40 public:
37 MediaQueryToken(MediaQueryTokenType); 41 MediaQueryToken(MediaQueryTokenType);
(...skipping 24 matching lines...) Expand all
62 UChar m_delimiter; // Could be rolled into m_value? 66 UChar m_delimiter; // Could be rolled into m_value?
63 67
64 NumericValueType m_numericValueType; 68 NumericValueType m_numericValueType;
65 double m_numericValue; 69 double m_numericValue;
66 CSSPrimitiveValue::UnitTypes m_unit; 70 CSSPrimitiveValue::UnitTypes m_unit;
67 }; 71 };
68 72
69 } 73 }
70 74
71 #endif // MediaQueryToken_h 75 #endif // MediaQueryToken_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698