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

Unified Diff: webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc

Issue 2845213002: DesktopRect::UnionWith() to extend current rect to cover the input rect (Closed)
Patch Set: Sync latest changes Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
diff --git a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc b/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
index 5947daf5dcccf8d8786e6d7c390721cbbc7468e8..a73f9e39f7988818d24643ebf7f357f3c44d0938 100644
--- a/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
+++ b/webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc
@@ -76,17 +76,7 @@ bool DxgiAdapterDuplicator::DoInitialize() {
if (!duplicators_.back().Initialize()) {
return false;
}
- if (desktop_rect_.is_empty()) {
- desktop_rect_ = duplicators_.back().desktop_rect();
- } else {
- const DesktopRect& left = desktop_rect_;
- const DesktopRect& right = duplicators_.back().desktop_rect();
- desktop_rect_ =
- DesktopRect::MakeLTRB(std::min(left.left(), right.left()),
- std::min(left.top(), right.top()),
- std::max(left.right(), right.right()),
- std::max(left.bottom(), right.bottom()));
- }
+ desktop_rect_.UnionWith(duplicators_.back().desktop_rect());
}
} else {
LOG(LS_WARNING) << "Failed to get output description of device " << i

Powered by Google App Engine
This is Rietveld 408576698