From eb3477b1f3603bcc6eede00f1ce76370f3534c56 Mon Sep 17 00:00:00 2001 From: Anantanarayanan Iyengar <ananta@chromium.org> Date: Tue, 22 Mar 2016 17:42:22 -0700 Subject: [PATCH] Fix a painting bug which occurred due to the change which reduces the size of the fullscreen chrome window by 1 px on activation loss. Merging to M50 We reduce the size of fullscreen windows by 1px to ensure that maximized windows on the same thread don't draw over the taskbar. This change caused a painting problem as the compositor was not aware of the changed size. This causes the compositor to not paint correctly when the fullscreen window is activated as the window size did not change. Setting the compositor size correctly to the window bounds size fixes this problem. The other bug I found was when the fullscreen window is activated, we inform the delegate about the changed client size which in turn makes it across to the webcontents. We don't want the webcontents to get notified about these size changes. Fixed by setting the flag background_fullscreen_hack_ to false after the SetBoundsInternal call. BUG=595666 TBR=sky Review URL: https://codereview.chromium.org/1819633002 Cr-Commit-Position: refs/heads/master@{#382429} (cherry picked from commit 9f060d4be347cda7aa7c0fb2a43afafbbd64e70c) Conflicts: ui/views/win/hwnd_message_handler.cc Review URL: https://codereview.chromium.org/1826703002 . Cr-Commit-Position: refs/branch-heads/2661@{#353} Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081} --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc | 5 +++-- ui/views/win/hwnd_message_handler.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc index f79b3c42baf54..465d8bbe093b6 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -912,9 +912,10 @@ void DesktopWindowTreeHostWin::HandleWindowSizeChanged() { // changed (can occur on Windows 10 when snapping a window to the side of // the screen). In that case do a resize to the current size to reenable // swaps. - if (compositor()) + if (compositor()) { compositor()->SetScaleAndSize(compositor()->device_scale_factor(), - compositor()->size()); + GetBounds().size()); + } } //////////////////////////////////////////////////////////////////////////////// diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc index c62fb986fc210..039b802f1f992 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -1060,11 +1060,11 @@ void HWNDMessageHandler::PostProcessActivateMessage( } else if (background_fullscreen_hack_) { // Restore the bounds of the window to fullscreen. DCHECK(fullscreen_handler_->fullscreen()); - background_fullscreen_hack_ = false; MONITORINFO monitor_info = {sizeof(monitor_info)}; GetMonitorInfo(MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY), &monitor_info); SetBoundsInternal(gfx::Rect(monitor_info.rcMonitor), false); + background_fullscreen_hack_ = false; } }