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

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

Issue 1099483002: Use alias_for with trivial property aliases (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@alias
Patch Set: rebase a couple of tests Created 5 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 #include "config.h" 5 #include "config.h"
6 #include "core/css/parser/CSSParserFastPaths.h" 6 #include "core/css/parser/CSSParserFastPaths.h"
7 7
8 #include "core/StylePropertyShorthand.h" 8 #include "core/StylePropertyShorthand.h"
9 #include "core/css/CSSFunctionValue.h" 9 #include "core/css/CSSFunctionValue.h"
10 #include "core/css/CSSValuePool.h" 10 #include "core/css/CSSValuePool.h"
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 return (valueID >= CSSValueCapitalize && valueID <= CSSValueLowercase) | | valueID == CSSValueNone; 281 return (valueID >= CSSValueCapitalize && valueID <= CSSValueLowercase) | | valueID == CSSValueNone;
282 case CSSPropertyUnicodeBidi: 282 case CSSPropertyUnicodeBidi:
283 return valueID == CSSValueNormal || valueID == CSSValueEmbed 283 return valueID == CSSValueNormal || valueID == CSSValueEmbed
284 || valueID == CSSValueBidiOverride || valueID == CSSValueWebkitIsola te 284 || valueID == CSSValueBidiOverride || valueID == CSSValueWebkitIsola te
285 || valueID == CSSValueWebkitIsolateOverride || valueID == CSSValueWe bkitPlaintext; 285 || valueID == CSSValueWebkitIsolateOverride || valueID == CSSValueWe bkitPlaintext;
286 case CSSPropertyVisibility: // visible | hidden | collapse 286 case CSSPropertyVisibility: // visible | hidden | collapse
287 return valueID == CSSValueVisible || valueID == CSSValueHidden || valueI D == CSSValueCollapse; 287 return valueID == CSSValueVisible || valueID == CSSValueHidden || valueI D == CSSValueCollapse;
288 case CSSPropertyWebkitAppearance: 288 case CSSPropertyWebkitAppearance:
289 return (valueID >= CSSValueCheckbox && valueID <= CSSValueTextarea) || v alueID == CSSValueNone; 289 return (valueID >= CSSValueCheckbox && valueID <= CSSValueTextarea) || v alueID == CSSValueNone;
290 case CSSPropertyBackfaceVisibility: 290 case CSSPropertyBackfaceVisibility:
291 case CSSPropertyWebkitBackfaceVisibility:
292 return valueID == CSSValueVisible || valueID == CSSValueHidden; 291 return valueID == CSSValueVisible || valueID == CSSValueHidden;
293 case CSSPropertyMixBlendMode: 292 case CSSPropertyMixBlendMode:
294 ASSERT(RuntimeEnabledFeatures::cssCompositingEnabled()); 293 ASSERT(RuntimeEnabledFeatures::cssCompositingEnabled());
295 return valueID == CSSValueNormal || valueID == CSSValueMultiply || value ID == CSSValueScreen || valueID == CSSValueOverlay 294 return valueID == CSSValueNormal || valueID == CSSValueMultiply || value ID == CSSValueScreen || valueID == CSSValueOverlay
296 || valueID == CSSValueDarken || valueID == CSSValueLighten || valueI D == CSSValueColorDodge || valueID == CSSValueColorBurn 295 || valueID == CSSValueDarken || valueID == CSSValueLighten || valueI D == CSSValueColorDodge || valueID == CSSValueColorBurn
297 || valueID == CSSValueHardLight || valueID == CSSValueSoftLight || v alueID == CSSValueDifference || valueID == CSSValueExclusion 296 || valueID == CSSValueHardLight || valueID == CSSValueSoftLight || v alueID == CSSValueDifference || valueID == CSSValueExclusion
298 || valueID == CSSValueHue || valueID == CSSValueSaturation || valueI D == CSSValueColor || valueID == CSSValueLuminosity; 297 || valueID == CSSValueHue || valueID == CSSValueSaturation || valueI D == CSSValueColor || valueID == CSSValueLuminosity;
299 case CSSPropertyWebkitBoxAlign: 298 case CSSPropertyWebkitBoxAlign:
300 return valueID == CSSValueStretch || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline; 299 return valueID == CSSValueStretch || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline;
301 case CSSPropertyWebkitBoxDecorationBreak: 300 case CSSPropertyWebkitBoxDecorationBreak:
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 return valueID == CSSValueLogical || valueID == CSSValueVisual; 337 return valueID == CSSValueLogical || valueID == CSSValueVisual;
339 case CSSPropertyWebkitRubyPosition: 338 case CSSPropertyWebkitRubyPosition:
340 return valueID == CSSValueBefore || valueID == CSSValueAfter; 339 return valueID == CSSValueBefore || valueID == CSSValueAfter;
341 case CSSPropertyWebkitTextCombine: 340 case CSSPropertyWebkitTextCombine:
342 return valueID == CSSValueNone || valueID == CSSValueHorizontal; 341 return valueID == CSSValueNone || valueID == CSSValueHorizontal;
343 case CSSPropertyWebkitTextEmphasisPosition: 342 case CSSPropertyWebkitTextEmphasisPosition:
344 return valueID == CSSValueOver || valueID == CSSValueUnder; 343 return valueID == CSSValueOver || valueID == CSSValueUnder;
345 case CSSPropertyWebkitTextSecurity: // disc | circle | square | none 344 case CSSPropertyWebkitTextSecurity: // disc | circle | square | none
346 return valueID == CSSValueDisc || valueID == CSSValueCircle || valueID = = CSSValueSquare || valueID == CSSValueNone; 345 return valueID == CSSValueDisc || valueID == CSSValueCircle || valueID = = CSSValueSquare || valueID == CSSValueNone;
347 case CSSPropertyTransformStyle: 346 case CSSPropertyTransformStyle:
348 case CSSPropertyWebkitTransformStyle:
349 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d; 347 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d;
350 case CSSPropertyWebkitUserDrag: // auto | none | element 348 case CSSPropertyWebkitUserDrag: // auto | none | element
351 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement; 349 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement;
352 case CSSPropertyWebkitUserModify: // read-only | read-write 350 case CSSPropertyWebkitUserModify: // read-only | read-write
353 return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || va lueID == CSSValueReadWritePlaintextOnly; 351 return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || va lueID == CSSValueReadWritePlaintextOnly;
354 case CSSPropertyWebkitUserSelect: // auto | none | text | all 352 case CSSPropertyWebkitUserSelect: // auto | none | text | all
355 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll; 353 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll;
356 case CSSPropertyWebkitWritingMode: 354 case CSSPropertyWebkitWritingMode:
357 return valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalB t; 355 return valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalB t;
358 case CSSPropertyWhiteSpace: // normal | pre | nowrap 356 case CSSPropertyWhiteSpace: // normal | pre | nowrap
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 case CSSPropertyTextAlignLast: 405 case CSSPropertyTextAlignLast:
408 case CSSPropertyTextDecorationStyle: 406 case CSSPropertyTextDecorationStyle:
409 case CSSPropertyTextJustify: 407 case CSSPropertyTextJustify:
410 case CSSPropertyTextOverflow: 408 case CSSPropertyTextOverflow:
411 case CSSPropertyTextRendering: 409 case CSSPropertyTextRendering:
412 case CSSPropertyTextTransform: 410 case CSSPropertyTextTransform:
413 case CSSPropertyUnicodeBidi: 411 case CSSPropertyUnicodeBidi:
414 case CSSPropertyVisibility: 412 case CSSPropertyVisibility:
415 case CSSPropertyWebkitAppearance: 413 case CSSPropertyWebkitAppearance:
416 case CSSPropertyBackfaceVisibility: 414 case CSSPropertyBackfaceVisibility:
417 case CSSPropertyWebkitBackfaceVisibility:
418 case CSSPropertyWebkitBorderAfterStyle: 415 case CSSPropertyWebkitBorderAfterStyle:
419 case CSSPropertyWebkitBorderBeforeStyle: 416 case CSSPropertyWebkitBorderBeforeStyle:
420 case CSSPropertyWebkitBorderEndStyle: 417 case CSSPropertyWebkitBorderEndStyle:
421 case CSSPropertyWebkitBorderStartStyle: 418 case CSSPropertyWebkitBorderStartStyle:
422 case CSSPropertyWebkitBoxAlign: 419 case CSSPropertyWebkitBoxAlign:
423 case CSSPropertyWebkitBoxDecorationBreak: 420 case CSSPropertyWebkitBoxDecorationBreak:
424 case CSSPropertyWebkitBoxDirection: 421 case CSSPropertyWebkitBoxDirection:
425 case CSSPropertyWebkitBoxLines: 422 case CSSPropertyWebkitBoxLines:
426 case CSSPropertyWebkitBoxOrient: 423 case CSSPropertyWebkitBoxOrient:
427 case CSSPropertyWebkitBoxPack: 424 case CSSPropertyWebkitBoxPack:
(...skipping 11 matching lines...) Expand all
439 case CSSPropertyWebkitMarginBeforeCollapse: 436 case CSSPropertyWebkitMarginBeforeCollapse:
440 case CSSPropertyWebkitMarginBottomCollapse: 437 case CSSPropertyWebkitMarginBottomCollapse:
441 case CSSPropertyWebkitMarginTopCollapse: 438 case CSSPropertyWebkitMarginTopCollapse:
442 case CSSPropertyWebkitPrintColorAdjust: 439 case CSSPropertyWebkitPrintColorAdjust:
443 case CSSPropertyWebkitRtlOrdering: 440 case CSSPropertyWebkitRtlOrdering:
444 case CSSPropertyWebkitRubyPosition: 441 case CSSPropertyWebkitRubyPosition:
445 case CSSPropertyWebkitTextCombine: 442 case CSSPropertyWebkitTextCombine:
446 case CSSPropertyWebkitTextEmphasisPosition: 443 case CSSPropertyWebkitTextEmphasisPosition:
447 case CSSPropertyWebkitTextSecurity: 444 case CSSPropertyWebkitTextSecurity:
448 case CSSPropertyTransformStyle: 445 case CSSPropertyTransformStyle:
449 case CSSPropertyWebkitTransformStyle:
450 case CSSPropertyWebkitUserDrag: 446 case CSSPropertyWebkitUserDrag:
451 case CSSPropertyWebkitUserModify: 447 case CSSPropertyWebkitUserModify:
452 case CSSPropertyWebkitUserSelect: 448 case CSSPropertyWebkitUserSelect:
453 case CSSPropertyWebkitWritingMode: 449 case CSSPropertyWebkitWritingMode:
454 case CSSPropertyWhiteSpace: 450 case CSSPropertyWhiteSpace:
455 case CSSPropertyWordBreak: 451 case CSSPropertyWordBreak:
456 case CSSPropertyWordWrap: 452 case CSSPropertyWordWrap:
457 return true; 453 return true;
458 case CSSPropertyAlignItems: 454 case CSSPropertyAlignItems:
459 case CSSPropertyAlignSelf: 455 case CSSPropertyAlignSelf:
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 if (RefPtrWillBeRawPtr<CSSValue> color = parseColorValue(propertyID, string, parserMode)) 659 if (RefPtrWillBeRawPtr<CSSValue> color = parseColorValue(propertyID, string, parserMode))
664 return color.release(); 660 return color.release();
665 if (RefPtrWillBeRawPtr<CSSValue> keyword = parseKeywordValue(propertyID, str ing)) 661 if (RefPtrWillBeRawPtr<CSSValue> keyword = parseKeywordValue(propertyID, str ing))
666 return keyword.release(); 662 return keyword.release();
667 if (RefPtrWillBeRawPtr<CSSValue> transform = parseSimpleTransform(propertyID , string)) 663 if (RefPtrWillBeRawPtr<CSSValue> transform = parseSimpleTransform(propertyID , string))
668 return transform.release(); 664 return transform.release();
669 return nullptr; 665 return nullptr;
670 } 666 }
671 667
672 } // namespace blink 668 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698