Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Side by Side Diff: third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp

Issue 2149893003: Rename Node::inShadowIncludingDocument() to Node::isConnected() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 514
515 // Apply results to target elements. 515 // Apply results to target elements.
516 for (unsigned i = 0; i < animationsToApplySize; ++i) 516 for (unsigned i = 0; i < animationsToApplySize; ++i)
517 animationsToApply[i]->applyResultsToTarget(); 517 animationsToApply[i]->applyResultsToTarget();
518 518
519 #if ENABLE(ASSERT) 519 #if ENABLE(ASSERT)
520 m_preventScheduledAnimationsChanges = false; 520 m_preventScheduledAnimationsChanges = false;
521 #endif 521 #endif
522 522
523 for (unsigned i = 0; i < animationsToApplySize; ++i) { 523 for (unsigned i = 0; i < animationsToApplySize; ++i) {
524 if (animationsToApply[i]->inShadowIncludingDocument() && animationsToApp ly[i]->isSVGDiscardElement()) { 524 if (animationsToApply[i]->isConnected() && animationsToApply[i]->isSVGDi scardElement()) {
525 SVGSMILElement* animDiscard = animationsToApply[i]; 525 SVGSMILElement* animDiscard = animationsToApply[i];
526 SVGElement* targetElement = animDiscard->targetElement(); 526 SVGElement* targetElement = animDiscard->targetElement();
527 if (targetElement && targetElement->inShadowIncludingDocument()) { 527 if (targetElement && targetElement->isConnected()) {
528 targetElement->remove(IGNORE_EXCEPTION); 528 targetElement->remove(IGNORE_EXCEPTION);
529 ASSERT(!targetElement->inShadowIncludingDocument()); 529 ASSERT(!targetElement->isConnected());
530 } 530 }
531 531
532 if (animDiscard->inShadowIncludingDocument()) { 532 if (animDiscard->isConnected()) {
533 animDiscard->remove(IGNORE_EXCEPTION); 533 animDiscard->remove(IGNORE_EXCEPTION);
534 ASSERT(!animDiscard->inShadowIncludingDocument()); 534 ASSERT(!animDiscard->isConnected());
535 } 535 }
536 } 536 }
537 } 537 }
538 return earliestFireTime; 538 return earliestFireTime;
539 } 539 }
540 540
541 void SMILTimeContainer::advanceFrameForTesting() 541 void SMILTimeContainer::advanceFrameForTesting()
542 { 542 {
543 setElapsed(elapsed().value() + initialFrameDelay); 543 setElapsed(elapsed().value() + initialFrameDelay);
544 } 544 }
545 545
546 DEFINE_TRACE(SMILTimeContainer) 546 DEFINE_TRACE(SMILTimeContainer)
547 { 547 {
548 visitor->trace(m_scheduledAnimations); 548 visitor->trace(m_scheduledAnimations);
549 visitor->trace(m_ownerSVGElement); 549 visitor->trace(m_ownerSVGElement);
550 } 550 }
551 551
552 } // namespace blink 552 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGUseElement.cpp ('k') | third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698