| 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 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 996 WaitAFrame(); | 996 WaitAFrame(); |
| 997 | 997 |
| 998 if (!navigated) | 998 if (!navigated) |
| 999 EXPECT_EQ(10, ExecuteScriptAndExtractInt("touchmoveCount")); | 999 EXPECT_EQ(10, ExecuteScriptAndExtractInt("touchmoveCount")); |
| 1000 else | 1000 else |
| 1001 EXPECT_GT(10, ExecuteScriptAndExtractInt("touchmoveCount")); | 1001 EXPECT_GT(10, ExecuteScriptAndExtractInt("touchmoveCount")); |
| 1002 } | 1002 } |
| 1003 } | 1003 } |
| 1004 | 1004 |
| 1005 // Test that vertical overscroll updates are sent only when a user overscrolls | 1005 // Test that vertical overscroll updates are sent only when a user overscrolls |
| 1006 // vertically. | 1006 // vertically. Flaky on several platforms. https://crbug.com/679420 |
| 1007 #if defined(OS_WIN) | 1007 #if defined(OS_WIN) || defined(OS_CHROMEOS) |
| 1008 #define MAYBE_VerticalOverscroll DISABLED_VerticalOverscroll | 1008 #define MAYBE_VerticalOverscroll DISABLED_VerticalOverscroll |
| 1009 #else | 1009 #else |
| 1010 #define MAYBE_VerticalOverscroll VerticalOverscroll | 1010 #define MAYBE_VerticalOverscroll VerticalOverscroll |
| 1011 #endif | 1011 #endif |
| 1012 | 1012 |
| 1013 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_VerticalOverscroll) { | 1013 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_VerticalOverscroll) { |
| 1014 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 1014 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 1015 switches::kScrollEndEffect, "1"); | 1015 switches::kScrollEndEffect, "1"); |
| 1016 | 1016 |
| 1017 ASSERT_NO_FATAL_FAILURE(StartTestWithPage("about:blank")); | 1017 ASSERT_NO_FATAL_FAILURE(StartTestWithPage("about:blank")); |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1129 details = dispatcher->OnEventFromSource(&release); | 1129 details = dispatcher->OnEventFromSource(&release); |
| 1130 ASSERT_FALSE(details.dispatcher_destroyed); | 1130 ASSERT_FALSE(details.dispatcher_destroyed); |
| 1131 WaitAFrame(); | 1131 WaitAFrame(); |
| 1132 | 1132 |
| 1133 EXPECT_LT(0, tracker.num_overscroll_updates()); | 1133 EXPECT_LT(0, tracker.num_overscroll_updates()); |
| 1134 EXPECT_FALSE(tracker.overscroll_completed()); | 1134 EXPECT_FALSE(tracker.overscroll_completed()); |
| 1135 } | 1135 } |
| 1136 } | 1136 } |
| 1137 | 1137 |
| 1138 } // namespace content | 1138 } // namespace content |
| OLD | NEW |