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

Side by Side Diff: Source/core/css/parser/SizesAttributeParser.cpp

Issue 335313003: MediaQueryEvaluator getting mediaType from MediaValues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added a comment Created 6 years, 5 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/StyleMedia.cpp ('k') | Source/core/css/parser/SizesAttributeParserTest.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 #include "config.h" 5 #include "config.h"
6 #include "core/css/parser/SizesAttributeParser.h" 6 #include "core/css/parser/SizesAttributeParser.h"
7 7
8 #include "core/MediaTypeNames.h" 8 #include "core/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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 break; 72 break;
73 } 73 }
74 74
75 --token; 75 --token;
76 } 76 }
77 } 77 }
78 78
79 bool SizesAttributeParser::mediaConditionMatches(PassRefPtrWillBeRawPtr<MediaQue rySet> mediaCondition) 79 bool SizesAttributeParser::mediaConditionMatches(PassRefPtrWillBeRawPtr<MediaQue rySet> mediaCondition)
80 { 80 {
81 // A Media Condition cannot have a media type other then screen. 81 // A Media Condition cannot have a media type other then screen.
82 MediaQueryEvaluator mediaQueryEvaluator(MediaTypeNames::screen, *m_mediaValu es); 82 MediaQueryEvaluator mediaQueryEvaluator(*m_mediaValues);
83 return mediaQueryEvaluator.eval(mediaCondition.get()); 83 return mediaQueryEvaluator.eval(mediaCondition.get());
84 } 84 }
85 85
86 bool SizesAttributeParser::parseMediaConditionAndLength(MediaQueryTokenIterator startToken, MediaQueryTokenIterator endToken) 86 bool SizesAttributeParser::parseMediaConditionAndLength(MediaQueryTokenIterator startToken, MediaQueryTokenIterator endToken)
87 { 87 {
88 MediaQueryTokenIterator lengthTokenStart; 88 MediaQueryTokenIterator lengthTokenStart;
89 MediaQueryTokenIterator lengthTokenEnd; 89 MediaQueryTokenIterator lengthTokenEnd;
90 90
91 reverseSkipIrrelevantTokens(endToken, startToken); 91 reverseSkipIrrelevantTokens(endToken, startToken);
92 lengthTokenEnd = endToken; 92 lengthTokenEnd = endToken;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 } 132 }
133 133
134 unsigned SizesAttributeParser::effectiveSizeDefaultValue() 134 unsigned SizesAttributeParser::effectiveSizeDefaultValue()
135 { 135 {
136 // Returning the equivalent of "100%" 136 // Returning the equivalent of "100%"
137 return m_mediaValues->viewportWidth(); 137 return m_mediaValues->viewportWidth();
138 } 138 }
139 139
140 } // namespace 140 } // namespace
141 141
OLDNEW
« no previous file with comments | « Source/core/css/StyleMedia.cpp ('k') | Source/core/css/parser/SizesAttributeParserTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698