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

components/html_viewer/global_state.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/global_state.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "cc/blink/web_layer_impl.h"
-#include "cc/layers/layer_settings.h"
 #include "components/html_viewer/blink_platform_impl.h"
 #include "components/html_viewer/blink_settings_impl.h"
 #include "components/html_viewer/media_factory.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "gin/v8_initializer.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/logging/init_logging.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
@@ skipping 99 matching lines @@
 #endif
 
   ui_init_.reset(new ui::mojo::UIInit(
       DisplaysFromSizeAndScale(screen_size_in_pixels_, device_pixel_ratio_)));
   base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
 
   app_->ConnectToService("mojo:mus", &gpu_service_);
   gpu_service_->GetGpuInfo(base::Bind(&GlobalState::GetGpuInfoCallback,
                                       base::Unretained(this)));
 
-  // Use new animation system (cc::AnimationHost).
-  cc::LayerSettings layer_settings;
-  layer_settings.use_compositor_animation_timelines = true;
-  cc_blink::WebLayerImpl::SetLayerSettings(layer_settings);
-  blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true);
-
   renderer_scheduler_ = scheduler::RendererScheduler::Create();
   blink_platform_.reset(
       new BlinkPlatformImpl(this, app_, renderer_scheduler_.get()));
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
   gin::V8Initializer::LoadV8SnapshotFromFD(
       resource_loader_.ReleaseFile(kResourceSnapshotBlob).TakePlatformFile(),
       0u, 0u);
   gin::V8Initializer::LoadV8NativesFromFD(
       resource_loader_.ReleaseFile(kResourceNativesBlob).TakePlatformFile(), 0u,
       0u);
@@ skipping 44 matching lines @@
   return gpu_info_.get();
 }
 
 void GlobalState::GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info) {
   CHECK(gpu_info);
   gpu_info_ = gpu_info.Pass();
   gpu_service_.reset();
 }
 
 }  // namespace html_viewer