Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls.

webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
@@ skipping 39 matching lines @@
     src += src_stride;
     dest += dest_stride;
   }
 }
 
 // DesktopFrame wrapper that draws mouse on a frame and restores original
 // content before releasing the underlying frame.
 class DesktopFrameWithCursor : public DesktopFrame {
  public:
   // Takes ownership of |frame|.
-  DesktopFrameWithCursor(std::unique_ptr<DesktopFrame> frame,
+  DesktopFrameWithCursor(DesktopFrame* frame,
                          const MouseCursor& cursor,
                          const DesktopVector& position);
   virtual ~DesktopFrameWithCursor();
 
  private:
   std::unique_ptr<DesktopFrame> original_frame_;
 
   DesktopVector restore_position_;
   std::unique_ptr<DesktopFrame> restore_frame_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrameWithCursor);
 };
 
-DesktopFrameWithCursor::DesktopFrameWithCursor(
-    std::unique_ptr<DesktopFrame> frame,
-    const MouseCursor& cursor,
-    const DesktopVector& position)
-    : DesktopFrame(frame->size(),
-                   frame->stride(),
-                   frame->data(),
-                   frame->shared_memory()) {
+DesktopFrameWithCursor::DesktopFrameWithCursor(DesktopFrame* frame,
+                                               const MouseCursor& cursor,
+                                               const DesktopVector& position)
+    : DesktopFrame(frame->size(), frame->stride(),
+                   frame->data(), frame->shared_memory()),
+      original_frame_(frame) {
   set_dpi(frame->dpi());
   set_capture_time_ms(frame->capture_time_ms());
   mutable_updated_region()->Swap(frame->mutable_updated_region());
-  original_frame_ = std::move(frame);
 
   DesktopVector image_pos = position.subtract(cursor.hotspot());
   DesktopRect target_rect = DesktopRect::MakeSize(cursor.image()->size());
   target_rect.Translate(image_pos);
   DesktopVector target_origin = target_rect.top_left();
   target_rect.IntersectWith(DesktopRect::MakeSize(size()));
 
   if (target_rect.is_empty())
     return;
 
@@ skipping 52 matching lines @@
 void DesktopAndCursorComposer::Capture(const DesktopRegion& region) {
   if (mouse_monitor_.get())
     mouse_monitor_->Capture();
   desktop_capturer_->Capture(region);
 }
 
 void DesktopAndCursorComposer::SetExcludedWindow(WindowId window) {
   desktop_capturer_->SetExcludedWindow(window);
 }
 
-void DesktopAndCursorComposer::OnCaptureResult(
-    DesktopCapturer::Result result,
-    std::unique_ptr<DesktopFrame> frame) {
-  if (frame && cursor_ && cursor_state_ == MouseCursorMonitor::INSIDE) {
-    frame = std::unique_ptr<DesktopFrameWithCursor>(new DesktopFrameWithCursor(
-        std::move(frame), *cursor_, cursor_position_));
+void DesktopAndCursorComposer::OnCaptureCompleted(DesktopFrame* frame) {
+  if (frame && cursor_.get() && cursor_state_ == MouseCursorMonitor::INSIDE) {
+    DesktopFrameWithCursor* frame_with_cursor =
+        new DesktopFrameWithCursor(frame, *cursor_, cursor_position_);
+    frame = frame_with_cursor;
   }
 
-  callback_->OnCaptureResult(result, std::move(frame));
+  callback_->OnCaptureCompleted(frame);
 }
 
 void DesktopAndCursorComposer::OnMouseCursor(MouseCursor* cursor) {
   cursor_.reset(cursor);
 }
 
 void DesktopAndCursorComposer::OnMouseCursorPosition(
     MouseCursorMonitor::CursorState state,
     const DesktopVector& position) {
   cursor_state_ = state;
   cursor_position_ = position;
 }
 
 }  // namespace webrtc