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

Side by Side Diff: webrtc/modules/desktop_capture/screen_capturer_unittest.cc

Issue 2319383002: Several minor changes to ScreenCapturerWinMagnifier (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 return; 368 return;
369 } 369 }
370 370
371 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); 371 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
372 RTC_CHECK(CreateDirectxCapturer()); 372 RTC_CHECK(CreateDirectxCapturer());
373 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); 373 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
374 } 374 }
375 375
376 // Disabled due to being flaky due to the fact that it useds rendering / UI, 376 // Disabled due to being flaky due to the fact that it useds rendering / UI,
377 // see webrtc/6366. 377 // see webrtc/6366.
378 TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) {
379 CreateMagnifierCapturer();
380 TestCaptureUpdatedRegion();
381 }
382
383 // Disabled due to being flaky due to the fact that it useds rendering / UI,
Sergey Ulanov 2016/09/19 20:53:18 typo: useds
Hzj_jie 2016/09/19 22:05:23 Ah, yes, all updated.
384 // see webrtc/6366.
378 TEST_F(ScreenCapturerTest, DISABLED_TwoMagnifierCapturers) { 385 TEST_F(ScreenCapturerTest, DISABLED_TwoMagnifierCapturers) {
379 CreateMagnifierCapturer(); 386 CreateMagnifierCapturer();
380 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_); 387 std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
381 CreateMagnifierCapturer(); 388 CreateMagnifierCapturer();
382 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); 389 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
383 } 390 }
384 391
385 #endif // defined(WEBRTC_WIN) 392 #endif // defined(WEBRTC_WIN)
386 393
387 } // namespace webrtc 394 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698