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 7d18db153cd44f92959a34876d955c1c871f4e9f..24e25cc9c9ccc414e74856cefdd1d357652050c1 100644 |
--- a/webrtc/modules/desktop_capture/shared_desktop_frame.h |
+++ b/webrtc/modules/desktop_capture/shared_desktop_frame.h |
@@ -11,6 +11,8 @@ |
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ |
#define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ |
+#include <memory> |
+ |
#include "webrtc/base/scoped_ref_ptr.h" |
#include "webrtc/modules/desktop_capture/desktop_frame.h" |
@@ -22,7 +24,8 @@ class SharedDesktopFrame : public DesktopFrame { |
public: |
virtual ~SharedDesktopFrame(); |
- static SharedDesktopFrame* Wrap(DesktopFrame* desktop_frame); |
+ static std::unique_ptr<SharedDesktopFrame> Wrap( |
Sergey Ulanov
2016/04/20 21:22:34
This will break code in chromium that currently us
Hzj_jie
2016/04/20 23:56:16
Oh, I thought this function is only used in webrtc
|
+ std::unique_ptr<DesktopFrame>&& desktop_frame); |
// Returns the underlying instance of DesktopFrame. |
DesktopFrame* GetUnderlyingFrame(); |