OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r
ights reserved. |
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 return AnimPlayStatePaused; | 372 return AnimPlayStatePaused; |
373 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueRunning); | 373 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueRunning); |
374 return AnimPlayStatePlaying; | 374 return AnimPlayStatePlaying; |
375 } | 375 } |
376 | 376 |
377 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
ue* value) | 377 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
ue* value) |
378 { | 378 { |
379 if (value->isInitialValue()) | 379 if (value->isInitialValue()) |
380 return CSSTransitionData::initialProperty(); | 380 return CSSTransitionData::initialProperty(); |
381 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 381 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 382 if (primitiveValue->isString()) |
| 383 return CSSTransitionData::TransitionProperty(primitiveValue->getStringVa
lue()); |
382 if (primitiveValue->getValueID() == CSSValueAll) | 384 if (primitiveValue->getValueID() == CSSValueAll) |
383 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onAll); | 385 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onAll); |
384 if (primitiveValue->getValueID() == CSSValueNone) | 386 if (primitiveValue->getValueID() == CSSValueNone) |
385 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onNone); | 387 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onNone); |
386 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID()
); | 388 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID()
); |
387 } | 389 } |
388 | 390 |
389 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v
alue, bool allowStepMiddle) | 391 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v
alue, bool allowStepMiddle) |
390 { | 392 { |
391 // FIXME: We should probably only call into this function with a valid | 393 // FIXME: We should probably only call into this function with a valid |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 verticalRule = SpaceImageRule; | 596 verticalRule = SpaceImageRule; |
595 break; | 597 break; |
596 default: // CSSValueRepeat | 598 default: // CSSValueRepeat |
597 verticalRule = RepeatImageRule; | 599 verticalRule = RepeatImageRule; |
598 break; | 600 break; |
599 } | 601 } |
600 image.setVerticalRule(verticalRule); | 602 image.setVerticalRule(verticalRule); |
601 } | 603 } |
602 | 604 |
603 }; | 605 }; |
OLD | NEW |