Commit e3c6b3ed authored by hshi@chromium.org's avatar hshi@chromium.org

Chrome OS: Fix tab mergeability with cursor compositing.

Ash GetLocalProcessWindowAtPointImpl should ignore windows in the
mouse cursor container.

BUG=399309
R=oshima@chromium.org, sky@chromium.org
TBR=sky@chromium.org
TEST=verify that tab merging works with large cursors.

Review URL: https://codereview.chromium.org/468603002

Cr-Commit-Position: refs/heads/master@{#289116}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289116 0039d316-1c4b-4281-b951-d872f2087c98
parent 90d7af9e
......@@ -22,7 +22,8 @@ aura::Window* GetLocalProcessWindowAtPointImpl(
return NULL;
if (window->id() == ash::kShellWindowId_PhantomWindow ||
window->id() == ash::kShellWindowId_OverlayContainer)
window->id() == ash::kShellWindowId_OverlayContainer ||
window->id() == ash::kShellWindowId_MouseCursorContainer)
return NULL;
if (window->layer()->type() == ui::LAYER_TEXTURED)
......
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