| 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 "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <tuple> | 8 #include <tuple> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 generator.GestureScrollSequence( | 798 generator.GestureScrollSequence( |
| 799 gfx::Point(bounds.x() + 2, bounds.y() + 10), | 799 gfx::Point(bounds.x() + 2, bounds.y() + 10), |
| 800 gfx::Point(bounds.right() - 10, bounds.y() + 10), | 800 gfx::Point(bounds.right() - 10, bounds.y() + 10), |
| 801 base::TimeDelta::FromMilliseconds(20), | 801 base::TimeDelta::FromMilliseconds(20), |
| 802 1); | 802 1); |
| 803 | 803 |
| 804 delete web_contents->GetContentNativeView(); | 804 delete web_contents->GetContentNativeView(); |
| 805 } | 805 } |
| 806 | 806 |
| 807 | 807 |
| 808 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | 808 #if defined(OS_WIN) || defined(OS_LINUX) |
| 809 // This appears to be flaky in the same was as the other overscroll | 809 // This appears to be flaky in the same was as the other overscroll |
| 810 // tests. Enabling for non-Windows platforms. | 810 // tests. Enabling for non-Windows platforms. |
| 811 // See http://crbug.com/369871. | 811 // See http://crbug.com/369871. |
| 812 // For linux, see http://crbug.com/381294 | 812 // For linux, see http://crbug.com/381294. |
| 813 // For ChromeOS, see http://crbug.com/668128. |
| 813 #define MAYBE_RepeatedQuickOverscrollGestures DISABLED_RepeatedQuickOverscrollGe
stures | 814 #define MAYBE_RepeatedQuickOverscrollGestures DISABLED_RepeatedQuickOverscrollGe
stures |
| 814 #else | 815 #else |
| 815 #define MAYBE_RepeatedQuickOverscrollGestures RepeatedQuickOverscrollGestures | 816 #define MAYBE_RepeatedQuickOverscrollGestures RepeatedQuickOverscrollGestures |
| 816 #endif | 817 #endif |
| 817 | 818 |
| 818 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, | 819 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, |
| 819 MAYBE_RepeatedQuickOverscrollGestures) { | 820 MAYBE_RepeatedQuickOverscrollGestures) { |
| 820 ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/overscroll_navigation.html")); | 821 ASSERT_NO_FATAL_FAILURE(StartTestWithPage("/overscroll_navigation.html")); |
| 821 | 822 |
| 822 WebContentsImpl* web_contents = | 823 WebContentsImpl* web_contents = |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1126 details = dispatcher->OnEventFromSource(&release); | 1127 details = dispatcher->OnEventFromSource(&release); |
| 1127 ASSERT_FALSE(details.dispatcher_destroyed); | 1128 ASSERT_FALSE(details.dispatcher_destroyed); |
| 1128 WaitAFrame(); | 1129 WaitAFrame(); |
| 1129 | 1130 |
| 1130 EXPECT_LT(0, tracker.num_overscroll_updates()); | 1131 EXPECT_LT(0, tracker.num_overscroll_updates()); |
| 1131 EXPECT_FALSE(tracker.overscroll_completed()); | 1132 EXPECT_FALSE(tracker.overscroll_completed()); |
| 1132 } | 1133 } |
| 1133 } | 1134 } |
| 1134 | 1135 |
| 1135 } // namespace content | 1136 } // namespace content |
| OLD | NEW |