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 {
- public:
-  Core(DesktopFrame* frame) : frame_(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(desktop_frame.release())));

[Wez, 2016/06/01 21:29:05]

nit: Can you move() here, since you're going from unique_ptr to unique_ptr?

[Sergey Ulanov, 2016/06/03 08:14:31]

Nope, it doesn't work because rtc::RefCountedObject constructor doesn't pass it
the argument as rvalue.
I'll try getting that fixed in a separate CL for RefCountedObject

+}
+
 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();
+  return core_->get();
 }
 
-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) {
-}
+    : DesktopFrame(core->get()->size(),

[Wez, 2016/06/01 21:29:05]

nit: Could you use *core->foo() here? :P

[Sergey Ulanov, 2016/06/03 08:14:31]

Changed to (*core)->foo(). The parentheses are required because -> operator
takes precedence

+                   core->get()->stride(),
+                   core->get()->data(),
+                   core->get()->shared_memory()),
+      core_(core) {}
 
 }  // namespace webrtc