0f49daccbe
Reason for revert: Resubmit capturer tests Original issue's description: > Revert of [WebRTC] A real ScreenCapturer test (patchset #8 id:240001 of https://codereview.webrtc.org/2268093002/ ) > > Reason for revert: > ScreenCapturerTest.CaptureUpdatedRegion fails on Win DrMemory Full. > > Original issue's description: > > [WebRTC] A real ScreenCapturer test > > > > We do not have a real ScreenCapturer test before. And after CL 2210443002, a new > > ScreenDrawer interface is added to the code base to draw various shapes on the > > screen. This change is to use ScreenDrawer to test ScreenCapturer. Besides test > > cases, some other changes are included, > > > > 1. A WaitForPendingPaintings() function in ScreenDrawer, to wait for a > > ScreenDrawer to finish all the pending draws. This function now only sleeps 50 > > milliseconds on X11 and 100 milliseconds on Windows. > > > > 2. A Color structure to help handle a big-endian or little-endian safe color and > > provide functions to compare with DesktopFrame::data(). Both ScreenDrawer and > > DesktopFrameGenerator (in change 2202443002) can use this class to create colors > > and compare with or paint to a DesktopFrame. > > > > 3. ScreenDrawer now uses Color structure instead of uint32_t. > > > > BUG=314516 > > > > TBR=kjellander@chromium.org > > > > Committed: https://crrev.com/9d1c54ace0dc9f68da0152aa1ded2a8dba0a43ae > > Cr-Commit-Position: refs/heads/master@{#14058} > > TBR=sergeyu@chromium.org,jamiewalch@chromium.org,kjellander@chromium.org,zijiehe@chromium.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=314516 > > Committed: https://crrev.com/4c44202dc348613695a4b529bbd7c9bdab6195ec > Cr-Commit-Position: refs/heads/master@{#14071} TBR=sergeyu@chromium.org,jamiewalch@chromium.org,kjellander@chromium.org,asapersson@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=644130 Review-Url: https://codereview.webrtc.org/2313653003 Cr-Commit-Position: refs/heads/master@{#14113}
57 lines
2.0 KiB
C++
57 lines
2.0 KiB
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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_
|
|
#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "webrtc/modules/desktop_capture/rgba_color.h"
|
|
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// A set of basic platform dependent functions to draw various shapes on the
|
|
// screen.
|
|
class ScreenDrawer {
|
|
public:
|
|
// Creates a ScreenDrawer for the current platform, returns nullptr if no
|
|
// ScreenDrawer implementation available.
|
|
static std::unique_ptr<ScreenDrawer> Create();
|
|
|
|
ScreenDrawer() {}
|
|
virtual ~ScreenDrawer() {}
|
|
|
|
// Returns the region inside which DrawRectangle() function are expected to
|
|
// work, in capturer coordinates (assuming ScreenCapturer::SelectScreen has
|
|
// not been called). This region may exclude regions of the screen reserved by
|
|
// the OS for things like menu bars or app launchers.
|
|
virtual DesktopRect DrawableRegion() = 0;
|
|
|
|
// Draws a rectangle to cover |rect| with |color|. Note, rect.bottom() and
|
|
// rect.right() two lines are not included. The part of |rect| which is out of
|
|
// DrawableRegion() will be ignored.
|
|
virtual void DrawRectangle(DesktopRect rect, RgbaColor color) = 0;
|
|
|
|
// Clears all content on the screen by filling the area with black.
|
|
virtual void Clear() = 0;
|
|
|
|
// Blocks current thread until OS finishes previous DrawRectangle() actions.
|
|
// ScreenCapturer should be able to capture the changes after this function
|
|
// finish.
|
|
virtual void WaitForPendingDraws() = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_DRAWER_H_
|