| 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 <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 // We need to wait until at least one frame has been composited | 104 // We need to wait until at least one frame has been composited |
| 105 // otherwise the injection of the synthetic gestures may get | 105 // otherwise the injection of the synthetic gestures may get |
| 106 // dropped because of MainThread/Impl thread sync of touch event | 106 // dropped because of MainThread/Impl thread sync of touch event |
| 107 // regions. | 107 // regions. |
| 108 frame_watcher->WaitFrames(1); | 108 frame_watcher->WaitFrames(1); |
| 109 } | 109 } |
| 110 | 110 |
| 111 // ContentBrowserTest: | 111 // ContentBrowserTest: |
| 112 void SetUpCommandLine(base::CommandLine* cmd) override { | 112 void SetUpCommandLine(base::CommandLine* cmd) override { |
| 113 cmd->AppendSwitchASCII(switches::kTouchEvents, | 113 cmd->AppendSwitchASCII(switches::kTouchEventFeatureDetection, |
| 114 switches::kTouchEventsEnabled); | 114 switches::kTouchEventFeatureDetectionEnabled); |
| 115 // TODO(rbyers): Remove this switch once touch-action ships. | 115 // TODO(rbyers): Remove this switch once touch-action ships. |
| 116 // http://crbug.com/241964 | 116 // http://crbug.com/241964 |
| 117 cmd->AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures); | 117 cmd->AppendSwitch(switches::kEnableExperimentalWebPlatformFeatures); |
| 118 } | 118 } |
| 119 | 119 |
| 120 int ExecuteScriptAndExtractInt(const std::string& script) { | 120 int ExecuteScriptAndExtractInt(const std::string& script) { |
| 121 int value = 0; | 121 int value = 0; |
| 122 EXPECT_TRUE(content::ExecuteScriptAndExtractInt( | 122 EXPECT_TRUE(content::ExecuteScriptAndExtractInt( |
| 123 shell(), "domAutomationController.send(" + script + ")", &value)); | 123 shell(), "domAutomationController.send(" + script + ")", &value)); |
| 124 return value; | 124 return value; |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 DoTouchScroll(gfx::Point(50, 150), gfx::Vector2d(0, 45), false); | 219 DoTouchScroll(gfx::Point(50, 150), gfx::Vector2d(0, 45), false); |
| 220 EXPECT_FALSE(scrolled); | 220 EXPECT_FALSE(scrolled); |
| 221 | 221 |
| 222 EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchstart")); | 222 EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchstart")); |
| 223 EXPECT_GE(ExecuteScriptAndExtractInt("eventCounts.touchmove"), 1); | 223 EXPECT_GE(ExecuteScriptAndExtractInt("eventCounts.touchmove"), 1); |
| 224 EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend")); | 224 EXPECT_EQ(1, ExecuteScriptAndExtractInt("eventCounts.touchend")); |
| 225 EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel")); | 225 EXPECT_EQ(0, ExecuteScriptAndExtractInt("eventCounts.touchcancel")); |
| 226 } | 226 } |
| 227 | 227 |
| 228 } // namespace content | 228 } // namespace content |
| OLD | NEW |