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

Side by Side Diff: sky/engine/core/css/parser/BisonCSSParser-in.cpp

Issue 731863003: Remove CSSCompositing (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: preland Created 6 years, 1 month 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 | « sky/engine/core/css/CSSProperties.in ('k') | sky/engine/core/css/parser/CSSPropertyParser.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 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 // flex | inline-flex 374 // flex | inline-flex
375 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueNone; 375 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueNone;
376 case CSSPropertyEmptyCells: // show | hide 376 case CSSPropertyEmptyCells: // show | hide
377 return valueID == CSSValueShow || valueID == CSSValueHide; 377 return valueID == CSSValueShow || valueID == CSSValueHide;
378 case CSSPropertyFontStyle: // normal | italic | oblique 378 case CSSPropertyFontStyle: // normal | italic | oblique
379 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique; 379 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique;
380 case CSSPropertyFontStretch: // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra- expanded 380 case CSSPropertyFontStretch: // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra- expanded
381 return valueID == CSSValueNormal || (valueID >= CSSValueUltraCondensed & & valueID <= CSSValueUltraExpanded); 381 return valueID == CSSValueNormal || (valueID >= CSSValueUltraCondensed & & valueID <= CSSValueUltraExpanded);
382 case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated 382 case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated
383 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated); 383 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated);
384 case CSSPropertyIsolation: // auto | isolate
385 ASSERT(RuntimeEnabledFeatures::cssCompositingEnabled());
386 return valueID == CSSValueAuto || valueID == CSSValueIsolate;
387 case CSSPropertyListStylePosition: // inside | outside 384 case CSSPropertyListStylePosition: // inside | outside
388 return valueID == CSSValueInside || valueID == CSSValueOutside; 385 return valueID == CSSValueInside || valueID == CSSValueOutside;
389 case CSSPropertyListStyleType: 386 case CSSPropertyListStyleType:
390 // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in 387 // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in
391 // for the list of supported list-style-types. 388 // for the list of supported list-style-types.
392 return (valueID >= CSSValueDisc && valueID <= CSSValueKatakanaIroha) || valueID == CSSValueNone; 389 return (valueID >= CSSValueDisc && valueID <= CSSValueKatakanaIroha) || valueID == CSSValueNone;
393 case CSSPropertyObjectFit: 390 case CSSPropertyObjectFit:
394 ASSERT(RuntimeEnabledFeatures::objectFitPositionEnabled()); 391 ASSERT(RuntimeEnabledFeatures::objectFitPositionEnabled());
395 return valueID == CSSValueFill || valueID == CSSValueContain || valueID == CSSValueCover || valueID == CSSValueNone || valueID == CSSValueScaleDown; 392 return valueID == CSSValueFill || valueID == CSSValueContain || valueID == CSSValueCover || valueID == CSSValueNone || valueID == CSSValueScaleDown;
396 case CSSPropertyOutlineStyle: // (<border-style> except hidden) | auto 393 case CSSPropertyOutlineStyle: // (<border-style> except hidden) | auto
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 case CSSPropertyUnicodeBidi: 434 case CSSPropertyUnicodeBidi:
438 return valueID == CSSValueNormal || valueID == CSSValueEmbed 435 return valueID == CSSValueNormal || valueID == CSSValueEmbed
439 || valueID == CSSValueBidiOverride || valueID == CSSValueWebkitIsola te 436 || valueID == CSSValueBidiOverride || valueID == CSSValueWebkitIsola te
440 || valueID == CSSValueWebkitIsolateOverride || valueID == CSSValueWe bkitPlaintext; 437 || valueID == CSSValueWebkitIsolateOverride || valueID == CSSValueWe bkitPlaintext;
441 case CSSPropertyTouchActionDelay: // none | script 438 case CSSPropertyTouchActionDelay: // none | script
442 ASSERT(RuntimeEnabledFeatures::cssTouchActionDelayEnabled()); 439 ASSERT(RuntimeEnabledFeatures::cssTouchActionDelayEnabled());
443 return valueID == CSSValueScript || valueID == CSSValueNone; 440 return valueID == CSSValueScript || valueID == CSSValueNone;
444 case CSSPropertyBackfaceVisibility: 441 case CSSPropertyBackfaceVisibility:
445 case CSSPropertyWebkitBackfaceVisibility: 442 case CSSPropertyWebkitBackfaceVisibility:
446 return valueID == CSSValueVisible || valueID == CSSValueHidden; 443 return valueID == CSSValueVisible || valueID == CSSValueHidden;
447 case CSSPropertyMixBlendMode:
448 ASSERT(RuntimeEnabledFeatures::cssCompositingEnabled());
449 return valueID == CSSValueNormal || valueID == CSSValueMultiply || value ID == CSSValueScreen || valueID == CSSValueOverlay
450 || valueID == CSSValueDarken || valueID == CSSValueLighten || valueI D == CSSValueColorDodge || valueID == CSSValueColorBurn
451 || valueID == CSSValueHardLight || valueID == CSSValueSoftLight || v alueID == CSSValueDifference || valueID == CSSValueExclusion
452 || valueID == CSSValueHue || valueID == CSSValueSaturation || valueI D == CSSValueColor || valueID == CSSValueLuminosity;
453 case CSSPropertyWebkitBoxDecorationBreak: 444 case CSSPropertyWebkitBoxDecorationBreak:
454 return valueID == CSSValueClone || valueID == CSSValueSlice; 445 return valueID == CSSValueClone || valueID == CSSValueSlice;
455 case CSSPropertyAlignContent: 446 case CSSPropertyAlignContent:
456 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'. 447 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
457 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround || valueID == CSSValueStretch; 448 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround || valueID == CSSValueStretch;
458 case CSSPropertyAlignItems: 449 case CSSPropertyAlignItems:
459 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 450 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
460 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch; 451 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch;
461 case CSSPropertyAlignSelf: 452 case CSSPropertyAlignSelf:
462 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 453 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 } 495 }
505 return false; 496 return false;
506 } 497 }
507 498
508 bool isKeywordPropertyID(CSSPropertyID propertyId) 499 bool isKeywordPropertyID(CSSPropertyID propertyId)
509 { 500 {
510 switch (propertyId) { 501 switch (propertyId) {
511 case CSSPropertyAlignItems: 502 case CSSPropertyAlignItems:
512 case CSSPropertyAlignSelf: 503 case CSSPropertyAlignSelf:
513 case CSSPropertyAll: 504 case CSSPropertyAll:
514 case CSSPropertyMixBlendMode:
515 case CSSPropertyIsolation:
516 case CSSPropertyBackgroundRepeatX: 505 case CSSPropertyBackgroundRepeatX:
517 case CSSPropertyBackgroundRepeatY: 506 case CSSPropertyBackgroundRepeatY:
518 case CSSPropertyBorderBottomStyle: 507 case CSSPropertyBorderBottomStyle:
519 case CSSPropertyBorderCollapse: 508 case CSSPropertyBorderCollapse:
520 case CSSPropertyBorderLeftStyle: 509 case CSSPropertyBorderLeftStyle:
521 case CSSPropertyBorderRightStyle: 510 case CSSPropertyBorderRightStyle:
522 case CSSPropertyBorderTopStyle: 511 case CSSPropertyBorderTopStyle:
523 case CSSPropertyBoxSizing: 512 case CSSPropertyBoxSizing:
524 case CSSPropertyCaptionSide: 513 case CSSPropertyCaptionSide:
525 case CSSPropertyDirection: 514 case CSSPropertyDirection:
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1844 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType); 1833 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType);
1845 } 1834 }
1846 1835
1847 void BisonCSSParser::startEndUnknownRule() 1836 void BisonCSSParser::startEndUnknownRule()
1848 { 1837 {
1849 if (m_observer) 1838 if (m_observer)
1850 m_observer->startEndUnknownRule(); 1839 m_observer->startEndUnknownRule();
1851 } 1840 }
1852 1841
1853 } 1842 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSProperties.in ('k') | sky/engine/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698