Fixes for piping bitmaps with encoded data.

include/pipe/SkGPipe.h

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
 #ifndef SkGPipe_DEFINED
 #define SkGPipe_DEFINED
 
+#include "SkFlattenable.h"
+#include "SkPicture.h"
 #include "SkWriter32.h"
-#include "SkFlattenable.h"
 
 class SkCanvas;
 
 // XLib.h might have defined Status already (ugh)
 #ifdef Status
     #undef Status
 #endif
 
 class SkGPipeReader {
 public:
     SkGPipeReader();
     SkGPipeReader(SkCanvas* target);
     ~SkGPipeReader();
 
     enum Status {
         kDone_Status,   //!< no more data expected from reader
         kEOF_Status,    //!< need more data from reader
         kError_Status,  //!< encountered error
         kReadAtom_Status//!< finished reading an atom
     };
 
     enum PlaybackFlags {
         kReadAtom_PlaybackFlag = 0x1, //!< playback a single command from the stream
         kSilent_PlaybackFlag   = 0x2, //!< playback without drawing
     };
 
     void setCanvas(SkCanvas*);
+
+    /**
+     *  Set a function for decoding bitmaps that have encoded data.
+     */
+    void setBitmapDecoder(SkPicture::InstallPixelRefProc proc) { fProc = proc; }
+
     // data must be 4-byte aligned
     // length must be a multiple of 4
     Status playback(const void* data, size_t length, uint32_t playbackFlags = 0,
                     size_t* bytesRead = NULL);
 private:
-    SkCanvas*           fCanvas;
-    class SkGPipeState* fState;
+    SkCanvas*                       fCanvas;
+    class SkGPipeState*             fState;
+    SkPicture::InstallPixelRefProc  fProc;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkGPipeCanvas;
 
 class SkGPipeController {
 public:
     SkGPipeController() : fCanvas(NULL) {}
     virtual ~SkGPipeController();
@@ skipping 92 matching lines @@
 private:
     enum {
         kDefaultRecordingCanvasSize = 32767,
     };
 
     SkGPipeCanvas* fCanvas;
     SkWriter32     fWriter;
 };
 
 #endif