diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 20:29:37 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 20:29:37 +0000 |
| commit | 272da0e29a61a2fd7991eda8c8d3d4c55416b2b0 (patch) | |
| tree | f49e64469b88466771c8a8ce641f5785077013a8 /ui/aura/root_window_host_linux.cc | |
| parent | bd309ee68c9e457da3e86a56f344d55573591032 (diff) | |
| download | chromium_src-272da0e29a61a2fd7991eda8c8d3d4c55416b2b0.zip chromium_src-272da0e29a61a2fd7991eda8c8d3d4c55416b2b0.tar.gz chromium_src-272da0e29a61a2fd7991eda8c8d3d4c55416b2b0.tar.bz2 | |
Reverting 3 CLs in order to create 1 CL (to be later merged in M23).
http://src.chromium.org/viewvc/chrome?view=rev&revision=158546
http://src.chromium.org/viewvc/chrome?view=rev&revision=158721
http://src.chromium.org/viewvc/chrome?view=rev&revision=158771
BUG=152003
TBR=oshima@chromium.org,derat@chromium.org,sky@chromium.org,jhorwich@chromium.org
Review URL: https://codereview.chromium.org/10990091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host_linux.cc')
| -rw-r--r-- | ui/aura/root_window_host_linux.cc | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc index 52000cf..360c872 100644 --- a/ui/aura/root_window_host_linux.cc +++ b/ui/aura/root_window_host_linux.cc @@ -498,13 +498,11 @@ bool RootWindowHostLinux::Dispatch(const base::NativeEvent& event) { if (client) { gfx::Point p = gfx::Screen::GetCursorScreenPoint(); client->ConvertPointFromScreen(root, &p); - // TODO(oshima): Make sure the pointer is on one of root windows. - if (root->ContainsPoint(p)) + if (root->ContainsPoint(p)) { root->ConvertPointToNativeScreen(&p); - else - p.SetPoint(0, 0); - XWarpPointer( - xdisplay_, None, x_root_window_, 0, 0, 0, 0, p.x(), p.y()); + XWarpPointer( + xdisplay_, None, x_root_window_, 0, 0, 0, 0, p.x(), p.y()); + } } ConfineCursorToRootWindow(); } @@ -512,22 +510,6 @@ bool RootWindowHostLinux::Dispatch(const base::NativeEvent& event) { delegate_->OnHostResized(bounds.size()); if (origin_changed) delegate_->OnHostMoved(bounds_.origin()); -#if defined(OS_CHROMEOS) - // TODO(oshima): Clear the root when the window is moved or - // resized while the extended desktop is disabled. - // crbug.com/152003. - if (base::chromeos::IsRunningOnChromeOS()) { - XGCValues gc_values = {0}; - gc_values.foreground = BlackPixel(xdisplay_, DefaultScreen(xdisplay_)); - GC gc = XCreateGC(xdisplay_, x_root_window_, GCForeground, &gc_values); - XFillRectangle(xdisplay_, x_root_window_, gc, - x_root_bounds_.x(), - x_root_bounds_.y(), - x_root_bounds_.width(), - x_root_bounds_.height()); - XFreeGC(xdisplay_, gc); - } -#endif break; } case GenericEvent: |