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/aura/window.h" | 5 #include "ui/aura/window.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
867 delegate2.ResetCounts(); | 867 delegate2.ResetCounts(); |
868 | 868 |
869 // And releasing capture changes nothing. | 869 // And releasing capture changes nothing. |
870 w2->ReleaseCapture(); | 870 w2->ReleaseCapture(); |
871 EXPECT_EQ(0, delegate1.gesture_event_count()); | 871 EXPECT_EQ(0, delegate1.gesture_event_count()); |
872 EXPECT_EQ(0, delegate1.touch_event_count()); | 872 EXPECT_EQ(0, delegate1.touch_event_count()); |
873 EXPECT_EQ(0, delegate2.gesture_event_count()); | 873 EXPECT_EQ(0, delegate2.gesture_event_count()); |
874 EXPECT_EQ(0, delegate2.touch_event_count()); | 874 EXPECT_EQ(0, delegate2.touch_event_count()); |
875 } | 875 } |
876 | 876 |
877 TEST_F(WindowTest, TouchCaptureDoesntCancelCapturedTouches) { | 877 #if defined(OS_WIN) |
| 878 // http://crbug.com/396387 |
| 879 #define MAYBE_TouchCaptureDoesntCancelCapturedTouches DISABLED_TouchCaptureDoesn
tCancelCapturedTouches |
| 880 #else |
| 881 #define MAYBE_TouchCaptureDoesntCancelCapturedTouches TouchCaptureDoesntCancelCa
pturedTouches |
| 882 #endif |
| 883 TEST_F(WindowTest, MAYBE_TouchCaptureDoesntCancelCapturedTouches) { |
878 CaptureWindowDelegateImpl delegate; | 884 CaptureWindowDelegateImpl delegate; |
879 scoped_ptr<Window> window(CreateTestWindowWithDelegate( | 885 scoped_ptr<Window> window(CreateTestWindowWithDelegate( |
880 &delegate, 0, gfx::Rect(0, 0, 50, 50), root_window())); | 886 &delegate, 0, gfx::Rect(0, 0, 50, 50), root_window())); |
881 | 887 |
882 ui::TouchEvent press( | 888 ui::TouchEvent press( |
883 ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 0, getTime()); | 889 ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 0, getTime()); |
884 DispatchEventUsingWindowDispatcher(&press); | 890 DispatchEventUsingWindowDispatcher(&press); |
885 | 891 |
886 // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN. | 892 // We will get both GESTURE_BEGIN and GESTURE_TAP_DOWN. |
887 EXPECT_EQ(2, delegate.gesture_event_count()); | 893 EXPECT_EQ(2, delegate.gesture_event_count()); |
(...skipping 2545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3433 | 3439 |
3434 EXPECT_TRUE(animator); | 3440 EXPECT_TRUE(animator); |
3435 EXPECT_FALSE(animator->is_animating()); | 3441 EXPECT_FALSE(animator->is_animating()); |
3436 EXPECT_TRUE(observer.animation_completed()); | 3442 EXPECT_TRUE(observer.animation_completed()); |
3437 EXPECT_FALSE(observer.animation_aborted()); | 3443 EXPECT_FALSE(observer.animation_aborted()); |
3438 animator->RemoveObserver(&observer); | 3444 animator->RemoveObserver(&observer); |
3439 } | 3445 } |
3440 | 3446 |
3441 } // namespace test | 3447 } // namespace test |
3442 } // namespace aura | 3448 } // namespace aura |
OLD | NEW |