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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 198043002: Turn off cc touch hit testing if --enable-bleeding-edge-rendering-fast-paths is true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | content/renderer/gpu/render_widget_compositor.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 ui::IsTouchDevicePresent(); 458 ui::IsTouchDevicePresent();
459 #if defined(OS_ANDROID) 459 #if defined(OS_ANDROID)
460 prefs.device_supports_mouse = false; 460 prefs.device_supports_mouse = false;
461 #endif 461 #endif
462 462
463 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); 463 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints();
464 464
465 prefs.touch_adjustment_enabled = 465 prefs.touch_adjustment_enabled =
466 !command_line.HasSwitch(switches::kDisableTouchAdjustment); 466 !command_line.HasSwitch(switches::kDisableTouchAdjustment);
467 prefs.compositor_touch_hit_testing = 467 prefs.compositor_touch_hit_testing =
468 !command_line.HasSwitch(cc::switches::kDisableCompositorTouchHitTesting); 468 !command_line.HasSwitch(
469 cc::switches::kDisableCompositorTouchHitTesting) &&
470 !command_line.HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths);
471
469 472
470 #if defined(OS_MACOSX) || defined(OS_CHROMEOS) 473 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
471 bool default_enable_scroll_animator = true; 474 bool default_enable_scroll_animator = true;
472 #else 475 #else
473 bool default_enable_scroll_animator = false; 476 bool default_enable_scroll_animator = false;
474 #endif 477 #endif
475 prefs.enable_scroll_animator = default_enable_scroll_animator; 478 prefs.enable_scroll_animator = default_enable_scroll_animator;
476 if (command_line.HasSwitch(switches::kEnableSmoothScrolling)) 479 if (command_line.HasSwitch(switches::kEnableSmoothScrolling))
477 prefs.enable_scroll_animator = true; 480 prefs.enable_scroll_animator = true;
478 if (command_line.HasSwitch(switches::kDisableSmoothScrolling)) 481 if (command_line.HasSwitch(switches::kDisableSmoothScrolling))
(...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1878 return true; 1881 return true;
1879 } 1882 }
1880 1883
1881 void RenderViewHostImpl::AttachToFrameTree() { 1884 void RenderViewHostImpl::AttachToFrameTree() {
1882 FrameTree* frame_tree = delegate_->GetFrameTree(); 1885 FrameTree* frame_tree = delegate_->GetFrameTree();
1883 1886
1884 frame_tree->ResetForMainFrameSwap(); 1887 frame_tree->ResetForMainFrameSwap();
1885 } 1888 }
1886 1889
1887 } // namespace content 1890 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698