CC Animations: Make sure that HtmlViewer uses compositor-animation-timelines

components/html_viewer/html_widget.cc

Index: components/html_viewer/html_widget.cc
diff --git a/components/html_viewer/html_widget.cc b/components/html_viewer/html_widget.cc
index a7515cec0b7f9989af310b0d1b1e3d5d7360ca55..38ffba4f9888db8e9e881acad2c9924e43fc68ca 100644
--- a/components/html_viewer/html_widget.cc
+++ b/components/html_viewer/html_widget.cc
@@ -5,6 +5,8 @@
 #include "components/html_viewer/html_widget.h"
 
 #include "base/command_line.h"
+#include "cc/blink/web_layer_impl.h"
+#include "cc/layers/layer_settings.h"
 #include "components/html_viewer/blink_settings.h"
 #include "components/html_viewer/global_state.h"
 #include "components/html_viewer/ime_controller.h"
@@ -15,6 +17,7 @@
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/gfx/geometry/dip_util.h"
@@ -91,6 +94,12 @@ HTMLWidgetRootLocal::HTMLWidgetRootLocal(CreateParams* create_params)
       global_state_(create_params->global_state),
       window_(create_params->window),
       web_view_(nullptr) {
+  // Use new animation system (cc::AnimationHost).

[sky, 2015/11/30 17:45:29]

This state looks like it's global state, and not per widget. Can it move to
GlobalState? Or BlinkPlatformImpl if that is appropriate.

[loyso (OOO), 2015/12/02 03:58:27]

Done.

+  cc::LayerSettings layer_settings;
+  layer_settings.use_compositor_animation_timelines = true;
+  cc_blink::WebLayerImpl::SetLayerSettings(layer_settings);
+  blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true);
+
   web_view_ = blink::WebView::create(this);
   ime_controller_.reset(new ImeController(window_, web_view_));
   // Creating the widget calls initializeLayerTreeView() to create the