Fix panel dragging on Linux Aura

chrome/browser/ui/views/panels/panel_frame_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/panels/panel_frame_view.h"
 
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_constants.h"
 #include "chrome/browser/ui/views/panels/panel_view.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/path.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#include <X11/extensions/XInput2.h>
+#include <X11/Xlib.h>
+#endif
+
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "ui/base/win/shell.h"
 #include "ui/gfx/path_win.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #endif
@@ skipping 16 matching lines @@
 const SkColor kInactiveBackgroundDefaultColor = SkColorSetRGB(0x7a, 0x7c, 0x7c);
 const SkColor kAttentionBackgroundDefaultColor =
     SkColorSetRGB(0x53, 0xa9, 0x3f);
 
 // Color used to draw the minimized panel.
 const SkColor kMinimizeBackgroundDefaultColor = SkColorSetRGB(0xf5, 0xf4, 0xf0);
 
 // Color used to draw the title text under default theme.
 const SkColor kTitleTextDefaultColor = SkColorSetRGB(0xf9, 0xf9, 0xf9);
 
+#if defined(USE_X11) && !defined(OS_CHROMEOS)

[pkotwicz, 2014/03/18 02:48:26]

I did not put this method in events_x.cc because I am unsure if we are going to
use this method elsewhere. There was no clear improvement when I added similar
to code to X11WholeScreenMoveLoop::Dispatch()

+// Extracts the position in screen coordinates from |native_event|.
+gfx::Point GetEventLocationInScreenFromNative(
+    const base::NativeEvent& native_event) {
+  switch (native_event->type) {
+    case MotionNotify:
+      return gfx::Point(native_event->xmotion.x_root,
+                        native_event->xmotion.y_root);
+    case GenericEvent: {
+      XIDeviceEvent* xievent =
+          static_cast<XIDeviceEvent*>(native_event->xcookie.data);
+      return gfx::Point(static_cast<int>(xievent->root_x),
+                        static_cast<int>(xievent->root_y));
+    }
+  }
+  NOTREACHED();
+  return gfx::Point();
+}
+#endif
+
 gfx::ImageSkia* CreateImageForColor(SkColor color) {
   gfx::Canvas canvas(gfx::Size(1, 1), 1.0f, true);
   canvas.DrawColor(color);
   return new gfx::ImageSkia(canvas.ExtractImageRep());
 }
 
 #if defined(OS_WIN)
 const gfx::ImageSkia& GetTopLeftCornerImage(panel::CornerStyle corner_style) {
   static gfx::ImageSkia* rounded_image = NULL;
   static gfx::ImageSkia* non_rounded_image = NULL;
@@ skipping 499 matching lines @@
     // If the mouse location falls within the resizing area of the titlebar,
     // do not handle the event so that the system resizing logic could kick in.
     if (!panel_view_->IsWithinResizingArea(mouse_location) &&
         panel_view_->OnTitlebarMousePressed(mouse_location))
       return true;
   }
   return NonClientFrameView::OnMousePressed(event);
 }
 
 bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Converting the mouse location to screen coordinates returns an incorrect
+  // location while the panel is moving. See crbug.com/353393 for more details.
+  // Get the mouse location in screen coordinates from the base::NativeEvent
+  // instead.
+  // TODO(pkotwicz): Fix conversion to screen coordinates
+  if (event.type() != ui::ET_MOUSE_DRAGGED)
+    return false;
+  gfx::Point mouse_location =
+      GetEventLocationInScreenFromNative(event.native_event());
+#else
   // |event.location| is in the view's coordinate system. Convert it to the
   // screen coordinate system.
   gfx::Point mouse_location = event.location();
   views::View::ConvertPointToScreen(this, &mouse_location);
+#endif
 
   if (panel_view_->OnTitlebarMouseDragged(mouse_location))
     return true;
   return NonClientFrameView::OnMouseDragged(event);
 }
 
 void PanelFrameView::OnMouseReleased(const ui::MouseEvent& event) {
   if (panel_view_->OnTitlebarMouseReleased(
           event.IsControlDown() ? panel::APPLY_TO_ALL : panel::NO_MODIFIER))
     return;
@@ skipping 160 matching lines @@
 
   // Draw the left border.
   canvas->TileImageInt(left_image,
                        0,
                        top_left_image.height(),
                        left_image.width(),
                        height() - top_left_image.height() -
                            bottom_left_image.height());
 #endif
 }