Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 395 // table-column-group | table-column | table-cell | table-caption | -web kit-box | -webkit-inline-box | none | 395 // table-column-group | table-column | table-cell | table-caption | -web kit-box | -webkit-inline-box | none |
| 396 // flex | inline-flex | -webkit-flex | -webkit-inline-flex | grid | inli ne-grid | lazy-block | 396 // flex | inline-flex | -webkit-flex | -webkit-inline-flex | grid | inli ne-grid | lazy-block |
| 397 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueWebkitFlex || valueID == CSSValueWebkitInlineFlex || valueID = = CSSValueNone | 397 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueWebkitFlex || valueID == CSSValueWebkitInlineFlex || valueID = = CSSValueNone |
| 398 || (RuntimeEnabledFeatures::cssGridLayoutEnabled() && (valueID == CS SValueGrid || valueID == CSSValueInlineGrid)); | 398 || (RuntimeEnabledFeatures::cssGridLayoutEnabled() && (valueID == CS SValueGrid || valueID == CSSValueInlineGrid)); |
| 399 case CSSPropertyEmptyCells: // show | hide | 399 case CSSPropertyEmptyCells: // show | hide |
| 400 return valueID == CSSValueShow || valueID == CSSValueHide; | 400 return valueID == CSSValueShow || valueID == CSSValueHide; |
| 401 case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none) | 401 case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none) |
| 402 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone || valueID == CSSValueCenter; | 402 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone || valueID == CSSValueCenter; |
| 403 case CSSPropertyFontStyle: // normal | italic | oblique | 403 case CSSPropertyFontStyle: // normal | italic | oblique |
| 404 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique; | 404 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique; |
| 405 case CSSPropertyImageRendering: // auto | optimizeContrast | 405 case CSSPropertyImageRendering: // auto | optimizeContrast |
|
Mike Lawther (Google)
2014/06/20 04:26:50
Can you please update this comment for consistency
jackhou
2014/06/20 07:14:44
Done.
| |
| 406 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast; | 406 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated); |
| 407 case CSSPropertyIsolation: // auto | isolate | 407 case CSSPropertyIsolation: // auto | isolate |
| 408 return RuntimeEnabledFeatures::cssCompositingEnabled() | 408 return RuntimeEnabledFeatures::cssCompositingEnabled() |
| 409 && (valueID == CSSValueAuto || valueID == CSSValueIsolate); | 409 && (valueID == CSSValueAuto || valueID == CSSValueIsolate); |
| 410 case CSSPropertyListStylePosition: // inside | outside | 410 case CSSPropertyListStylePosition: // inside | outside |
| 411 return valueID == CSSValueInside || valueID == CSSValueOutside; | 411 return valueID == CSSValueInside || valueID == CSSValueOutside; |
| 412 case CSSPropertyListStyleType: | 412 case CSSPropertyListStyleType: |
| 413 // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in | 413 // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in |
| 414 // for the list of supported list-style-types. | 414 // for the list of supported list-style-types. |
| 415 return (valueID >= CSSValueDisc && valueID <= CSSValueKatakanaIroha) || valueID == CSSValueNone; | 415 return (valueID >= CSSValueDisc && valueID <= CSSValueKatakanaIroha) || valueID == CSSValueNone; |
| 416 case CSSPropertyObjectFit: | 416 case CSSPropertyObjectFit: |
| (...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2075 rule->setProperties(createStylePropertySet()); | 2075 rule->setProperties(createStylePropertySet()); |
| 2076 clearProperties(); | 2076 clearProperties(); |
| 2077 | 2077 |
| 2078 StyleRuleViewport* result = rule.get(); | 2078 StyleRuleViewport* result = rule.get(); |
| 2079 m_parsedRules.append(rule.release()); | 2079 m_parsedRules.append(rule.release()); |
| 2080 | 2080 |
| 2081 return result; | 2081 return result; |
| 2082 } | 2082 } |
| 2083 | 2083 |
| 2084 } | 2084 } |
| OLD | NEW |