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

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

Issue 1425143006: Revert of Web Animations: Use a single animation clock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/core/page/PageAnimator.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 return *m_ownerSVGElement; 406 return *m_ownerSVGElement;
407 } 407 }
408 408
409 Document& SMILTimeContainer::document() const 409 Document& SMILTimeContainer::document() const
410 { 410 {
411 return ownerSVGElement().document(); 411 return ownerSVGElement().document();
412 } 412 }
413 413
414 double SMILTimeContainer::currentTime() const 414 double SMILTimeContainer::currentTime() const
415 { 415 {
416 return document().timeline().currentTimeInternal(); 416 return document().animationClock().currentTime();
417 } 417 }
418 418
419 void SMILTimeContainer::serviceOnNextFrame() 419 void SMILTimeContainer::serviceOnNextFrame()
420 { 420 {
421 if (document().view()) { 421 if (document().view()) {
422 document().view()->scheduleAnimation(); 422 document().view()->scheduleAnimation();
423 m_frameSchedulingState = AnimationFrame; 423 m_frameSchedulingState = AnimationFrame;
424 } 424 }
425 } 425 }
426 426
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 556
557 DEFINE_TRACE(SMILTimeContainer) 557 DEFINE_TRACE(SMILTimeContainer)
558 { 558 {
559 #if ENABLE(OILPAN) 559 #if ENABLE(OILPAN)
560 visitor->trace(m_scheduledAnimations); 560 visitor->trace(m_scheduledAnimations);
561 #endif 561 #endif
562 visitor->trace(m_ownerSVGElement); 562 visitor->trace(m_ownerSVGElement);
563 } 563 }
564 564
565 } 565 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/page/PageAnimator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698