Index: webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
diff --git a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
index 345a962223ebdc4a670ca6f0c88b076d9bd2375b..2b3d1dcf5cb33a8248b0fd2ac3424efcc79b72ce 100644 |
--- a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
+++ b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc |
@@ -15,6 +15,7 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "webrtc/base/random.h" |
#include "webrtc/base/timeutils.h" |
+#include "webrtc/system_wrappers/include/logging.h" |
#include "webrtc/system_wrappers/include/sleep.h" |
namespace webrtc { |
@@ -25,31 +26,28 @@ namespace webrtc { |
// --gtest_also_run_disabled_tests --gtest_filter=ScreenDrawerTest.*. |
TEST(ScreenDrawerTest, DISABLED_DrawRectangles) { |
std::unique_ptr<ScreenDrawer> drawer = ScreenDrawer::Create(); |
- if (!drawer) { |
- // No ScreenDrawer implementation for current platform. |
+ if (!drawer || drawer->DrawableRegion().is_empty()) { |
+ LOG(LS_WARNING) << "No ScreenDrawer implementation for current platform."; |
return; |
} |
- drawer->Clear(); |
DesktopRect rect = drawer->DrawableRegion(); |
Random random(rtc::TimeMicros()); |
for (int i = 0; i < 100; i++) { |
// Make sure we at least draw one pixel. |
- int left = random.Rand(rect.left(), rect.right() - 2); |
- int top = random.Rand(rect.top(), rect.bottom() - 2); |
+ int left = random.Rand(rect.width() - 2); |
+ int top = random.Rand(rect.height() - 2); |
drawer->DrawRectangle( |
- DesktopRect::MakeLTRB(left, top, random.Rand(left + 1, rect.right()), |
- random.Rand(top + 1, rect.bottom())), |
- random.Rand<uint32_t>()); |
+ DesktopRect::MakeLTRB(left, top, random.Rand(left + 1, rect.width()), |
+ random.Rand(top + 1, rect.height())), |
+ Color::FromBGRA(random.Rand<uint32_t>())); |
if (i == 50) { |
SleepMs(10000); |
- drawer->Clear(); |
} |
} |
SleepMs(10000); |
- drawer->Clear(); |
} |
} // namespace webrtc |