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 <limits> | 7 #include <limits> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 cmd->HasSwitch(switches::kEnableDeadlineScheduling) && | 104 cmd->HasSwitch(switches::kEnableDeadlineScheduling) && |
105 !cmd->HasSwitch(switches::kDisableDeadlineScheduling); | 105 !cmd->HasSwitch(switches::kDisableDeadlineScheduling); |
106 settings.using_synchronous_renderer_compositor = | 106 settings.using_synchronous_renderer_compositor = |
107 widget->UsingSynchronousRendererCompositor(); | 107 widget->UsingSynchronousRendererCompositor(); |
108 settings.per_tile_painting_enabled = | 108 settings.per_tile_painting_enabled = |
109 cmd->HasSwitch(cc::switches::kEnablePerTilePainting); | 109 cmd->HasSwitch(cc::switches::kEnablePerTilePainting); |
110 settings.accelerated_animation_enabled = | 110 settings.accelerated_animation_enabled = |
111 !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); | 111 !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); |
112 settings.force_direct_layer_drawing = | 112 settings.force_direct_layer_drawing = |
113 cmd->HasSwitch(cc::switches::kForceDirectLayerDrawing); | 113 cmd->HasSwitch(cc::switches::kForceDirectLayerDrawing); |
| 114 settings.touch_hit_testing = |
| 115 !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting); |
114 | 116 |
115 int default_tile_width = settings.default_tile_size.width(); | 117 int default_tile_width = settings.default_tile_size.width(); |
116 if (cmd->HasSwitch(switches::kDefaultTileWidth)) { | 118 if (cmd->HasSwitch(switches::kDefaultTileWidth)) { |
117 GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1, | 119 GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1, |
118 std::numeric_limits<int>::max(), &default_tile_width); | 120 std::numeric_limits<int>::max(), &default_tile_width); |
119 } | 121 } |
120 int default_tile_height = settings.default_tile_size.height(); | 122 int default_tile_height = settings.default_tile_size.height(); |
121 if (cmd->HasSwitch(switches::kDefaultTileHeight)) { | 123 if (cmd->HasSwitch(switches::kDefaultTileHeight)) { |
122 GetSwitchValueAsInt(*cmd, switches::kDefaultTileHeight, 1, | 124 GetSwitchValueAsInt(*cmd, switches::kDefaultTileHeight, 1, |
123 std::numeric_limits<int>::max(), &default_tile_height); | 125 std::numeric_limits<int>::max(), &default_tile_height); |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
621 if (!suppress_schedule_composite_) | 623 if (!suppress_schedule_composite_) |
622 widget_->scheduleComposite(); | 624 widget_->scheduleComposite(); |
623 } | 625 } |
624 | 626 |
625 scoped_refptr<cc::ContextProvider> | 627 scoped_refptr<cc::ContextProvider> |
626 RenderWidgetCompositor::OffscreenContextProvider() { | 628 RenderWidgetCompositor::OffscreenContextProvider() { |
627 return RenderThreadImpl::current()->OffscreenCompositorContextProvider(); | 629 return RenderThreadImpl::current()->OffscreenCompositorContextProvider(); |
628 } | 630 } |
629 | 631 |
630 } // namespace content | 632 } // namespace content |
OLD | NEW |