Commit 3b066b8e authored by rbyers@chromium.org's avatar rbyers@chromium.org

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
parent 687472f3
...@@ -458,10 +458,7 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) { ...@@ -458,10 +458,7 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
prefs.touch_adjustment_enabled = prefs.touch_adjustment_enabled =
!command_line.HasSwitch(switches::kDisableTouchAdjustment); !command_line.HasSwitch(switches::kDisableTouchAdjustment);
prefs.compositor_touch_hit_testing = prefs.compositor_touch_hit_testing =
!command_line.HasSwitch( !command_line.HasSwitch(cc::switches::kDisableCompositorTouchHitTesting);
cc::switches::kDisableCompositorTouchHitTesting) &&
!command_line.HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths);
#if defined(OS_MACOSX) || defined(OS_CHROMEOS) #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
bool default_enable_scroll_animator = true; bool default_enable_scroll_animator = true;
......
...@@ -102,8 +102,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create( ...@@ -102,8 +102,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
settings.accelerated_animation_enabled = settings.accelerated_animation_enabled =
!cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
settings.touch_hit_testing = settings.touch_hit_testing =
!cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting) && !cmd->HasSwitch(cc::switches::kDisableCompositorTouchHitTesting);
!cmd->HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths);
int default_tile_width = settings.default_tile_size.width(); int default_tile_width = settings.default_tile_size.width();
if (cmd->HasSwitch(switches::kDefaultTileWidth)) { if (cmd->HasSwitch(switches::kDefaultTileWidth)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment