diff options
| author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 21:05:51 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 21:05:51 +0000 |
| commit | 3b066b8ef5fa0f6acbdf98bc2c5daa8f0b62569a (patch) | |
| tree | d1c4f8a1098eccde4d3633ebe533d31724ebaca3 | |
| parent | 687472f3d057079e74f96c82c0a99f588f06e1f9 (diff) | |
| download | chromium_src-3b066b8ef5fa0f6acbdf98bc2c5daa8f0b62569a.zip chromium_src-3b066b8ef5fa0f6acbdf98bc2c5daa8f0b62569a.tar.gz chromium_src-3b066b8ef5fa0f6acbdf98bc2c5daa8f0b62569a.tar.bz2 | |
Re-enable CC touch hit testing under --enable-bleeding-edge-rendering-fast-paths
With the blink fixes for layer squashing in in https://src.chromium.org/viewvc/blink?view=rev&revision=171103, there's no longer any reason to disable cc touch hit testing when squashing is enabled.
BUG=336560
Review URL: https://codereview.chromium.org/224803003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262810 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 5 | ||||
| -rw-r--r-- | content/renderer/gpu/render_widget_compositor.cc | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 42d64cb..f4c2c7b 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -458,10 +458,7 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) { prefs.touch_adjustment_enabled = !command_line.HasSwitch(switches::kDisableTouchAdjustment); prefs.compositor_touch_hit_testing = - !command_line.HasSwitch( - cc::switches::kDisableCompositorTouchHitTesting) && - !command_line.HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths); - + !command_line.HasSwitch(cc::switches::kDisableCompositorTouchHitTesting); #if defined(OS_MACOSX) || defined(OS_CHROMEOS) bool default_enable_scroll_animator = true; diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index c316795..bfff5be 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -102,8 +102,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create( settings.accelerated_animation_enabled = !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); settings.touch_hit_testing = - !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting) && - !cmd->HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths); + !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting); int default_tile_width = settings.default_tile_size.width(); if (cmd->HasSwitch(switches::kDefaultTileWidth)) { |