| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| (...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 static bool createGridPosition(CSSValue* value, GridPosition& position) | 959 static bool createGridPosition(CSSValue* value, GridPosition& position) |
| 960 { | 960 { |
| 961 // We accept the specification's grammar: | 961 // We accept the specification's grammar: |
| 962 // 'auto' | [ <integer> || <string> ] | [ span && [ <integer> || string ] ]
| <ident> | 962 // 'auto' | [ <integer> || <string> ] | [ span && [ <integer> || string ] ]
| <ident> |
| 963 | 963 |
| 964 if (value->isPrimitiveValue()) { | 964 if (value->isPrimitiveValue()) { |
| 965 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 965 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 966 // We translate <ident> to <string> during parsing as it | 966 // We translate <ident> to <string> during parsing as it |
| 967 // makes handling it more simple. | 967 // makes handling it more simple. |
| 968 if (primitiveValue->isString()) { | 968 if (primitiveValue->isString()) { |
| 969 // Note that a <ident> could be either a grid area or a grid line na
me. We create them as grid areas but the |
| 970 // StyleAdjuster will have to check if this is the name of a grid ar
ea, the name of a grid line or the |
| 971 // prefix of a grid line named <ident>-start or <ident>-end. |
| 969 position.setNamedGridArea(primitiveValue->getStringValue()); | 972 position.setNamedGridArea(primitiveValue->getStringValue()); |
| 970 return true; | 973 return true; |
| 971 } | 974 } |
| 972 | 975 |
| 973 ASSERT(primitiveValue->getValueID() == CSSValueAuto); | 976 ASSERT(primitiveValue->getValueID() == CSSValueAuto); |
| 974 return true; | 977 return true; |
| 975 } | 978 } |
| 976 | 979 |
| 977 CSSValueList* values = toCSSValueList(value); | 980 CSSValueList* values = toCSSValueList(value); |
| 978 ASSERT(values->length()); | 981 ASSERT(values->length()); |
| (...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2210 break; | 2213 break; |
| 2211 } | 2214 } |
| 2212 case CSSPropertyEnableBackground: | 2215 case CSSPropertyEnableBackground: |
| 2213 // Silently ignoring this property for now | 2216 // Silently ignoring this property for now |
| 2214 // http://bugs.webkit.org/show_bug.cgi?id=6022 | 2217 // http://bugs.webkit.org/show_bug.cgi?id=6022 |
| 2215 break; | 2218 break; |
| 2216 } | 2219 } |
| 2217 } | 2220 } |
| 2218 | 2221 |
| 2219 } // namespace WebCore | 2222 } // namespace WebCore |
| OLD | NEW |