[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() and OnFrameReadyInBuffer(

media/capture/video/video_capture_device.h

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 members. Perhaps you could add
a TakeHandleProvider() method to transfer ownership from this class to the new
owner?

Also, since the ownership can be transferred, does that mean all other
codepoints accessing this object need to include null checks?

[chfremer, 2017/02/14 21:15:16]

I still feel this should be a plain struct. This was harder to argue for in the
previous CL, since it was passed around more and the ownership of the unique_ptr
members was never moved out. But with this CL this is really only used to bundle
input/output parameters in the communication between VideoCaptureDevice and its
Client.

I am proposing to make this a struct.

+      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_;