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

webrtc/modules/desktop_capture/shared_desktop_frame.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.
  */
 
 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
 
 #include <memory>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 
 namespace webrtc {
 
 class SharedDesktopFrame::Core {

[Wez, 2016/05/18 01:29:50]

nit: While you're here... couldn't this effectively be replaced with:

rtc::RefCountedObject<std::unique_ptr<DesktopFrame>>

Or would that lead to too much get() ugliness?

[Sergey Ulanov, 2016/05/31 12:02:49]

Done.

  public:
-  Core(DesktopFrame* frame) : frame_(frame) {}
+  Core(std::unique_ptr<DesktopFrame> frame) : frame_(std::move(frame)) {}
 
   DesktopFrame* frame() { return frame_.get(); }
 
   bool HasOneRef() { return ref_count_.Value() == 1; }
 
   virtual int32_t AddRef() {
     return ++ref_count_;
   }
 
   virtual int32_t Release() {
     int32_t ref_count;
     ref_count = --ref_count_;
     if (ref_count == 0)
       delete this;
     return ref_count;
   }
 
  private:
   virtual ~Core() {}
 
   Atomic32 ref_count_;
   std::unique_ptr<DesktopFrame> frame_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 SharedDesktopFrame::~SharedDesktopFrame() {}
 
 // static
+std::unique_ptr<SharedDesktopFrame> SharedDesktopFrame::Wrap(
+    std::unique_ptr<DesktopFrame> desktop_frame) {
+  return std::unique_ptr<SharedDesktopFrame>(
+      new SharedDesktopFrame(new Core(std::move(desktop_frame))));
+}
+
 SharedDesktopFrame* SharedDesktopFrame::Wrap(DesktopFrame* desktop_frame) {
-  rtc::scoped_refptr<Core> core(new Core(desktop_frame));
-  return new SharedDesktopFrame(core);
+  return Wrap(std::unique_ptr<DesktopFrame>(desktop_frame)).release();
 }
 
 DesktopFrame* SharedDesktopFrame::GetUnderlyingFrame() {
   return core_->frame();
 }
 
-SharedDesktopFrame* SharedDesktopFrame::Share() {
-  SharedDesktopFrame* result = new SharedDesktopFrame(core_);
+std::unique_ptr<SharedDesktopFrame> SharedDesktopFrame::Share() {
+  std::unique_ptr<SharedDesktopFrame> result(new SharedDesktopFrame(core_));
   result->set_dpi(dpi());
   result->set_capture_time_ms(capture_time_ms());
   *result->mutable_updated_region() = updated_region();
   return result;
 }
 
 bool SharedDesktopFrame::IsShared() {
   return !core_->HasOneRef();
 }
 
 SharedDesktopFrame::SharedDesktopFrame(rtc::scoped_refptr<Core> core)
     : DesktopFrame(core->frame()->size(),
                    core->frame()->stride(),
                    core->frame()->data(),
                    core->frame()->shared_memory()),
       core_(core) {
 }
 
 }  // namespace webrtc