| 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, 2013 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights 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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 | 349 |
| 350 // The animating element may be this element, or its pseudo element. It is | 350 // The animating element may be this element, or its pseudo element. It is |
| 351 // null when calculating the style for a potential pseudo element that has | 351 // null when calculating the style for a potential pseudo element that has |
| 352 // yet to be created. | 352 // yet to be created. |
| 353 ASSERT(animatingElement == element || !animatingElement || animatingElement-
>parentOrShadowHostElement() == element); | 353 ASSERT(animatingElement == element || !animatingElement || animatingElement-
>parentOrShadowHostElement() == element); |
| 354 | 354 |
| 355 if (!(animatingElement && animatingElement->hasActiveAnimations()) | 355 if (!(animatingElement && animatingElement->hasActiveAnimations()) |
| 356 && !state.style()->transitions() && !state.style()->animations()) | 356 && !state.style()->transitions() && !state.style()->animations()) |
| 357 return false; | 357 return false; |
| 358 | 358 |
| 359 state.setAnimationUpdate(CSSAnimations::calculateUpdate(animatingElement, *e
lement, *state.style(), state.parentStyle(), this)); | 359 state.setAnimationUpdate(CSSAnimations::calculateUpdate(animatingElement, *e
lement, *state.style(), state.parentStyle())); |
| 360 if (!state.animationUpdate()) | 360 if (!state.animationUpdate()) |
| 361 return false; | 361 return false; |
| 362 | 362 |
| 363 const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolationsFo
rAnimations = state.animationUpdate()->activeInterpolationsForAnimations(); | 363 const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolationsFo
rAnimations = state.animationUpdate()->activeInterpolationsForAnimations(); |
| 364 const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolationsFo
rTransitions = state.animationUpdate()->activeInterpolationsForTransitions(); | 364 const HashMap<CSSPropertyID, RefPtr<Interpolation> >& activeInterpolationsFo
rTransitions = state.animationUpdate()->activeInterpolationsForTransitions(); |
| 365 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF
orAnimations); | 365 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF
orAnimations); |
| 366 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF
orTransitions); | 366 applyAnimatedProperties<HighPriorityProperties>(state, activeInterpolationsF
orTransitions); |
| 367 | 367 |
| 368 updateFont(state); | 368 updateFont(state); |
| 369 | 369 |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 break; | 643 break; |
| 644 default: | 644 default: |
| 645 break; | 645 break; |
| 646 } | 646 } |
| 647 StyleBuilder::applyProperty(properties[i].property, state, propertie
s[i].value); | 647 StyleBuilder::applyProperty(properties[i].property, state, propertie
s[i].value); |
| 648 } | 648 } |
| 649 } | 649 } |
| 650 } | 650 } |
| 651 | 651 |
| 652 } // namespace blink | 652 } // namespace blink |
| OLD | NEW |