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

components/html_viewer/html_widget.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "components/html_viewer/stats_collection_controller.h"
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/mus/public/cpp/window.h"
 #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"
 
 namespace html_viewer {
 namespace {
 
 scoped_ptr<WebLayerTreeViewImpl> CreateWebLayerTreeView(
     GlobalState* global_state) {
   return make_scoped_ptr(new WebLayerTreeViewImpl(
@@ skipping 56 matching lines @@
                                                 mus::Window* window)
     : app(app), global_state(global_state), window(window) {}
 
 HTMLWidgetRootLocal::CreateParams::~CreateParams() {}
 
 HTMLWidgetRootLocal::HTMLWidgetRootLocal(CreateParams* create_params)
     : app_(create_params->app),
       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
   // |web_layer_tree_view_impl_|. As we haven't yet assigned the |web_view_|
   // we have to set it here.
   if (web_layer_tree_view_impl_) {
     InitializeWebLayerTreeView(web_layer_tree_view_impl_.get(), app_, window_,
                                web_view_);
     UpdateWebViewSizeFromViewSize(window_, web_view_,
                                   web_layer_tree_view_impl_.get());
@@ skipping 108 matching lines @@
 
 void HTMLWidgetLocalRoot::didUpdateTextOfFocusedElementByNonUserInput() {
   ime_controller_->DidUpdateTextOfFocusedElementByNonUserInput();
 }
 
 void HTMLWidgetLocalRoot::showImeIfNeeded() {
   ime_controller_->ShowImeIfNeeded();
 }
 
 }  // namespace html_viewer