Index: remoting/client/rectangle_update_decoder.h |
diff --git a/remoting/client/rectangle_update_decoder.h b/remoting/client/rectangle_update_decoder.h |
index d44bb6fae97580b559697c8867d2ba558e239040..1a61856698fc4c5a5b8762a0294788784bae9298 100644 |
--- a/remoting/client/rectangle_update_decoder.h |
+++ b/remoting/client/rectangle_update_decoder.h |
@@ -38,10 +38,7 @@ class RectangleUpdateDecoder : |
// regsitered as data is avaialable. DecodePacket may keep a reference to |
// |packet| so the |packet| must remain alive and valid until |done| is |
// executed. |
- // |
- // TODO(ajwong): Should packet be a const pointer to make the lifetime |
- // more clear? |
- void DecodePacket(const VideoPacket* packet, Task* done); |
+ void DecodePacket(const VideoPacket* packet, const base::Closure& done); |
// Set the scale ratio for the decoded video frame. Scale ratio greater |
// than 1.0 is not supported. |
@@ -64,8 +61,8 @@ class RectangleUpdateDecoder : |
~RectangleUpdateDecoder(); |
- void AllocateFrame(const VideoPacket* packet, Task* done); |
- void ProcessPacketData(const VideoPacket* packet, Task* done); |
+ void AllocateFrame(const VideoPacket* packet, const base::Closure& done); |
+ void ProcessPacketData(const VideoPacket* packet, const base::Closure& done); |
void RefreshRects(const RectVector& rects); |
// Obtain updated rectangles from decoder and submit it to the consumer. |
@@ -75,9 +72,8 @@ class RectangleUpdateDecoder : |
// When done the affected rectangles are submitted to the consumer. |
void DoRefresh(); |
- // Called by PartialFrameCleanup when consumer has finished using our |
- // internal frame. |
- void OnFrameConsumed(); |
+ // Callback for FrameConsumer::OnPartialFrameOutput() |
+ void OnFrameConsumed(RectVector* rects); |
// Pointers to infrastructure objects. Not owned. |
MessageLoop* message_loop_; |
@@ -99,6 +95,4 @@ class RectangleUpdateDecoder : |
} // namespace remoting |
-DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::RectangleUpdateDecoder); |
- |
#endif // REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H |