diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 21:40:41 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 21:40:41 +0000 |
| commit | a4831661062ba19366189bbdb4b2458186fc1859 (patch) | |
| tree | 0ec631dc886358d1247945358db966c1e6a0b253 | |
| parent | 4a5c2ec6d21eaab224eff826b524403c8852e936 (diff) | |
| download | chromium_src-a4831661062ba19366189bbdb4b2458186fc1859.zip chromium_src-a4831661062ba19366189bbdb4b2458186fc1859.tar.gz chromium_src-a4831661062ba19366189bbdb4b2458186fc1859.tar.bz2 | |
Merge 147888 - SetBounds even when size didn't change.
This early return would cause us to not properly move the XWindow when the
display configuration changes. This would, for example, result in a black
remaining display after detaching an external primary display.
BUG=chromium-os:31901
TEST=Manually tested on Lumpy to verify that unplugging an external display does
correctly switch the aura_root_0 XWindow back to the internal display.
Review URL: https://chromiumcodereview.appspot.com/10816009
TBR=disher@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10809086
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@148208 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/aura/root_window_host_linux.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc index 7e54e65..264b681 100644 --- a/ui/aura/root_window_host_linux.cc +++ b/ui/aura/root_window_host_linux.cc @@ -820,11 +820,6 @@ void RootWindowHostLinux::SetBounds(const gfx::Rect& bounds) { bool size_changed = bounds_.size() != bounds.size() || current_scale != new_scale; - if (!size_changed) { - root_window_->SchedulePaintInRect(root_window_->bounds()); - return; - } - if (bounds.size() != bounds_.size()) XResizeWindow(xdisplay_, xwindow_, bounds.width(), bounds.height()); @@ -839,6 +834,8 @@ void RootWindowHostLinux::SetBounds(const gfx::Rect& bounds) { bounds_ = bounds; if (size_changed) root_window_->OnHostResized(bounds.size()); + else + root_window_->SchedulePaintInRect(root_window_->bounds()); } gfx::Point RootWindowHostLinux::GetLocationOnNativeScreen() const { |