Merge ScreenCapturerWinDirectx::frames_ and contexts_

webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h

 /*
  *  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_WIN_DXGI_OUTPUT_DUPLICATOR_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_
 
 #include <comdef.h>
 #include <wrl/client.h>
 #include <DXGI.h>
 #include <DXGI1_2.h>
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "webrtc/modules/desktop_capture/desktop_region.h"
 #include "webrtc/modules/desktop_capture/desktop_frame_rotation.h"
 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
 #include "webrtc/modules/desktop_capture/win/d3d_device.h"
+#include "webrtc/modules/desktop_capture/win/dxgi_context.h"
 #include "webrtc/modules/desktop_capture/win/dxgi_texture.h"
 
 namespace webrtc {
 
 // Duplicates the content on one IDXGIOutput, i.e. one monitor attached to one
 // video card. None of functions in this class is thread-safe.
 class DxgiOutputDuplicator {
  public:
-  struct Context {
-    // The updated region DxgiOutputDuplicator::DetectUpdatedRegion() output
-    // during last Duplicate() function call. It's always relative to the
-    // (0, 0).
-    DesktopRegion updated_region;
-  };
+  using Context = DxgiOutputContext;
 
   // Creates an instance of DxgiOutputDuplicator from a D3dDevice and one of its
   // IDXGIOutput1. Caller must maintain the lifetime of device, to make sure it
   // outlives this instance. Only DxgiAdapterDuplicator can create an instance.
   DxgiOutputDuplicator(const D3dDevice& device,
                        const Microsoft::WRL::ComPtr<IDXGIOutput1>& output,
                        const DXGI_OUTPUT_DESC& desc);
 
   // To allow this class to work with vector.
   DxgiOutputDuplicator(DxgiOutputDuplicator&& other);
@@ skipping 79 matching lines @@
   // |last_frame_|.
   std::unique_ptr<SharedDesktopFrame> last_frame_;
   DesktopVector last_frame_offset_;
 
   int64_t num_frames_captured_ = 0;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_DXGI_OUTPUT_DUPLICATOR_H_