| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <X11/extensions/shape.h> | 6 #include <X11/extensions/shape.h> |
| 7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 pointer_devices.push_back(kPointerDeviceId); | 586 pointer_devices.push_back(kPointerDeviceId); |
| 587 ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(pointer_devices); | 587 ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(pointer_devices); |
| 588 | 588 |
| 589 DesktopWindowTreeHostX11Test::SetUp(); | 589 DesktopWindowTreeHostX11Test::SetUp(); |
| 590 } | 590 } |
| 591 | 591 |
| 592 ui::test::PlatformEventSourceTestAPI event_source_; | 592 ui::test::PlatformEventSourceTestAPI event_source_; |
| 593 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11HighDPITest); | 593 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11HighDPITest); |
| 594 }; | 594 }; |
| 595 | 595 |
| 596 TEST_F(DesktopWindowTreeHostX11HighDPITest, LocatedEventDispatchWithCapture) { | 596 // https://crbug.com/702687 |
| 597 TEST_F(DesktopWindowTreeHostX11HighDPITest, |
| 598 DISABLED_LocatedEventDispatchWithCapture) { |
| 597 Widget first; | 599 Widget first; |
| 598 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); | 600 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); |
| 599 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 601 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 600 params.native_widget = new DesktopNativeWidgetAura(&first); | 602 params.native_widget = new DesktopNativeWidgetAura(&first); |
| 601 params.bounds = gfx::Rect(0, 0, 50, 50); | 603 params.bounds = gfx::Rect(0, 0, 50, 50); |
| 602 first.Init(params); | 604 first.Init(params); |
| 603 first.Show(); | 605 first.Show(); |
| 604 | 606 |
| 605 Widget second; | 607 Widget second; |
| 606 params = CreateParams(Widget::InitParams::TYPE_WINDOW); | 608 params = CreateParams(Widget::InitParams::TYPE_WINDOW); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 EXPECT_EQ(ui::ET_MOUSEWHEEL, second_recorder.mouse_events()[0].type()); | 644 EXPECT_EQ(ui::ET_MOUSEWHEEL, second_recorder.mouse_events()[0].type()); |
| 643 EXPECT_EQ(gfx::Point(-25, -25).ToString(), | 645 EXPECT_EQ(gfx::Point(-25, -25).ToString(), |
| 644 second_recorder.mouse_events()[0].location().ToString()); | 646 second_recorder.mouse_events()[0].location().ToString()); |
| 645 | 647 |
| 646 PretendCapture(nullptr); | 648 PretendCapture(nullptr); |
| 647 first.GetNativeWindow()->RemovePreTargetHandler(&first_recorder); | 649 first.GetNativeWindow()->RemovePreTargetHandler(&first_recorder); |
| 648 second.GetNativeWindow()->RemovePreTargetHandler(&second_recorder); | 650 second.GetNativeWindow()->RemovePreTargetHandler(&second_recorder); |
| 649 } | 651 } |
| 650 | 652 |
| 651 } // namespace views | 653 } // namespace views |
| OLD | NEW |