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 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1655 switch (xev->type) { | 1655 switch (xev->type) { |
1656 case EnterNotify: | 1656 case EnterNotify: |
1657 case LeaveNotify: { | 1657 case LeaveNotify: { |
1658 // Ignore EventNotify and LeaveNotify events from children of |xwindow_|. | 1658 // Ignore EventNotify and LeaveNotify events from children of |xwindow_|. |
1659 // NativeViewGLSurfaceGLX adds a child to |xwindow_|. | 1659 // NativeViewGLSurfaceGLX adds a child to |xwindow_|. |
1660 // TODO(pkotwicz|tdanderson): Figure out whether the suppression is | 1660 // TODO(pkotwicz|tdanderson): Figure out whether the suppression is |
1661 // necessary. crbug.com/385716 | 1661 // necessary. crbug.com/385716 |
1662 if (xev->xcrossing.detail == NotifyInferior) | 1662 if (xev->xcrossing.detail == NotifyInferior) |
1663 break; | 1663 break; |
1664 | 1664 |
1665 // Clear stored scroll data | |
1666 ui::DeviceDataManagerX11::GetInstance()->InvalidateScrollClasses(); | |
1667 | |
sadrul
2014/12/22 17:11:12
It looks like this is something that will need to
| |
1665 ui::MouseEvent mouse_event(xev); | 1668 ui::MouseEvent mouse_event(xev); |
1666 DispatchMouseEvent(&mouse_event); | 1669 DispatchMouseEvent(&mouse_event); |
1667 break; | 1670 break; |
1668 } | 1671 } |
1669 case Expose: { | 1672 case Expose: { |
1670 gfx::Rect damage_rect(xev->xexpose.x, xev->xexpose.y, | 1673 gfx::Rect damage_rect(xev->xexpose.x, xev->xexpose.y, |
1671 xev->xexpose.width, xev->xexpose.height); | 1674 xev->xexpose.width, xev->xexpose.height); |
1672 compositor()->ScheduleRedrawRect(damage_rect); | 1675 compositor()->ScheduleRedrawRect(damage_rect); |
1673 break; | 1676 break; |
1674 } | 1677 } |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1943 if (linux_ui) { | 1946 if (linux_ui) { |
1944 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); | 1947 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); |
1945 if (native_theme) | 1948 if (native_theme) |
1946 return native_theme; | 1949 return native_theme; |
1947 } | 1950 } |
1948 | 1951 |
1949 return ui::NativeTheme::instance(); | 1952 return ui::NativeTheme::instance(); |
1950 } | 1953 } |
1951 | 1954 |
1952 } // namespace views | 1955 } // namespace views |
OLD | NEW |