| Index: webrtc/modules/desktop_capture/shared_desktop_frame.h
|
| diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.h b/webrtc/modules/desktop_capture/shared_desktop_frame.h
|
| index d9a521b0642d8a6c47d936acbfe97d8762a5f64d..4f6a2bb7c693ea9c265d7c03c2a3b13ba4210cb1 100644
|
| --- a/webrtc/modules/desktop_capture/shared_desktop_frame.h
|
| +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.h
|
| @@ -12,7 +12,6 @@
|
| #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
|
|
|
| #include "webrtc/base/constructormagic.h"
|
| -#include "webrtc/base/refcount.h"
|
| #include "webrtc/base/scoped_ref_ptr.h"
|
| #include "webrtc/modules/desktop_capture/desktop_frame.h"
|
|
|
| @@ -24,25 +23,20 @@
|
| public:
|
| virtual ~SharedDesktopFrame();
|
|
|
| - static std::unique_ptr<SharedDesktopFrame> Wrap(
|
| - std::unique_ptr<DesktopFrame> desktop_frame);
|
| -
|
| - // Deprecated.
|
| - // TODO(sergeyu): remove this method.
|
| static SharedDesktopFrame* Wrap(DesktopFrame* desktop_frame);
|
|
|
| // Returns the underlying instance of DesktopFrame.
|
| DesktopFrame* GetUnderlyingFrame();
|
|
|
| // Creates a clone of this object.
|
| - std::unique_ptr<SharedDesktopFrame> Share();
|
| + SharedDesktopFrame* Share();
|
|
|
| // Checks if the frame is currently shared. If it returns false it's
|
| // guaranteed that there are no clones of the object.
|
| bool IsShared();
|
|
|
| private:
|
| - typedef rtc::RefCountedObject<std::unique_ptr<DesktopFrame>> Core;
|
| + class Core;
|
|
|
| SharedDesktopFrame(rtc::scoped_refptr<Core> core);
|
|
|
|
|