Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "config.h" | 5 #include "config.h" |
| 6 #include "SizesAttributeParser.h" | 6 #include "SizesAttributeParser.h" |
| 7 | 7 |
| 8 #include "MediaTypeNames.h" | 8 #include "MediaTypeNames.h" |
| 9 #include "core/css/MediaQueryEvaluator.h" | 9 #include "core/css/MediaQueryEvaluator.h" |
| 10 #include "core/css/parser/MediaQueryTokenizer.h" | 10 #include "core/css/parser/MediaQueryTokenizer.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 if (!blockLevel) | 66 if (!blockLevel) |
| 67 break; | 67 break; |
| 68 } | 68 } |
| 69 | 69 |
| 70 --token; | 70 --token; |
| 71 } | 71 } |
| 72 } | 72 } |
| 73 | 73 |
| 74 bool SizesAttributeParser::mediaConditionMatches(PassRefPtrWillBeRawPtr<MediaQue rySet> mediaCondition) | 74 bool SizesAttributeParser::mediaConditionMatches(PassRefPtrWillBeRawPtr<MediaQue rySet> mediaCondition) |
| 75 { | 75 { |
| 76 // FIXME: How do I handle non-screen media types here? | 76 // A Media Condition cannot have a media type other then screen. |
|
ojan
2014/05/16 18:21:56
Can you make this an ASSERT instead of a comment?
cbiesinger
2014/05/16 18:25:44
The comment is just explaining why the next line a
| |
| 77 MediaQueryEvaluator mediaQueryEvaluator(MediaTypeNames::screen, *m_mediaValu es); | 77 MediaQueryEvaluator mediaQueryEvaluator(MediaTypeNames::screen, *m_mediaValu es); |
| 78 return mediaQueryEvaluator.eval(mediaCondition.get()); | 78 return mediaQueryEvaluator.eval(mediaCondition.get()); |
| 79 } | 79 } |
| 80 | 80 |
| 81 bool SizesAttributeParser::parseMediaConditionAndLength(MediaQueryTokenIterator startToken, MediaQueryTokenIterator endToken) | 81 bool SizesAttributeParser::parseMediaConditionAndLength(MediaQueryTokenIterator startToken, MediaQueryTokenIterator endToken) |
| 82 { | 82 { |
| 83 MediaQueryTokenIterator lengthTokenStart; | 83 MediaQueryTokenIterator lengthTokenStart; |
| 84 MediaQueryTokenIterator lengthTokenEnd; | 84 MediaQueryTokenIterator lengthTokenEnd; |
| 85 | 85 |
| 86 reverseSkipIrrelevantTokens(endToken, startToken); | 86 reverseSkipIrrelevantTokens(endToken, startToken); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 } | 126 } |
| 127 | 127 |
| 128 unsigned SizesAttributeParser::effectiveSizeDefaultValue() | 128 unsigned SizesAttributeParser::effectiveSizeDefaultValue() |
| 129 { | 129 { |
| 130 // Returning the equivalent of "100%" | 130 // Returning the equivalent of "100%" |
| 131 return m_mediaValues->viewportWidth(); | 131 return m_mediaValues->viewportWidth(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 } // namespace | 134 } // namespace |
| 135 | 135 |
| OLD | NEW |