Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 settings.use_compositor_animation_timelines = true;
255 settings.use_mouse_wheel_gestures = UseGestureBasedWheelScrolling(); 254 settings.use_mouse_wheel_gestures = UseGestureBasedWheelScrolling();
256 255
257 settings.default_tile_size = CalculateDefaultTileSize(device_scale_factor); 256 settings.default_tile_size = CalculateDefaultTileSize(device_scale_factor);
258 if (cmd->HasSwitch(switches::kDefaultTileWidth)) { 257 if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
259 int tile_width = 0; 258 int tile_width = 0;
260 GetSwitchValueAsInt(*cmd, 259 GetSwitchValueAsInt(*cmd,
261 switches::kDefaultTileWidth, 260 switches::kDefaultTileWidth,
262 1, 261 1,
263 std::numeric_limits<int>::max(), 262 std::numeric_limits<int>::max(),
264 &tile_width); 263 &tile_width);
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 #endif 1137 #endif
1139 return actual; 1138 return actual;
1140 } 1139 }
1141 1140
1142 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor( 1141 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor(
1143 float device_scale) { 1142 float device_scale) {
1144 layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale); 1143 layer_tree_host_->SetPaintedDeviceScaleFactor(device_scale);
1145 } 1144 }
1146 1145
1147 } // namespace content 1146 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698