| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 } else { | 244 } else { |
| 245 settings.renderer_settings.disable_display_vsync = true; | 245 settings.renderer_settings.disable_display_vsync = true; |
| 246 settings.wait_for_beginframe_interval = false; | 246 settings.wait_for_beginframe_interval = false; |
| 247 } | 247 } |
| 248 } | 248 } |
| 249 settings.main_frame_before_activation_enabled = | 249 settings.main_frame_before_activation_enabled = |
| 250 cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) && | 250 cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) && |
| 251 !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation); | 251 !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation); |
| 252 settings.accelerated_animation_enabled = | 252 settings.accelerated_animation_enabled = |
| 253 compositor_deps_->IsThreadedAnimationEnabled(); | 253 compositor_deps_->IsThreadedAnimationEnabled(); |
| 254 | 254 settings.use_compositor_animation_timelines = true; |
| 255 settings.use_compositor_animation_timelines = | |
| 256 !cmd->HasSwitch(switches::kDisableCompositorAnimationTimelines); | |
| 257 blink::WebRuntimeFeatures::enableCompositorAnimationTimelines( | |
| 258 settings.use_compositor_animation_timelines); | |
| 259 | |
| 260 settings.use_mouse_wheel_gestures = UseGestureBasedWheelScrolling(); | 255 settings.use_mouse_wheel_gestures = UseGestureBasedWheelScrolling(); |
| 261 | 256 |
| 262 settings.default_tile_size = CalculateDefaultTileSize(device_scale_factor); | 257 settings.default_tile_size = CalculateDefaultTileSize(device_scale_factor); |
| 263 if (cmd->HasSwitch(switches::kDefaultTileWidth)) { | 258 if (cmd->HasSwitch(switches::kDefaultTileWidth)) { |
| 264 int tile_width = 0; | 259 int tile_width = 0; |
| 265 GetSwitchValueAsInt(*cmd, | 260 GetSwitchValueAsInt(*cmd, |
| 266 switches::kDefaultTileWidth, | 261 switches::kDefaultTileWidth, |
| 267 1, | 262 1, |
| 268 std::numeric_limits<int>::max(), | 263 std::numeric_limits<int>::max(), |
| 269 &tile_width); | 264 &tile_width); |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 } | 681 } |
| 687 | 682 |
| 688 void RenderWidgetCompositor::setNeedsCompositorUpdate() { | 683 void RenderWidgetCompositor::setNeedsCompositorUpdate() { |
| 689 layer_tree_host_->SetNeedsUpdateLayers(); | 684 layer_tree_host_->SetNeedsUpdateLayers(); |
| 690 } | 685 } |
| 691 | 686 |
| 692 void RenderWidgetCompositor::didStopFlinging() { | 687 void RenderWidgetCompositor::didStopFlinging() { |
| 693 layer_tree_host_->DidStopFlinging(); | 688 layer_tree_host_->DidStopFlinging(); |
| 694 } | 689 } |
| 695 | 690 |
| 696 void RenderWidgetCompositor::registerForAnimations(blink::WebLayer* layer) { | |
| 697 cc::Layer* cc_layer = static_cast<cc_blink::WebLayerImpl*>(layer)->layer(); | |
| 698 cc_layer->RegisterForAnimations(layer_tree_host_->animation_registrar()); | |
| 699 } | |
| 700 | |
| 701 void RenderWidgetCompositor::registerViewportLayers( | 691 void RenderWidgetCompositor::registerViewportLayers( |
| 702 const blink::WebLayer* overscrollElasticityLayer, | 692 const blink::WebLayer* overscrollElasticityLayer, |
| 703 const blink::WebLayer* pageScaleLayer, | 693 const blink::WebLayer* pageScaleLayer, |
| 704 const blink::WebLayer* innerViewportScrollLayer, | 694 const blink::WebLayer* innerViewportScrollLayer, |
| 705 const blink::WebLayer* outerViewportScrollLayer) { | 695 const blink::WebLayer* outerViewportScrollLayer) { |
| 706 layer_tree_host_->RegisterViewportLayers( | 696 layer_tree_host_->RegisterViewportLayers( |
| 707 // TODO(bokan): This check can probably be removed now, but it looks | 697 // TODO(bokan): This check can probably be removed now, but it looks |
| 708 // like overscroll elasticity may still be NULL until VisualViewport | 698 // like overscroll elasticity may still be NULL until VisualViewport |
| 709 // registers its layers. | 699 // registers its layers. |
| 710 // The scroll elasticity layer will only exist when using pinch virtual | 700 // The scroll elasticity layer will only exist when using pinch virtual |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1148 #endif | 1138 #endif |
| 1149 return actual; | 1139 return actual; |
| 1150 } | 1140 } |
| 1151 | 1141 |
| 1152 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor( | 1142 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor( |
| 1153 float device_scale) { | 1143 float device_scale) { |
| 1154 layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale); | 1144 layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale); |
| 1155 } | 1145 } |
| 1156 | 1146 |
| 1157 } // namespace content | 1147 } // namespace content |
| OLD | NEW |