| 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 2d97eca821ed33a5ee713885e7e1b3ca53ebc609..6f22034d16cd7a27ea56e69b57944c6e3782406e 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -251,12 +251,7 @@ void RenderWidgetCompositor::Initialize(float device_scale_factor) {
|
| !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);
|
| settings.accelerated_animation_enabled =
|
| compositor_deps_->IsThreadedAnimationEnabled();
|
| -
|
| - settings.use_compositor_animation_timelines =
|
| - !cmd->HasSwitch(switches::kDisableCompositorAnimationTimelines);
|
| - blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(
|
| - settings.use_compositor_animation_timelines);
|
| -
|
| + settings.use_compositor_animation_timelines = true;
|
| settings.use_mouse_wheel_gestures = UseGestureBasedWheelScrolling();
|
|
|
| settings.default_tile_size = CalculateDefaultTileSize(device_scale_factor);
|
| @@ -693,11 +688,6 @@ void RenderWidgetCompositor::didStopFlinging() {
|
| layer_tree_host_->DidStopFlinging();
|
| }
|
|
|
| -void RenderWidgetCompositor::registerForAnimations(blink::WebLayer* layer) {
|
| - cc::Layer* cc_layer = static_cast<cc_blink::WebLayerImpl*>(layer)->layer();
|
| - cc_layer->RegisterForAnimations(layer_tree_host_->animation_registrar());
|
| -}
|
| -
|
| void RenderWidgetCompositor::registerViewportLayers(
|
| const blink::WebLayer* overscrollElasticityLayer,
|
| const blink::WebLayer* pageScaleLayer,
|
|
|