Remove a SkImageDecoder reference from SkPicture.h

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
 #define SkPicture_DEFINED
 
 #include "SkBitmap.h"
 #include "SkDrawPictureCallback.h"
-#include "SkImageDecoder.h"
+#include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
 
 #if SK_SUPPORT_GPU
 class GrContext;
 #endif
 
 class GrReplacements;
 class SkBBoxHierarchy;
 class SkCanvas;
@@ skipping 58 matching lines @@
 
     /**
      *  Recreate a picture that was serialized into a stream.
      *  @param SkStream Serialized picture data.
      *  @param proc Function pointer for installing pixelrefs on SkBitmaps representing the
      *              encoded bitmap data from the stream.
      *  @return A new SkPicture representing the serialized data, or NULL if the stream is
      *          invalid.
      */
     static SkPicture* CreateFromStream(SkStream*,
-                                       InstallPixelRefProc proc = &SkImageDecoder::DecodeMemory);
+                                       InstallPixelRefProc proc);
+
+    /**
+     *  Recreate a picture that was serialized into a stream. Uses all the default
+     *  image decoders that are compiled into the library.
+     *  @param SkStream Serialized picture data.
+     *  @return A new SkPicture representing the serialized data, or NULL if the stream is
+     *          invalid.
+     */
+    static SkPicture* CreateFromStream(SkStream*);
 
     /**
      *  Recreate a picture that was serialized into a buffer. If the creation requires bitmap
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
      *  SkReadBuffer::setBitmapDecoder() before calling SkPicture::CreateFromBuffer().
      *  @param SkReadBuffer Serialized picture data.
      *  @return A new SkPicture representing the serialized data, or NULL if the buffer is
      *          invalid.
      */
     static SkPicture* CreateFromBuffer(SkReadBuffer&);
@@ skipping 197 matching lines @@
         bool        fWillPlaybackBitmaps;
         bool        fHasText;
         int         fNumPaintWithPathEffectUses;
         int         fNumFastPathDashEffects;
         int         fNumAAConcavePaths;
         int         fNumAAHairlineConcavePaths;
     } fAnalysis;
 };
 
 #endif