OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" | 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" |
6 | 6 |
7 #include <X11/extensions/shape.h> | 7 #include <X11/extensions/shape.h> |
8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
9 #include <X11/Xatom.h> | 9 #include <X11/Xatom.h> |
10 #include <X11/Xregion.h> | 10 #include <X11/Xregion.h> |
(...skipping 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1673 switch (xev->type) { | 1673 switch (xev->type) { |
1674 case EnterNotify: | 1674 case EnterNotify: |
1675 case LeaveNotify: { | 1675 case LeaveNotify: { |
1676 // Ignore EventNotify and LeaveNotify events from children of |xwindow_|. | 1676 // Ignore EventNotify and LeaveNotify events from children of |xwindow_|. |
1677 // NativeViewGLSurfaceGLX adds a child to |xwindow_|. | 1677 // NativeViewGLSurfaceGLX adds a child to |xwindow_|. |
1678 // TODO(pkotwicz|tdanderson): Figure out whether the suppression is | 1678 // TODO(pkotwicz|tdanderson): Figure out whether the suppression is |
1679 // necessary. crbug.com/385716 | 1679 // necessary. crbug.com/385716 |
1680 if (xev->xcrossing.detail == NotifyInferior) | 1680 if (xev->xcrossing.detail == NotifyInferior) |
1681 break; | 1681 break; |
1682 | 1682 |
1683 // Clear stored scroll data | |
1684 ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses(); | |
1685 | |
sadrul
2015/08/18 16:57:46
You shouldn't need this anymore because of the cha
Will Shackleton
2015/08/26 19:52:48
Quite possibly.
| |
1683 ui::MouseEvent mouse_event(xev); | 1686 ui::MouseEvent mouse_event(xev); |
1684 DispatchMouseEvent(&mouse_event); | 1687 DispatchMouseEvent(&mouse_event); |
1685 break; | 1688 break; |
1686 } | 1689 } |
1687 case Expose: { | 1690 case Expose: { |
1688 gfx::Rect damage_rect_in_pixels(xev->xexpose.x, xev->xexpose.y, | 1691 gfx::Rect damage_rect_in_pixels(xev->xexpose.x, xev->xexpose.y, |
1689 xev->xexpose.width, xev->xexpose.height); | 1692 xev->xexpose.width, xev->xexpose.height); |
1690 compositor()->ScheduleRedrawRect(damage_rect_in_pixels); | 1693 compositor()->ScheduleRedrawRect(damage_rect_in_pixels); |
1691 break; | 1694 break; |
1692 } | 1695 } |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1997 if (linux_ui) { | 2000 if (linux_ui) { |
1998 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 2001 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
1999 if (native_theme) | 2002 if (native_theme) |
2000 return native_theme; | 2003 return native_theme; |
2001 } | 2004 } |
2002 | 2005 |
2003 return ui::NativeTheme::instance(); | 2006 return ui::NativeTheme::instance(); |
2004 } | 2007 } |
2005 | 2008 |
2006 } // namespace views | 2009 } // namespace views |
OLD | NEW |