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

Unified Diff: Source/core/animation/AnimationTimeline.cpp

Issue 551253002: Web Animations: Zero time of the document timeline should correspond with navigationStart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Specify time when resetting animation clock in tests. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/animation/AnimationTimeline.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationTimeline.cpp
diff --git a/Source/core/animation/AnimationTimeline.cpp b/Source/core/animation/AnimationTimeline.cpp
index 93a91cd8497f043cf0c98fb550c214205f1ddce5..0199e6088a7ec21ff3b03aa8c5f2edd15a2e43aa 100644
--- a/Source/core/animation/AnimationTimeline.cpp
+++ b/Source/core/animation/AnimationTimeline.cpp
@@ -35,6 +35,7 @@
#include "core/animation/AnimationClock.h"
#include "core/dom/Document.h"
#include "core/frame/FrameView.h"
+#include "core/loader/DocumentLoader.h"
#include "core/page/Page.h"
#include "platform/TraceEvent.h"
@@ -61,6 +62,7 @@ PassRefPtrWillBeRawPtr<AnimationTimeline> AnimationTimeline::create(Document* do
AnimationTimeline::AnimationTimeline(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing)
: m_document(document)
+ , m_zeroTime(0)
{
if (!timing)
m_timing = adoptPtrWillBeNoop(new AnimationTimelineTiming(this));
@@ -165,6 +167,14 @@ void AnimationTimeline::AnimationTimelineTiming::trace(Visitor* visitor)
AnimationTimeline::PlatformTiming::trace(visitor);
}
+double AnimationTimeline::zeroTime()
+{
+ if (!m_zeroTime && m_document && m_document->loader()) {
+ m_zeroTime = m_document->loader()->timing()->referenceMonotonicTime();
+ }
+ return m_zeroTime;
+}
+
double AnimationTimeline::currentTime(bool& isNull)
{
return currentTimeInternal(isNull) * 1000;
« no previous file with comments | « Source/core/animation/AnimationTimeline.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698