| 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 14 matching lines...) Expand all Loading... |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/css/parser/CSSPropertyParser.h" | 28 #include "core/css/parser/CSSPropertyParser.h" |
| 29 | 29 |
| 30 #include "core/StylePropertyShorthand.h" | 30 #include "core/StylePropertyShorthand.h" |
| 31 #include "core/css/CSSBasicShapes.h" | 31 #include "core/css/CSSBasicShapes.h" |
| 32 #include "core/css/CSSBorderImage.h" | 32 #include "core/css/CSSBorderImage.h" |
| 33 #include "core/css/CSSCanvasValue.h" | 33 #include "core/css/CSSCanvasValue.h" |
| 34 #include "core/css/CSSContentDistributionValue.h" | 34 #include "core/css/CSSContentDistributionValue.h" |
| 35 #include "core/css/CSSCounterValue.h" |
| 35 #include "core/css/CSSCrossfadeValue.h" | 36 #include "core/css/CSSCrossfadeValue.h" |
| 36 #include "core/css/CSSCursorImageValue.h" | 37 #include "core/css/CSSCursorImageValue.h" |
| 37 #include "core/css/CSSFontFaceSrcValue.h" | 38 #include "core/css/CSSFontFaceSrcValue.h" |
| 38 #include "core/css/CSSFontFeatureValue.h" | 39 #include "core/css/CSSFontFeatureValue.h" |
| 39 #include "core/css/CSSFunctionValue.h" | 40 #include "core/css/CSSFunctionValue.h" |
| 40 #include "core/css/CSSGridLineNamesValue.h" | 41 #include "core/css/CSSGridLineNamesValue.h" |
| 41 #include "core/css/CSSImageSetValue.h" | 42 #include "core/css/CSSImageSetValue.h" |
| 42 #include "core/css/CSSImageValue.h" | 43 #include "core/css/CSSImageValue.h" |
| 43 #include "core/css/CSSLineBoxContainValue.h" | 44 #include "core/css/CSSLineBoxContainValue.h" |
| 44 #include "core/css/CSSPathValue.h" | 45 #include "core/css/CSSPathValue.h" |
| 45 #include "core/css/CSSPrimitiveValueMappings.h" | 46 #include "core/css/CSSPrimitiveValueMappings.h" |
| 46 #include "core/css/CSSProperty.h" | 47 #include "core/css/CSSProperty.h" |
| 47 #include "core/css/CSSPropertyMetadata.h" | 48 #include "core/css/CSSPropertyMetadata.h" |
| 48 #include "core/css/CSSReflectValue.h" | 49 #include "core/css/CSSReflectValue.h" |
| 49 #include "core/css/CSSSVGDocumentValue.h" | 50 #include "core/css/CSSSVGDocumentValue.h" |
| 50 #include "core/css/CSSShadowValue.h" | 51 #include "core/css/CSSShadowValue.h" |
| 51 #include "core/css/CSSTimingFunctionValue.h" | 52 #include "core/css/CSSTimingFunctionValue.h" |
| 52 #include "core/css/CSSUnicodeRangeValue.h" | 53 #include "core/css/CSSUnicodeRangeValue.h" |
| 53 #include "core/css/CSSValuePool.h" | 54 #include "core/css/CSSValuePool.h" |
| 54 #include "core/css/Counter.h" | |
| 55 #include "core/css/HashTools.h" | 55 #include "core/css/HashTools.h" |
| 56 #include "core/css/Pair.h" | 56 #include "core/css/Pair.h" |
| 57 #include "core/css/Rect.h" | 57 #include "core/css/Rect.h" |
| 58 #include "core/css/parser/CSSParserFastPaths.h" | 58 #include "core/css/parser/CSSParserFastPaths.h" |
| 59 #include "core/css/parser/CSSParserValues.h" | 59 #include "core/css/parser/CSSParserValues.h" |
| 60 #include "core/frame/UseCounter.h" | 60 #include "core/frame/UseCounter.h" |
| 61 #include "core/layout/LayoutTheme.h" | 61 #include "core/layout/LayoutTheme.h" |
| 62 #include "core/style/GridCoordinate.h" | 62 #include "core/style/GridCoordinate.h" |
| 63 #include "core/svg/SVGPathUtilities.h" | 63 #include "core/svg/SVGPathUtilities.h" |
| 64 #include "platform/RuntimeEnabledFeatures.h" | 64 #include "platform/RuntimeEnabledFeatures.h" |
| (...skipping 3910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3975 | 3975 |
| 3976 CSSValueID listStyleID = CSSValueInvalid; | 3976 CSSValueID listStyleID = CSSValueInvalid; |
| 3977 if (i->id == CSSValueNone || (i->id >= CSSValueDisc && i->id <= CSSValue
KatakanaIroha)) | 3977 if (i->id == CSSValueNone || (i->id >= CSSValueDisc && i->id <= CSSValue
KatakanaIroha)) |
| 3978 listStyleID = i->id; | 3978 listStyleID = i->id; |
| 3979 else | 3979 else |
| 3980 return nullptr; | 3980 return nullptr; |
| 3981 | 3981 |
| 3982 listStyle = cssValuePool().createIdentifierValue(listStyleID); | 3982 listStyle = cssValuePool().createIdentifierValue(listStyleID); |
| 3983 } | 3983 } |
| 3984 | 3984 |
| 3985 return cssValuePool().createValue(Counter::create(identifier.release(), list
Style.release(), separator.release())); | 3985 return CSSCounterValue::create(identifier.release(), listStyle.release(), se
parator.release()); |
| 3986 } | 3986 } |
| 3987 | 3987 |
| 3988 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseClipShape() | 3988 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseClipShape() |
| 3989 { | 3989 { |
| 3990 CSSParserValue* value = m_valueList->current(); | 3990 CSSParserValue* value = m_valueList->current(); |
| 3991 CSSParserValueList* args = value->function->args.get(); | 3991 CSSParserValueList* args = value->function->args.get(); |
| 3992 | 3992 |
| 3993 if (value->function->id != CSSValueRect || !args) | 3993 if (value->function->id != CSSValueRect || !args) |
| 3994 return nullptr; | 3994 return nullptr; |
| 3995 | 3995 |
| (...skipping 4113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8109 } | 8109 } |
| 8110 } | 8110 } |
| 8111 | 8111 |
| 8112 if (!list->length()) | 8112 if (!list->length()) |
| 8113 return nullptr; | 8113 return nullptr; |
| 8114 | 8114 |
| 8115 return list.release(); | 8115 return list.release(); |
| 8116 } | 8116 } |
| 8117 | 8117 |
| 8118 } // namespace blink | 8118 } // namespace blink |
| OLD | NEW |