Abstract PPAPI's ImageData behind webrtc::DesktopFrame interface

remoting/client/plugin/pepper_view.h

Index: remoting/client/plugin/pepper_view.h
diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h
index 4d1138ea3c4d15a5496f95ba664b24a03322c264..a8cb40f566d2d8a17342acb3e6c260e0761b30a8 100644
--- a/remoting/client/plugin/pepper_view.h
+++ b/remoting/client/plugin/pepper_view.h
@@ -25,6 +25,7 @@ namespace remoting {
 class ChromotingInstance;
 class ClientContext;
 class FrameProducer;
+class ImageBuffer;
 
 class PepperView : public FrameConsumer,
                    public base::SupportsWeakPtr<PepperView> {
@@ -39,9 +40,9 @@ class PepperView : public FrameConsumer,
   // FrameConsumer implementation.
   virtual void ApplyBuffer(const SkISize& view_size,
                            const SkIRect& clip_area,
-                           pp::ImageData* buffer,
+                           ImageBuffer* buffer,
                            const SkRegion& region) OVERRIDE;
-  virtual void ReturnBuffer(pp::ImageData* buffer) OVERRIDE;
+  virtual void ReturnBuffer(ImageBuffer* buffer) OVERRIDE;
   virtual void SetSourceSize(const SkISize& source_size,
                              const SkIPoint& dpi) OVERRIDE;
 
@@ -63,10 +64,10 @@ class PepperView : public FrameConsumer,
  private:
   // Allocates a new frame buffer to supply to the FrameProducer to render into.
   // Returns NULL if the maximum number of buffers has already been allocated.
-  pp::ImageData* AllocateBuffer();
+  ImageBuffer* AllocateBuffer();
 
   // Frees a frame buffer previously allocated by AllocateBuffer.
-  void FreeBuffer(pp::ImageData* buffer);
+  void FreeBuffer(ImageBuffer* buffer);
 
   // Allocates buffers and passes them to the FrameProducer to render into until
   // the maximum number of buffers are in-flight.
@@ -77,12 +78,12 @@ class PepperView : public FrameConsumer,
   // FrameProducer is supplied the missed parts of |region|.  The FrameProducer
   // will be supplied a new buffer when FlushBuffer() completes.
   void FlushBuffer(const SkIRect& clip_area,
-                   pp::ImageData* buffer,
+                   ImageBuffer* buffer,
                    const SkRegion& region);
 
   // Handles completion of FlushBuffer(), triggering a new buffer to be
   // returned to FrameProducer for rendering.
-  void OnFlushDone(base::Time paint_start, pp::ImageData* buffer, int result);
+  void OnFlushDone(base::Time paint_start, ImageBuffer* buffer, int result);
 
   // Reference to the creating plugin instance. Needed for interacting with
   // pepper.  Marking explicitly as const since it must be initialized at
@@ -97,10 +98,10 @@ class PepperView : public FrameConsumer,
   FrameProducer* producer_;
 
   // List of allocated image buffers.
-  std::list<pp::ImageData*> buffers_;
+  std::list<ImageBuffer*> buffers_;
 
   // Queued buffer to paint, with clip area and dirty region in device pixels.
-  pp::ImageData* merge_buffer_;
+  ImageBuffer* merge_buffer_;
   SkIRect merge_clip_area_;
   SkRegion merge_region_;