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

Side by Side Diff: Source/core/css/MediaQueryExp.cpp

Issue 16208004: No need to store invalid media queries. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * CSS Media Query 2 * CSS Media Query
3 * 3 *
4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>. 4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
6 * Copyright (C) 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2013 Apple Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 || m_mediaFeature == MediaFeatureNames::minWidthMediaFeature 190 || m_mediaFeature == MediaFeatureNames::minWidthMediaFeature
191 || m_mediaFeature == MediaFeatureNames::minHeightMediaFeature 191 || m_mediaFeature == MediaFeatureNames::minHeightMediaFeature
192 || m_mediaFeature == MediaFeatureNames::maxWidthMediaFeature 192 || m_mediaFeature == MediaFeatureNames::maxWidthMediaFeature
193 || m_mediaFeature == MediaFeatureNames::maxHeightMediaFeature 193 || m_mediaFeature == MediaFeatureNames::maxHeightMediaFeature
194 || m_mediaFeature == MediaFeatureNames::orientationMediaFeature 194 || m_mediaFeature == MediaFeatureNames::orientationMediaFeature
195 || m_mediaFeature == MediaFeatureNames::aspectRatioMediaFeature 195 || m_mediaFeature == MediaFeatureNames::aspectRatioMediaFeature
196 || m_mediaFeature == MediaFeatureNames::minAspectRatioMediaFeature 196 || m_mediaFeature == MediaFeatureNames::minAspectRatioMediaFeature
197 || m_mediaFeature == MediaFeatureNames::maxAspectRatioMediaFeature; 197 || m_mediaFeature == MediaFeatureNames::maxAspectRatioMediaFeature;
198 } 198 }
199 199
200 inline MediaQueryExp::MediaQueryExp(const AtomicString& mediaFeature, CSSParserV alueList* valueList) 200 MediaQueryExp::MediaQueryExp(const AtomicString& mediaFeature, PassRefPtr<CSSVal ue> value)
201 : m_mediaFeature(mediaFeature) 201 : m_mediaFeature(mediaFeature)
202 , m_value(0) 202 , m_value(value)
203 , m_isValid(false)
204 { 203 {
205 // Initialize media query expression that must have 1 or more values. 204 }
205
206 PassOwnPtr<MediaQueryExp> MediaQueryExp::create(const AtomicString& mediaFeature , CSSParserValueList* valueList)
207 {
208 RefPtr<CSSValue> cssValue;
209 bool isValid = false;
210
211 // Create value for media query expression that must have 1 or more values.
206 if (valueList) { 212 if (valueList) {
207 if (valueList->size() == 1) { 213 if (valueList->size() == 1) {
208 CSSParserValue* value = valueList->current(); 214 CSSParserValue* value = valueList->current();
209 215
210 // Media features that use CSSValueIDs.
211 if (featureWithCSSValueID(mediaFeature, value)) { 216 if (featureWithCSSValueID(mediaFeature, value)) {
212 m_value = CSSPrimitiveValue::createIdentifier(value->id); 217 // Media features that use CSSValueIDs.
213 if (!featureWithValidIdent(mediaFeature, toCSSPrimitiveValue(m_v alue.get())->getValueID())) 218 cssValue = CSSPrimitiveValue::createIdentifier(value->id);
214 m_value.clear(); 219 if (!featureWithValidIdent(mediaFeature, toCSSPrimitiveValue(css Value.get())->getValueID()))
220 cssValue.clear();
221 } else if (featureWithValidDensity(mediaFeature, value)) {
222 // Media features that must have non-negative <density>, ie. dpp x, dpi or dpcm.
223 cssValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitiv eValue::UnitTypes) value->unit);
224 } else if (featureWithValidPositiveLenghtOrNumber(mediaFeature, valu e)) {
225 // Media features that must have non-negative <lenght> or number value.
226 cssValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitiv eValue::UnitTypes) value->unit);
227 } else if (featureWithPositiveInteger(mediaFeature, value)) {
228 // Media features that must have non-negative integer value.
229 cssValue = CSSPrimitiveValue::create(value->fValue, CSSPrimitive Value::CSS_NUMBER);
230 } else if (featureWithPositiveNumber(mediaFeature, value)) {
231 // Media features that must have non-negative number value.
232 cssValue = CSSPrimitiveValue::create(value->fValue, CSSPrimitive Value::CSS_NUMBER);
233 } else if (featureWithZeroOrOne(mediaFeature, value)) {
234 // Media features that must have (0|1) value.
235 cssValue = CSSPrimitiveValue::create(value->fValue, CSSPrimitive Value::CSS_NUMBER);
215 } 236 }
216 237
217 // Media features that must have non-negative <density>, ie. dppx, d pi or dpcm. 238 isValid = cssValue;
218 else if (featureWithValidDensity(mediaFeature, value))
219 m_value = CSSPrimitiveValue::create(value->fValue, (CSSPrimitive Value::UnitTypes) value->unit);
220 239
221 // Media features that must have non-negative <lenght> or number val ue.
222 else if (featureWithValidPositiveLenghtOrNumber(mediaFeature, value) )
223 m_value = CSSPrimitiveValue::create(value->fValue, (CSSPrimitive Value::UnitTypes) value->unit);
224
225 // Media features that must have non-negative integer value.
226 else if (featureWithPositiveInteger(mediaFeature, value))
227 m_value = CSSPrimitiveValue::create(value->fValue, CSSPrimitiveV alue::CSS_NUMBER);
228
229 // Media features that must have non-negative number value.
230 else if (featureWithPositiveNumber(mediaFeature, value))
231 m_value = CSSPrimitiveValue::create(value->fValue, CSSPrimitiveV alue::CSS_NUMBER);
232
233 // Media features that must have (0|1) value.
234 else if (featureWithZeroOrOne(mediaFeature, value))
235 m_value = CSSPrimitiveValue::create(value->fValue, CSSPrimitiveV alue::CSS_NUMBER);
236
237 m_isValid = m_value;
238 } else if (valueList->size() == 3 && featureWithAspectRatio(mediaFeature )) { 240 } else if (valueList->size() == 3 && featureWithAspectRatio(mediaFeature )) {
239 // Create list of values. 241 // Create list of values.
240 // Currently accepts only <integer>/<integer>. 242 // Currently accepts only <integer>/<integer>.
241 // Applicable to device-aspect-ratio and aspec-ratio. 243 // Applicable to device-aspect-ratio and aspec-ratio.
242 bool isValid = true; 244 isValid = true;
243 float numeratorValue = 0; 245 float numeratorValue = 0;
244 float denominatorValue = 0; 246 float denominatorValue = 0;
245
246 // The aspect-ratio must be <integer> (whitespace)? / (whitespace)? <integer>. 247 // The aspect-ratio must be <integer> (whitespace)? / (whitespace)? <integer>.
247 for (unsigned i = 0; i < 3; ++i, valueList->next()) { 248 for (unsigned i = 0; i < 3; ++i, valueList->next()) {
248 const CSSParserValue* value = valueList->current(); 249 const CSSParserValue* value = valueList->current();
249 if (i != 1 && value->unit == CSSPrimitiveValue::CSS_NUMBER && va lue->fValue > 0 && value->isInt) { 250 if (i != 1 && value->unit == CSSPrimitiveValue::CSS_NUMBER && va lue->fValue > 0 && value->isInt) {
250 if (!i) 251 if (!i)
251 numeratorValue = value->fValue; 252 numeratorValue = value->fValue;
252 else 253 else
253 denominatorValue = value->fValue; 254 denominatorValue = value->fValue;
254 } else if (i == 1 && value->unit == CSSParserValue::Operator && value->iValue == '/') 255 } else if (i == 1 && value->unit == CSSParserValue::Operator && value->iValue == '/') {
255 continue; 256 continue;
256 else { 257 } else {
257 isValid = false; 258 isValid = false;
258 break; 259 break;
259 } 260 }
260 } 261 }
261 262
262 if (isValid) 263 if (isValid)
263 m_value = CSSAspectRatioValue::create(numeratorValue, denominato rValue); 264 cssValue = CSSAspectRatioValue::create(numeratorValue, denominat orValue);
265 }
266 } else if (featureWithoutValue(mediaFeature)) {
267 isValid = true;
268 }
264 269
265 m_isValid = m_value; 270 if (!isValid)
266 } 271 return nullptr;
267 } else if (featureWithoutValue(mediaFeature))
268 m_isValid = true;
269 }
270 272
271 PassOwnPtr<MediaQueryExp> MediaQueryExp::create(const AtomicString& mediaFeature , CSSParserValueList* values) 273 return adoptPtr(new MediaQueryExp(mediaFeature, cssValue));
272 {
273 return adoptPtr(new MediaQueryExp(mediaFeature, values));
274 } 274 }
275 275
276 MediaQueryExp::~MediaQueryExp() 276 MediaQueryExp::~MediaQueryExp()
277 { 277 {
278 } 278 }
279 279
280 String MediaQueryExp::serialize() const 280 String MediaQueryExp::serialize() const
281 { 281 {
282 StringBuilder result; 282 StringBuilder result;
283 result.append("("); 283 result.append("(");
284 result.append(m_mediaFeature.lower()); 284 result.append(m_mediaFeature.lower());
285 if (m_value) { 285 if (m_value) {
286 result.append(": "); 286 result.append(": ");
287 result.append(m_value->cssText()); 287 result.append(m_value->cssText());
288 } 288 }
289 result.append(")"); 289 result.append(")");
290 290
291 return result.toString(); 291 return result.toString();
292 } 292 }
293 293
294 void MediaQueryExp::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 294 void MediaQueryExp::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
295 { 295 {
296 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 296 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
297 info.addMember(m_mediaFeature, "mediaFeature"); 297 info.addMember(m_mediaFeature, "mediaFeature");
298 info.addMember(m_value, "value"); 298 info.addMember(m_value, "value");
299 } 299 }
300 300
301 } // namespace 301 } // namespace
OLDNEW
« no previous file with comments | « Source/core/css/MediaQueryExp.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698