Index: media/capture/video/video_capture_device.h |
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h |
index a716db8665967b41a6af20cf42600324457ff978..f29d980d94b62cafdcc8080159defdfb60d96936 100644 |
--- a/media/capture/video/video_capture_device.h |
+++ b/media/capture/video/video_capture_device.h |
@@ -41,14 +41,6 @@ class Location; |
namespace media { |
-class CAPTURE_EXPORT FrameBufferPool { |
- public: |
- virtual ~FrameBufferPool() {} |
- |
- virtual void SetBufferHold(int buffer_id) = 0; |
- virtual void ReleaseBufferHold(int buffer_id) = 0; |
-}; |
- |
class CAPTURE_EXPORT VideoFrameConsumerFeedbackObserver { |
public: |
virtual ~VideoFrameConsumerFeedbackObserver() {} |
@@ -117,14 +109,14 @@ class CAPTURE_EXPORT VideoCaptureDevice |
Buffer(Buffer&& other); |
Buffer& operator=(Buffer&& other); |
- bool is_valid() const { return handle_provider_ != nullptr; } |
+ bool is_valid() const { return handle_provider != nullptr; } |
int id() const { return id_; } |
int frame_feedback_id() const { return frame_feedback_id_; } |
- HandleProvider* handle_provider() const { return handle_provider_.get(); } |
+ |
+ std::unique_ptr<HandleProvider> handle_provider; |
miu
2017/02/14 00:41:27
style: Classes shouldn't have public-access data m
chfremer
2017/02/14 21:15:16
I still feel this should be a plain struct. This w
|
+ std::unique_ptr<ScopedAccessPermission> access_permission; |
miu
2017/02/14 00:41:27
ditto
chfremer
2017/02/14 21:15:16
Acknowledged.
|
private: |
- std::unique_ptr<HandleProvider> handle_provider_; |
- std::unique_ptr<ScopedAccessPermission> access_permission_; |
int id_; |
int frame_feedback_id_; |