Index: remoting/client/frame_consumer.h |
diff --git a/remoting/client/frame_consumer.h b/remoting/client/frame_consumer.h |
index 339b3a4d453c4ee8c6d922d396ba2cdea875a37a..187b3d56b6e694d7d6112357ffced68fe739cc15 100644 |
--- a/remoting/client/frame_consumer.h |
+++ b/remoting/client/frame_consumer.h |
@@ -18,12 +18,12 @@ class FrameConsumer { |
// Request a frame be allocated from the FrameConsumer. |
// |
- // If a frame cannot be allocated to fit the format, and height/width |
+ // If a frame cannot be allocated to fit the format, and |size| |
// requirements, |frame_out| will be set to NULL. |
// |
- // An allocated frame will have at least the width and height requested, but |
- // may be bigger. Query the retrun frame for the actual frame size, stride, |
- // etc. |
+ // An allocated frame will have at least the |size| requested, but |
+ // may be bigger. Query the retrun frame for the actual frame size, |
+ // stride, etc. |
// |
// The AllocateFrame call is asynchronous. From invocation, until when the |
// |done| callback is invoked, |frame_out| should be considered to be locked |
@@ -35,12 +35,9 @@ class FrameConsumer { |
// All frames retrieved via the AllocateFrame call must be released by a |
// corresponding call ReleaseFrame(scoped_refptr<VideoFrame>* frame_out. |
virtual void AllocateFrame(media::VideoFrame::Format format, |
- size_t width, |
- size_t height, |
- base::TimeDelta timestamp, |
- base::TimeDelta duration, |
+ const SkISize& size, |
scoped_refptr<media::VideoFrame>* frame_out, |
- Task* done) = 0; |
+ const base::Closure& done) = 0; |
virtual void ReleaseFrame(media::VideoFrame* frame) = 0; |
@@ -52,7 +49,7 @@ class FrameConsumer { |
// callback is invoked. |
virtual void OnPartialFrameOutput(media::VideoFrame* frame, |
RectVector* rects, |
- Task* done) = 0; |
+ const base::Closure& done) = 0; |
private: |
DISALLOW_COPY_AND_ASSIGN(FrameConsumer); |