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

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

Issue 224803003: Re-enable CC touch hit testing under --enable-bleeding-edge-rendering-fast-paths (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #if defined(OS_ANDROID) 10 #if defined(OS_ANDROID)
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 settings.main_frame_before_activation_enabled = 95 settings.main_frame_before_activation_enabled =
96 cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) && 96 cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
97 !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation); 97 !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);
98 settings.main_frame_before_draw_enabled = 98 settings.main_frame_before_draw_enabled =
99 !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeDraw); 99 !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeDraw);
100 settings.using_synchronous_renderer_compositor = 100 settings.using_synchronous_renderer_compositor =
101 widget->UsingSynchronousRendererCompositor(); 101 widget->UsingSynchronousRendererCompositor();
102 settings.accelerated_animation_enabled = 102 settings.accelerated_animation_enabled =
103 !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); 103 !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
104 settings.touch_hit_testing = 104 settings.touch_hit_testing =
105 !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting) && 105 !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting);
106 !cmd->HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths);
107 106
108 int default_tile_width = settings.default_tile_size.width(); 107 int default_tile_width = settings.default_tile_size.width();
109 if (cmd->HasSwitch(switches::kDefaultTileWidth)) { 108 if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
110 GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1, 109 GetSwitchValueAsInt(*cmd, switches::kDefaultTileWidth, 1,
111 std::numeric_limits<int>::max(), &default_tile_width); 110 std::numeric_limits<int>::max(), &default_tile_width);
112 } 111 }
113 int default_tile_height = settings.default_tile_size.height(); 112 int default_tile_height = settings.default_tile_size.height();
114 if (cmd->HasSwitch(switches::kDefaultTileHeight)) { 113 if (cmd->HasSwitch(switches::kDefaultTileHeight)) {
115 GetSwitchValueAsInt(*cmd, switches::kDefaultTileHeight, 1, 114 GetSwitchValueAsInt(*cmd, switches::kDefaultTileHeight, 1,
116 std::numeric_limits<int>::max(), &default_tile_height); 115 std::numeric_limits<int>::max(), &default_tile_height);
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 widget_->OnSwapBuffersAborted(); 648 widget_->OnSwapBuffersAborted();
650 } 649 }
651 650
652 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { 651 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
653 cc::ContextProvider* provider = 652 cc::ContextProvider* provider =
654 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); 653 RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
655 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); 654 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
656 } 655 }
657 656
658 } // namespace content 657 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698