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

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

Issue 203523002: Reland "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/fix for ASSERT 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/parser/CSSPropertyParser.h » ('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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 // table-column-group | table-column | table-cell | table-caption | -web kit-box | -webkit-inline-box | none 390 // table-column-group | table-column | table-cell | table-caption | -web kit-box | -webkit-inline-box | none
391 // flex | inline-flex | -webkit-flex | -webkit-inline-flex | grid | inli ne-grid | lazy-block 391 // flex | inline-flex | -webkit-flex | -webkit-inline-flex | grid | inli ne-grid | lazy-block
392 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueWebkitFlex || valueID == CSSValueWebkitInlineFlex || valueID = = CSSValueNone 392 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueWebkitFlex || valueID == CSSValueWebkitInlineFlex || valueID = = CSSValueNone
393 || (RuntimeEnabledFeatures::cssGridLayoutEnabled() && (valueID == CS SValueGrid || valueID == CSSValueInlineGrid)); 393 || (RuntimeEnabledFeatures::cssGridLayoutEnabled() && (valueID == CS SValueGrid || valueID == CSSValueInlineGrid));
394 case CSSPropertyEmptyCells: // show | hide 394 case CSSPropertyEmptyCells: // show | hide
395 return valueID == CSSValueShow || valueID == CSSValueHide; 395 return valueID == CSSValueShow || valueID == CSSValueHide;
396 case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none) 396 case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none)
397 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone || valueID == CSSValueCenter; 397 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone || valueID == CSSValueCenter;
398 case CSSPropertyFontStyle: // normal | italic | oblique 398 case CSSPropertyFontStyle: // normal | italic | oblique
399 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique; 399 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique;
400 case CSSPropertyFontStretch: // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra- expanded
401 return valueID == CSSValueNormal || valueID == CSSValueUltraCondensed || valueID == CSSValueExtraCondensed || valueID == CSSValueCondensed || valueID == CSSValueSemiCondensed || valueID == CSSValueSemiExpanded || valueID == CSSValue Expanded || valueID == CSSValueExtraExpanded || valueID == CSSValueUltraExpanded ;
400 case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated 402 case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated
401 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated); 403 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated);
402 case CSSPropertyIsolation: // auto | isolate 404 case CSSPropertyIsolation: // auto | isolate
403 return RuntimeEnabledFeatures::cssCompositingEnabled() 405 return RuntimeEnabledFeatures::cssCompositingEnabled()
404 && (valueID == CSSValueAuto || valueID == CSSValueIsolate); 406 && (valueID == CSSValueAuto || valueID == CSSValueIsolate);
405 case CSSPropertyListStylePosition: // inside | outside 407 case CSSPropertyListStylePosition: // inside | outside
406 return valueID == CSSValueInside || valueID == CSSValueOutside; 408 return valueID == CSSValueInside || valueID == CSSValueOutside;
407 case CSSPropertyListStyleType: 409 case CSSPropertyListStyleType:
408 // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in 410 // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in
409 // for the list of supported list-style-types. 411 // for the list of supported list-style-types.
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 case CSSPropertyBorderRightStyle: 574 case CSSPropertyBorderRightStyle:
573 case CSSPropertyBorderTopStyle: 575 case CSSPropertyBorderTopStyle:
574 case CSSPropertyBoxSizing: 576 case CSSPropertyBoxSizing:
575 case CSSPropertyCaptionSide: 577 case CSSPropertyCaptionSide:
576 case CSSPropertyClear: 578 case CSSPropertyClear:
577 case CSSPropertyDirection: 579 case CSSPropertyDirection:
578 case CSSPropertyDisplay: 580 case CSSPropertyDisplay:
579 case CSSPropertyEmptyCells: 581 case CSSPropertyEmptyCells:
580 case CSSPropertyFloat: 582 case CSSPropertyFloat:
581 case CSSPropertyFontStyle: 583 case CSSPropertyFontStyle:
584 case CSSPropertyFontStretch:
582 case CSSPropertyImageRendering: 585 case CSSPropertyImageRendering:
583 case CSSPropertyListStylePosition: 586 case CSSPropertyListStylePosition:
584 case CSSPropertyListStyleType: 587 case CSSPropertyListStyleType:
585 case CSSPropertyObjectFit: 588 case CSSPropertyObjectFit:
586 case CSSPropertyOutlineStyle: 589 case CSSPropertyOutlineStyle:
587 case CSSPropertyOverflowWrap: 590 case CSSPropertyOverflowWrap:
588 case CSSPropertyOverflowX: 591 case CSSPropertyOverflowX:
589 case CSSPropertyOverflowY: 592 case CSSPropertyOverflowY:
590 case CSSPropertyPageBreakAfter: 593 case CSSPropertyPageBreakAfter:
591 case CSSPropertyPageBreakBefore: 594 case CSSPropertyPageBreakBefore:
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
2091 rule->setProperties(createStylePropertySet()); 2094 rule->setProperties(createStylePropertySet());
2092 clearProperties(); 2095 clearProperties();
2093 2096
2094 StyleRuleViewport* result = rule.get(); 2097 StyleRuleViewport* result = rule.get();
2095 m_parsedRules.append(rule.release()); 2098 m_parsedRules.append(rule.release());
2096 2099
2097 return result; 2100 return result;
2098 } 2101 }
2099 2102
2100 } 2103 }
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698