6a4607e100
ScreenCapturer tests may fail on trybot, so this change is to fix the issue. Changes include, 1. Sometimes, a capturer may capture part of the change, i.e. usually the draw actions are not atomic. So the updated_region may be inaccurate. So I have added a MayDrawIncompleteShapes() function in ScreenDrawer. If it returns false, the updated_region check will be ignored. 2. Several test cases may run concurrently, which makes one ScreenDrawer won't really work. Its window may be covered by another ScreenDrawer. So I have added a system wide lock to ensure only one ScreenDrawer is working at a certain time. 3. On unity (Linux), the top several pixels of a window may be covered by a shadow effect if the window is not focused. So I have added a BringToFront() function, and call it in WaitForPendingDraws(). 4. On Windows, the drawn shapes are 'temporary drawing', which will be erased once the window is covered by another one. So I repeat DrawRectangle() function call in the test case. TODO(zijiehe): The DISABLED_ prefixes will be added back after the code review. And I will move these test cases into modules_test in a coming change. BUG=647067 Review-Url: https://codereview.webrtc.org/2337073007 Cr-Commit-Position: refs/heads/master@{#14674}
31 lines
853 B
C++
31 lines
853 B
C++
/*
|
|
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/desktop_capture/screen_drawer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
std::unique_ptr<ScreenDrawerLock> g_screen_drawer_lock;
|
|
} // namespace
|
|
|
|
ScreenDrawerLock::ScreenDrawerLock() = default;
|
|
ScreenDrawerLock::~ScreenDrawerLock() = default;
|
|
|
|
ScreenDrawer::ScreenDrawer() {
|
|
g_screen_drawer_lock = ScreenDrawerLock::Create();
|
|
}
|
|
|
|
ScreenDrawer::~ScreenDrawer() {
|
|
g_screen_drawer_lock.reset();
|
|
}
|
|
|
|
} // namespace webrtc
|