Abstract PPAPI's ImageData behind webrtc::DesktopFrame interface

remoting/client/rectangle_update_decoder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H_
 #define REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H_
 
 #include <list>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/codec/video_decoder.h"
 #include "remoting/client/chromoting_stats.h"
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/frame_producer.h"
 #include "remoting/protocol/video_stub.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
-namespace pp {
-class ImageData;
-}  // namespace pp
-
 namespace remoting {
 
 class ChromotingStats;
 
 namespace protocol {
 class SessionConfig;
 }  // namespace protocol
 
 // TODO(ajwong): Re-examine this API, especially with regards to how error
 // conditions on each step are reported.  Should they be CHECKs? Logs? Other?
@@ skipping 11 matching lines @@
   RectangleUpdateDecoder(
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
       scoped_refptr<FrameConsumerProxy> consumer);
 
   // Initializes decoder with the information from the protocol config.
   void Initialize(const protocol::SessionConfig& config);
 
   // FrameProducer implementation.  These methods may be called before we are
   // Initialize()d, or we know the source screen size.
-  virtual void DrawBuffer(pp::ImageData* buffer) OVERRIDE;
+  virtual void DrawBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
   virtual void InvalidateRegion(const SkRegion& region) OVERRIDE;
   virtual void RequestReturnBuffers(const base::Closure& done) OVERRIDE;
   virtual void SetOutputSizeAndClip(const SkISize& view_size,
                                     const SkIRect& clip_area) OVERRIDE;
   virtual const SkRegion* GetBufferShape() OVERRIDE;
 
   // VideoStub implementation.
   virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                                   const base::Closure& done) OVERRIDE;
 
@@ skipping 30 matching lines @@
   SkISize source_size_;
 
   // Vertical and horizontal DPI of the remote screen.
   SkIPoint source_dpi_;
 
   // The current dimensions of the frame consumer view.
   SkISize view_size_;
   SkIRect clip_area_;
 
   // The drawing buffers supplied by the frame consumer.
-  std::list<pp::ImageData*> buffers_;
+  std::list<webrtc::DesktopFrame*> buffers_;
 
   // Flag used to coalesce runs of SchedulePaint()s into a single DoPaint().
   bool paint_scheduled_;
 
   ChromotingStats stats_;
 
   // Keep track of the most recent sequence number bounced back from the host.
   int64 latest_sequence_number_;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_RECTANGLE_UPDATE_DECODER_H_