| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 | 525 |
| 526 // Apply results to target elements. | 526 // Apply results to target elements. |
| 527 for (unsigned i = 0; i < animationsToApplySize; ++i) | 527 for (unsigned i = 0; i < animationsToApplySize; ++i) |
| 528 animationsToApply[i]->applyResultsToTarget(); | 528 animationsToApply[i]->applyResultsToTarget(); |
| 529 | 529 |
| 530 #if ENABLE(ASSERT) | 530 #if ENABLE(ASSERT) |
| 531 m_preventScheduledAnimationsChanges = false; | 531 m_preventScheduledAnimationsChanges = false; |
| 532 #endif | 532 #endif |
| 533 | 533 |
| 534 for (unsigned i = 0; i < animationsToApplySize; ++i) { | 534 for (unsigned i = 0; i < animationsToApplySize; ++i) { |
| 535 if (animationsToApply[i]->inDocument() && animationsToApply[i]->isSVGDis
cardElement()) { | 535 if (animationsToApply[i]->inShadowIncludingDocument() && animationsToApp
ly[i]->isSVGDiscardElement()) { |
| 536 SVGSMILElement* animDiscard = animationsToApply[i]; | 536 SVGSMILElement* animDiscard = animationsToApply[i]; |
| 537 SVGElement* targetElement = animDiscard->targetElement(); | 537 SVGElement* targetElement = animDiscard->targetElement(); |
| 538 if (targetElement && targetElement->inDocument()) { | 538 if (targetElement && targetElement->inShadowIncludingDocument()) { |
| 539 targetElement->remove(IGNORE_EXCEPTION); | 539 targetElement->remove(IGNORE_EXCEPTION); |
| 540 ASSERT(!targetElement->inDocument()); | 540 ASSERT(!targetElement->inShadowIncludingDocument()); |
| 541 } | 541 } |
| 542 | 542 |
| 543 if (animDiscard->inDocument()) { | 543 if (animDiscard->inShadowIncludingDocument()) { |
| 544 animDiscard->remove(IGNORE_EXCEPTION); | 544 animDiscard->remove(IGNORE_EXCEPTION); |
| 545 ASSERT(!animDiscard->inDocument()); | 545 ASSERT(!animDiscard->inShadowIncludingDocument()); |
| 546 } | 546 } |
| 547 } | 547 } |
| 548 } | 548 } |
| 549 return earliestFireTime; | 549 return earliestFireTime; |
| 550 } | 550 } |
| 551 | 551 |
| 552 void SMILTimeContainer::advanceFrameForTesting() | 552 void SMILTimeContainer::advanceFrameForTesting() |
| 553 { | 553 { |
| 554 setElapsed(elapsed().value() + initialFrameDelay); | 554 setElapsed(elapsed().value() + initialFrameDelay); |
| 555 } | 555 } |
| 556 | 556 |
| 557 DEFINE_TRACE(SMILTimeContainer) | 557 DEFINE_TRACE(SMILTimeContainer) |
| 558 { | 558 { |
| 559 visitor->trace(m_scheduledAnimations); | 559 visitor->trace(m_scheduledAnimations); |
| 560 visitor->trace(m_ownerSVGElement); | 560 visitor->trace(m_ownerSVGElement); |
| 561 } | 561 } |
| 562 | 562 |
| 563 } // namespace blink | 563 } // namespace blink |
| OLD | NEW |