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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 947033002: CC Animations: Establish AnimationHost, AnimationTimeline and AnimationPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove kEnableNewCompositorAnimations. Created 5 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
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index af9edfc758c46c257a74552ab198abcbc3d8aa16..7fc8c4ef67fd48378a98b0fe6331d33989488172 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -14,10 +14,12 @@
#include "base/sys_info.h"
#include "base/time/time.h"
#include "base/values.h"
+#include "cc/animation/animation_timeline.h"
#include "cc/base/latency_info_swap_promise.h"
#include "cc/base/latency_info_swap_promise_monitor.h"
#include "cc/base/swap_promise.h"
#include "cc/base/switches.h"
+#include "cc/blink/web_compositor_animation_timeline_impl.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/debug/layer_tree_debug_state.h"
#include "cc/debug/micro_benchmark.h"
@@ -566,6 +568,15 @@ void RenderWidgetCompositor::clearRootLayer() {
layer_tree_host_->SetRootLayer(scoped_refptr<cc::Layer>());
}
+void RenderWidgetCompositor::setCompositorAnimationTimeline(
+ blink::WebCompositorAnimationTimeline* compositor_timeline) {
+ layer_tree_host_->SetAnimationTimeline(
+ compositor_timeline
+ ? static_cast<const cc_blink::WebCompositorAnimationTimelineImpl*>(
+ compositor_timeline)->animation_timeline()
+ : scoped_refptr<cc::AnimationTimeline>());
+}
+
void RenderWidgetCompositor::setViewportSize(
const WebSize&,
const WebSize& device_viewport_size) {
« cc/animation/animation_player.h ('K') | « content/renderer/gpu/render_widget_compositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698