| 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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 } | 580 } |
| 581 result = true; | 581 result = true; |
| 582 } | 582 } |
| 583 m_implicitShorthand = false; | 583 m_implicitShorthand = false; |
| 584 return result; | 584 return result; |
| 585 } | 585 } |
| 586 case CSSPropertyObjectPosition: | 586 case CSSPropertyObjectPosition: |
| 587 ASSERT(RuntimeEnabledFeatures::objectFitPositionEnabled()); | 587 ASSERT(RuntimeEnabledFeatures::objectFitPositionEnabled()); |
| 588 parsedValue = parseObjectPosition(); | 588 parsedValue = parseObjectPosition(); |
| 589 break; | 589 break; |
| 590 case CSSPropertyListStyleImage: // <uri> | none | inherit | |
| 591 case CSSPropertyBorderImageSource: | 590 case CSSPropertyBorderImageSource: |
| 592 if (id == CSSValueNone) { | 591 if (id == CSSValueNone) { |
| 593 parsedValue = cssValuePool().createIdentifierValue(CSSValueNone); | 592 parsedValue = cssValuePool().createIdentifierValue(CSSValueNone); |
| 594 m_valueList->next(); | 593 m_valueList->next(); |
| 595 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { | 594 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { |
| 596 parsedValue = createCSSImageValueWithReferrer(value->string, complet
eURL(value->string)); | 595 parsedValue = createCSSImageValueWithReferrer(value->string, complet
eURL(value->string)); |
| 597 m_valueList->next(); | 596 m_valueList->next(); |
| 598 } else if (isGeneratedImageValue(value)) { | 597 } else if (isGeneratedImageValue(value)) { |
| 599 if (parseGeneratedImage(m_valueList, parsedValue)) | 598 if (parseGeneratedImage(m_valueList, parsedValue)) |
| 600 m_valueList->next(); | 599 m_valueList->next(); |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1076 return parse4Values(propId, marginShorthand().properties()); | 1075 return parse4Values(propId, marginShorthand().properties()); |
| 1077 case CSSPropertyPadding: | 1076 case CSSPropertyPadding: |
| 1078 // <padding-width>{1,4} | inherit | 1077 // <padding-width>{1,4} | inherit |
| 1079 return parse4Values(propId, paddingShorthand().properties()); | 1078 return parse4Values(propId, paddingShorthand().properties()); |
| 1080 case CSSPropertyFlexFlow: | 1079 case CSSPropertyFlexFlow: |
| 1081 return parseShorthand(propId, flexFlowShorthand()); | 1080 return parseShorthand(propId, flexFlowShorthand()); |
| 1082 case CSSPropertyFont: | 1081 case CSSPropertyFont: |
| 1083 // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [
/ 'line-height' ]? | 1082 // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [
/ 'line-height' ]? |
| 1084 // 'font-family' ] | inherit | 1083 // 'font-family' ] | inherit |
| 1085 return parseFont(); | 1084 return parseFont(); |
| 1086 case CSSPropertyListStyle: | |
| 1087 return parseShorthand(propId, listStyleShorthand()); | |
| 1088 case CSSPropertyWebkitTextStroke: | 1085 case CSSPropertyWebkitTextStroke: |
| 1089 return parseShorthand(propId, webkitTextStrokeShorthand()); | 1086 return parseShorthand(propId, webkitTextStrokeShorthand()); |
| 1090 case CSSPropertyAnimation: | 1087 case CSSPropertyAnimation: |
| 1091 return parseAnimationShorthand(propId); | 1088 return parseAnimationShorthand(propId); |
| 1092 case CSSPropertyTransition: | 1089 case CSSPropertyTransition: |
| 1093 return parseTransitionShorthand(propId); | 1090 return parseTransitionShorthand(propId); |
| 1094 case CSSPropertyInvalid: | 1091 case CSSPropertyInvalid: |
| 1095 return false; | 1092 return false; |
| 1096 case CSSPropertyPage: | 1093 case CSSPropertyPage: |
| 1097 return parsePage(propId); | 1094 return parsePage(propId); |
| (...skipping 4861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5959 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); | 5956 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); |
| 5960 } | 5957 } |
| 5961 | 5958 |
| 5962 bool CSSPropertyParser::isSystemColor(int id) | 5959 bool CSSPropertyParser::isSystemColor(int id) |
| 5963 { | 5960 { |
| 5964 // FIXME(sky): remove | 5961 // FIXME(sky): remove |
| 5965 return false; | 5962 return false; |
| 5966 } | 5963 } |
| 5967 | 5964 |
| 5968 } // namespace blink | 5965 } // namespace blink |
| OLD | NEW |