| 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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 return AnimPlayStatePlaying; | 362 return AnimPlayStatePlaying; |
| 363 } | 363 } |
| 364 | 364 |
| 365 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
ue* value) | 365 CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
ue* value) |
| 366 { | 366 { |
| 367 if (value->isInitialValue()) | 367 if (value->isInitialValue()) |
| 368 return CSSTransitionData::initialProperty(); | 368 return CSSTransitionData::initialProperty(); |
| 369 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 369 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 370 if (primitiveValue->isCustomIdent()) | 370 if (primitiveValue->isCustomIdent()) |
| 371 return CSSTransitionData::TransitionProperty(primitiveValue->getStringVa
lue()); | 371 return CSSTransitionData::TransitionProperty(primitiveValue->getStringVa
lue()); |
| 372 if (primitiveValue->getValueID() == CSSValueAll) | |
| 373 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onAll); | |
| 374 if (primitiveValue->getValueID() == CSSValueNone) | 372 if (primitiveValue->getValueID() == CSSValueNone) |
| 375 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onNone); | 373 return CSSTransitionData::TransitionProperty(CSSTransitionData::Transiti
onNone); |
| 376 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID()
); | 374 return CSSTransitionData::TransitionProperty(primitiveValue->getPropertyID()
); |
| 377 } | 375 } |
| 378 | 376 |
| 379 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v
alue, bool allowStepMiddle) | 377 PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue* v
alue, bool allowStepMiddle) |
| 380 { | 378 { |
| 381 // FIXME: We should probably only call into this function with a valid | 379 // FIXME: We should probably only call into this function with a valid |
| 382 // single timing function value which isn't initial or inherit. We can | 380 // single timing function value which isn't initial or inherit. We can |
| 383 // currently get into here with initial since the parser expands unset | 381 // currently get into here with initial since the parser expands unset |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 verticalRule = SpaceImageRule; | 583 verticalRule = SpaceImageRule; |
| 586 break; | 584 break; |
| 587 default: // CSSValueRepeat | 585 default: // CSSValueRepeat |
| 588 verticalRule = RepeatImageRule; | 586 verticalRule = RepeatImageRule; |
| 589 break; | 587 break; |
| 590 } | 588 } |
| 591 image.setVerticalRule(verticalRule); | 589 image.setVerticalRule(verticalRule); |
| 592 } | 590 } |
| 593 | 591 |
| 594 }; | 592 }; |
| OLD | NEW |