Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: content/browser/renderer_host/input/non_blocking_event_browsertest.cc

Issue 1806853007: Re-enable NonBlockingEventBrowserTest on Win8 TSan Build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // Expect that the compositor scrolled at least one pixel while the 160 // Expect that the compositor scrolled at least one pixel while the
161 // main thread was in a busy loop. 161 // main thread was in a busy loop.
162 while (frame_watcher->LastMetadata().root_scroll_offset.y() <= 0) 162 while (frame_watcher->LastMetadata().root_scroll_offset.y() <= 0)
163 frame_watcher->WaitFrames(1); 163 frame_watcher->WaitFrames(1);
164 } 164 }
165 165
166 private: 166 private:
167 DISALLOW_COPY_AND_ASSIGN(NonBlockingEventBrowserTest); 167 DISALLOW_COPY_AND_ASSIGN(NonBlockingEventBrowserTest);
168 }; 168 };
169 169
170 // Also appears to be flaky under TSan. crbug.com/588199 170 IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MouseWheel) {
171 #if defined(THREAD_SANITIZER)
172 #define MAYBE_MouseWheel DISABLED_MouseWheel
173 #else
174 #define MAYBE_MouseWheel MouseWheel
175 #endif
176 IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MAYBE_MouseWheel) {
177 LoadURL(); 171 LoadURL();
178 DoWheelScroll(); 172 DoWheelScroll();
179 } 173 }
180 174
181 // Disabled on MacOS because it doesn't support touch input. 175 // Disabled on MacOS because it doesn't support touch input.
182 #if defined(OS_MACOSX) 176 #if defined(OS_MACOSX)
183 #define MAYBE_TouchStart DISABLED_TouchStart 177 #define MAYBE_TouchStart DISABLED_TouchStart
184 #else 178 #else
185 #define MAYBE_TouchStart TouchStart 179 #define MAYBE_TouchStart TouchStart
186 #endif 180 #endif
187 IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MAYBE_TouchStart) { 181 IN_PROC_BROWSER_TEST_F(NonBlockingEventBrowserTest, MAYBE_TouchStart) {
188 LoadURL(); 182 LoadURL();
189 DoTouchScroll(); 183 DoTouchScroll();
190 } 184 }
191 185
192 } // namespace content 186 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698