Revert of Allow Windows to return a monitor out of the first quadrant (patchset #2 id:60001 of https://codereview.chromium.org/2848443004/ )

Reason for revert:
TranslateRect() is placed in a wrong position.

Original issue's description:
> Allow Windows to return a monitor out of the first quadrant
>
> Windows may return a DesktopCoordinate out of the first quadrant
> (x >= 0 && y >= 0), this typically happens when the primary and secondary
> monitors are swapped. i.e. The secondary monitor is on the left but the primary
> one is on the right.
> This change "moves" the entire screen from any quadrant to the (0, 0), so we can
> capture the monitors in other quadrants.
>
> BUG=chromium:715689
>
> Review-Url: https://codereview.webrtc.org/2848443004
> Cr-Commit-Position: refs/heads/master@{#17935}
> Committed: https://chromium.googlesource.com/external/webrtc/+/049ec71e657eef3d15e0f15d60acb1a71e81b521

[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:715689

Review-Url: https://codereview.webrtc.org/2852783002
Cr-Commit-Position: refs/heads/master@{#17936}

Author: zijiehe

webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc

@@ -25,7 +25,8 @@ using Microsoft::WRL::ComPtr;
 namespace {
 
 bool IsValidRect(const RECT& rect) {
-  return rect.right > rect.left && rect.bottom > rect.top;
+  return rect.left >= 0 && rect.top >= 0 && rect.right > rect.left &&
+         rect.bottom > rect.top;
 }
 
 }  // namespace
@@ -152,12 +153,4 @@ int64_t DxgiAdapterDuplicator::GetNumFramesCaptured() const {
   return min;
 }
 
-void DxgiAdapterDuplicator::TranslateRect(const DesktopVector& position) {
-  desktop_rect_.Translate(position);
-  RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
-  for (auto& duplicator : duplicators_) {
-    duplicator.TranslateRect(position);
-  }
-}
-
 }  // namespace webrtc

webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h

@@ -71,10 +71,6 @@ class DxgiAdapterDuplicator {
   // The minimum num_frames_captured() returned by |duplicators_|.
   int64_t GetNumFramesCaptured() const;
 
-  // Moves |desktop_rect_| and all underlying |duplicators_|. See
-  // DxgiDuplicatorController::TranslateRect().
-  void TranslateRect(const DesktopVector& position);
-
  private:
   bool DoInitialize();
 

webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.cc

@@ -193,7 +193,6 @@ bool DxgiDuplicatorController::DoInitialize() {
                                 std::max(left.right(), right.right()),
                                 std::max(left.bottom(), right.bottom()));
     }
-    TranslateRect();
   }
 
   HDC hdc = GetDC(nullptr);
@@ -296,7 +295,7 @@ int64_t DxgiDuplicatorController::GetNumFramesCaptured() const {
 }
 
 DesktopSize DxgiDuplicatorController::desktop_size() const {
-  return desktop_rect_.size();
+  return DesktopSize(desktop_rect_.right(), desktop_rect_.bottom());
 }
 
 DesktopRect DxgiDuplicatorController::ScreenRect(int id) const {
@@ -379,13 +378,4 @@ bool DxgiDuplicatorController::EnsureFrameCaptured(Context* context,
   return true;
 }
 
-void DxgiDuplicatorController::TranslateRect() {
-  const DesktopVector position =
-      DesktopVector().subtract(desktop_rect_.top_left());
-  desktop_rect_.Translate(position);
-  for (auto& duplicator : duplicators_) {
-    duplicator.TranslateRect(position);
-  }
-}
-
 }  // namespace webrtc

webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h

@@ -158,7 +158,9 @@ class DxgiDuplicatorController {
   // The minimum GetNumFramesCaptured() returned by |duplicators_|.
   int64_t GetNumFramesCaptured() const;
 
-  // Returns a DesktopSize to cover entire |desktop_rect_|.
+  // Returns a DesktopSize to cover entire desktop_rect. This may be different
+  // than desktop_rect().size(), since top-left of the screen does not need to
+  // be started from (0, 0).
   DesktopSize desktop_size() const;
 
   // Returns the size of one screen. |id| should be >= 0. If system does not
@@ -179,12 +181,6 @@ class DxgiDuplicatorController {
   // during first several capture attempts.
   bool EnsureFrameCaptured(Context* context, SharedDesktopFrame* target);
 
-  // Moves |desktop_rect_| and all underlying |duplicators_|, putting top left
-  // corner of the desktop at (0, 0). This is necessary because DXGI_OUTPUT_DESC
-  // may return negative coordinates. Called from DoInitialize() after all
-  // DxgiAdapterDuplicator and DxgiOutputDuplicator instances are initialized.
-  void TranslateRect();
-
   // This lock must be locked whenever accessing any of the following objects.
   rtc::CriticalSection lock_;
 

webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc

@@ -67,7 +67,7 @@ DxgiOutputDuplicator::DxgiOutputDuplicator(const D3dDevice& device,
       desktop_rect_(RECTToDesktopRect(desc.DesktopCoordinates)) {
   RTC_DCHECK(output_);
   RTC_DCHECK(!desktop_rect_.is_empty());
-  RTC_DCHECK(desktop_rect_.width() > 0 && desktop_rect_.height() > 0);
+  RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
 }
 
 DxgiOutputDuplicator::DxgiOutputDuplicator(DxgiOutputDuplicator&& other) =
@@ -381,9 +381,4 @@ int64_t DxgiOutputDuplicator::num_frames_captured() const {
   return num_frames_captured_;
 }
 
-void DxgiOutputDuplicator::TranslateRect(const DesktopVector& position) {
-  desktop_rect_.Translate(position);
-  RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
-}
-
 }  // namespace webrtc

webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h

@@ -75,9 +75,6 @@ class DxgiOutputDuplicator {
   // How many frames have been captured by this DxigOutputDuplicator.
   int64_t num_frames_captured() const;
 
-  // Moves |desktop_rect_|. See DxgiDuplicatorController::TranslateRect().
-  void TranslateRect(const DesktopVector& position);
-
  private:
   // Calls DoDetectUpdatedRegion(). If it fails, this function sets the
   // |updated_region| as entire UntranslatedDesktopRect().
@@ -112,7 +109,7 @@ class DxgiOutputDuplicator {
 
   const D3dDevice device_;
   const Microsoft::WRL::ComPtr<IDXGIOutput1> output_;
-  DesktopRect desktop_rect_;
+  const DesktopRect desktop_rect_;
   Microsoft::WRL::ComPtr<IDXGIOutputDuplication> duplication_;
   DXGI_OUTDUPL_DESC desc_;
   std::vector<uint8_t> metadata_;