webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc - Issue 192433002: Creating utility for converting TimeTicks to WebKit double and use it in the Chrome compositor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc

Issue 192433002: Creating utility for converting TimeTicks to WebKit double and use it in the Chrome compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 9 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 | « webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp ('k') | webkit/renderer/compositor_bindings/webkit_time.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc

diff --git a/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc b/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc

index a1de2a26869f9fa71e85bf7a84e890552fd3d2f8..3077a145c3fc5b18bf4a3f4f42a26c2b681c09e6 100644

--- a/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc

+++ b/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc

@@ -5,6 +5,7 @@

#include "webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.h"

#include "third_party/WebKit/public/platform/WebAnimationDelegate.h"

+#include "webkit/renderer/compositor_bindings/webkit_time.h"

namespace webkit {

@@ -16,7 +17,7 @@ void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted(

base::TimeTicks monotonic_time,

cc::Animation::TargetProperty target_property) {

delegate_->notifyAnimationStarted(

- (monotonic_time - base::TimeTicks()).InSecondsF(),

jamesr 2014/03/10 20:37:28 what's wrong with this?

+ ToWebKitTime(monotonic_time),

static_cast<blink::WebAnimation::TargetProperty>(target_property));

}

@@ -24,7 +25,7 @@ void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished(

base::TimeTicks monotonic_time,

cc::Animation::TargetProperty target_property) {

delegate_->notifyAnimationFinished(

- (monotonic_time - base::TimeTicks()).InSecondsF(),

+ ToWebKitTime(monotonic_time),

static_cast<blink::WebAnimation::TargetProperty>(target_property));

}