summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2015-05-06 14:29:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-06 21:30:08 +0000
commitf52e1be5a6a9d30b697990c2641ee86264f39d1f (patch)
treeee35af8ffe743248703899906b0ba8555187cb94
parent52c42ca46b0c053911f0f3e7bef35a668811d93a (diff)
downloadchromium_src-f52e1be5a6a9d30b697990c2641ee86264f39d1f.zip
chromium_src-f52e1be5a6a9d30b697990c2641ee86264f39d1f.tar.gz
chromium_src-f52e1be5a6a9d30b697990c2641ee86264f39d1f.tar.bz2
Clip windows inside the container that has shelf.
BUG=368591 TEST=manual Review URL: https://codereview.chromium.org/1125183005 Cr-Commit-Position: refs/heads/master@{#328618}
-rw-r--r--ash/root_window_controller.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 3b8fd90..c8a3aba 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -866,6 +866,9 @@ void RootWindowController::CreateContainersInRootWindow(
kShellWindowId_NonLockScreenContainersContainer,
"NonLockScreenContainersContainer",
root_window);
+ // Clip all windows inside this container, as half pixel of the window's
+ // texture may become visible when the screen is scaled. crbug.com/368591.
+ non_lock_screen_containers->layer()->SetMasksToBounds(true);
aura::Window* lock_background_containers = CreateContainer(
kShellWindowId_LockScreenBackgroundContainer,