| 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 { | 264 { |
| 265 CSSPropertyID propId = resolveCSSPropertyID(unresolvedProperty); | 265 CSSPropertyID propId = resolveCSSPropertyID(unresolvedProperty); |
| 266 | 266 |
| 267 // Note: m_parsedCalculation is used to pass the calc value to validUnit and
then cleared at the end of this function. | 267 // Note: m_parsedCalculation is used to pass the calc value to validUnit and
then cleared at the end of this function. |
| 268 // FIXME: This is to avoid having to pass parsedCalc to all validUnit caller
s. | 268 // FIXME: This is to avoid having to pass parsedCalc to all validUnit caller
s. |
| 269 ASSERT(!m_parsedCalculation); | 269 ASSERT(!m_parsedCalculation); |
| 270 | 270 |
| 271 RefPtrWillBeRawPtr<CSSValue> parsedValue = nullptr; | 271 RefPtrWillBeRawPtr<CSSValue> parsedValue = nullptr; |
| 272 | 272 |
| 273 switch (propId) { | 273 switch (propId) { |
| 274 case CSSPropertyBackgroundColor: // <color> | inherit | |
| 275 parsedValue = parseColor(m_valueList->current(), inQuirksMode() && !inSh
orthand()); | |
| 276 if (parsedValue) | |
| 277 m_valueList->next(); | |
| 278 break; | |
| 279 | |
| 280 case CSSPropertyBackgroundBlendMode: | |
| 281 case CSSPropertyBackgroundAttachment: | |
| 282 case CSSPropertyBackgroundClip: | |
| 283 case CSSPropertyWebkitBackgroundClip: | |
| 284 case CSSPropertyWebkitBackgroundComposite: | |
| 285 case CSSPropertyBackgroundImage: | |
| 286 case CSSPropertyBackgroundOrigin: | |
| 287 case CSSPropertyMaskSourceType: | |
| 288 case CSSPropertyWebkitBackgroundOrigin: | |
| 289 case CSSPropertyBackgroundPositionX: | |
| 290 case CSSPropertyBackgroundPositionY: | |
| 291 case CSSPropertyBackgroundSize: | |
| 292 case CSSPropertyWebkitMaskClip: | |
| 293 case CSSPropertyWebkitMaskComposite: | |
| 294 case CSSPropertyWebkitMaskImage: | |
| 295 case CSSPropertyWebkitMaskOrigin: | |
| 296 case CSSPropertyWebkitMaskPositionX: | |
| 297 case CSSPropertyWebkitMaskPositionY: | |
| 298 case CSSPropertyWebkitMaskSize: | |
| 299 case CSSPropertyWebkitMaskRepeatX: | |
| 300 case CSSPropertyWebkitMaskRepeatY: | |
| 301 { | |
| 302 RefPtrWillBeRawPtr<CSSValue> dummyValue = nullptr; | |
| 303 CSSPropertyID propId1, propId2; | |
| 304 if (!parseFillProperty(unresolvedProperty, propId1, propId2, parsedValue
, dummyValue)) | |
| 305 return nullptr; | |
| 306 ASSERT(!dummyValue); | |
| 307 break; | |
| 308 } | |
| 309 case CSSPropertyJustifySelf: | 274 case CSSPropertyJustifySelf: |
| 310 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); | 275 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
| 311 parsedValue = parseItemPositionOverflowPosition(); | 276 parsedValue = parseItemPositionOverflowPosition(); |
| 312 break; | 277 break; |
| 313 case CSSPropertyJustifyItems: | 278 case CSSPropertyJustifyItems: |
| 314 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); | 279 ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
| 315 | 280 |
| 316 if ((parsedValue = parseLegacyPosition())) | 281 if ((parsedValue = parseLegacyPosition())) |
| 317 break; | 282 break; |
| 318 | 283 |
| (...skipping 2839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3158 ASSERT(!m_parsedCalculation); | 3123 ASSERT(!m_parsedCalculation); |
| 3159 m_parsedCalculation = CSSCalcValue::create(args, range); | 3124 m_parsedCalculation = CSSCalcValue::create(args, range); |
| 3160 | 3125 |
| 3161 if (!m_parsedCalculation) | 3126 if (!m_parsedCalculation) |
| 3162 return false; | 3127 return false; |
| 3163 | 3128 |
| 3164 return true; | 3129 return true; |
| 3165 } | 3130 } |
| 3166 | 3131 |
| 3167 } // namespace blink | 3132 } // namespace blink |
| OLD | NEW |