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

Side by Side Diff: cc/blink/web_to_cc_animation_delegate_adapter.cc

Issue 1587073011: Plumb NotifyAnimationAborted from the compositor to blink animation delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initialize aborted_ in unittest Created 4 years, 11 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
« no previous file with comments | « cc/blink/web_to_cc_animation_delegate_adapter.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/blink/web_to_cc_animation_delegate_adapter.h" 5 #include "cc/blink/web_to_cc_animation_delegate_adapter.h"
6 #include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h" 6 #include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h"
7 7
8 namespace cc_blink { 8 namespace cc_blink {
9 9
10 WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter( 10 WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter(
(...skipping 22 matching lines...) Expand all
33 delegate_->notifyAnimationFinished( 33 delegate_->notifyAnimationFinished(
34 (monotonic_time - base::TimeTicks()).InSecondsF(), 34 (monotonic_time - base::TimeTicks()).InSecondsF(),
35 #if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP 35 #if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP
36 group); 36 group);
37 #else 37 #else
38 static_cast<blink::WebCompositorAnimation::TargetProperty>( 38 static_cast<blink::WebCompositorAnimation::TargetProperty>(
39 target_property)); 39 target_property));
40 #endif 40 #endif
41 } 41 }
42 42
43 void WebToCCAnimationDelegateAdapter::NotifyAnimationAborted(
44 base::TimeTicks monotonic_time,
45 cc::Animation::TargetProperty target_property,
46 int group) {
47 delegate_->notifyAnimationAborted(
48 (monotonic_time - base::TimeTicks()).InSecondsF(), group);
49 }
50
43 } // namespace cc_blink 51 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_to_cc_animation_delegate_adapter.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698