8 files changed, 17 insertions, 37 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index c8b1676c5e..7929557270 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -12,7 +12,6 @@
 
 #include "SkBitmap.h"
 #include "SkRefCnt.h"
-#include "SkSerializationHelpers.h"
 
 class SkBBoxHierarchy;
 class SkCanvas;
@@ -161,10 +160,19 @@ public:
     int height() const { return fHeight; }
 
     /**
+     *  Function to encode an SkBitmap to an SkWStream. A function with this
+     *  signature can be passed to serialize() and SkOrderedWriteBuffer. The
+     *  function should return true if it succeeds. Otherwise it should return
+     *  false so that SkOrderedWriteBuffer can switch to another method of
+     *  storing SkBitmaps.
+     */
+    typedef bool (*EncodeBitmap)(SkWStream*, const SkBitmap&);
+
+    /**
      *  Serialize to a stream. If non NULL, encoder will be used to encode
      *  any bitmaps in the picture.
      */
-    void serialize(SkWStream*, SkSerializationHelpers::EncodeBitmap encoder = NULL) const;
+    void serialize(SkWStream*, EncodeBitmap encoder = NULL) const;
 
 #ifdef SK_BUILD_FOR_ANDROID
     /** Signals that the caller is prematurely done replaying the drawing
diff --git a/include/core/SkSerializationHelpers.h b/include/core/SkSerializationHelpers.h
deleted file mode 100644
index d87167b3fd..0000000000
--- a/include/core/SkSerializationHelpers.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkSerializationHelpers_DEFINED
-#define SkSerializationHelpers_DEFINED
-
-class SkBitmap;
-class SkStream;
-class SkWStream;
-
-namespace SkSerializationHelpers {
-    /**
-     *  Function to encode an SkBitmap to an SkWStream. A function with this signature can be passed
-     *  to SkPicture::serialize() and SkOrderedWriteBuffer. The function should return true if it
-     *  succeeds. Otherwise it should return false so that SkOrderedWriteBuffer can switch to
-     *  another method of storing SkBitmaps.
-     */
-    typedef bool (*EncodeBitmap)(SkWStream*, const SkBitmap&);
-}
-
-#endif // SkSerializationHelpers_DEFINED
diff --git a/src/core/SkOrderedReadBuffer.h b/src/core/SkOrderedReadBuffer.h
index b3635fbcb4..c609ec8be2 100644
--- a/src/core/SkOrderedReadBuffer.h
+++ b/src/core/SkOrderedReadBuffer.h
@@ -15,7 +15,6 @@
 #include "SkPath.h"
 #include "SkPicture.h"
 #include "SkReader32.h"
-#include "SkSerializationHelpers.h"
 
 class SkBitmap;
 
diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp
index de265875d9..e458bfe597 100644
--- a/src/core/SkOrderedWriteBuffer.cpp
+++ b/src/core/SkOrderedWriteBuffer.cpp
@@ -253,7 +253,7 @@ void SkOrderedWriteBuffer::setBitmapHeap(SkBitmapHeap* bitmapHeap) {
     }
 }
 
-void SkOrderedWriteBuffer::setBitmapEncoder(SkSerializationHelpers::EncodeBitmap bitmapEncoder) {
+void SkOrderedWriteBuffer::setBitmapEncoder(SkPicture::EncodeBitmap bitmapEncoder) {
     fBitmapEncoder = bitmapEncoder;
     if (bitmapEncoder != NULL) {
         SkASSERT(NULL == fBitmapHeap);
diff --git a/src/core/SkOrderedWriteBuffer.h b/src/core/SkOrderedWriteBuffer.h
index cd37f4721b..17040b84b1 100644
--- a/src/core/SkOrderedWriteBuffer.h
+++ b/src/core/SkOrderedWriteBuffer.h
@@ -14,7 +14,7 @@
 #include "SkRefCnt.h"
 #include "SkBitmapHeap.h"
 #include "SkPath.h"
-#include "SkSerializationHelpers.h"
+#include "SkPicture.h"
 #include "SkWriter32.h"
 
 class SkBitmap;
@@ -91,7 +91,7 @@ public:
      * Incompatible with the SkBitmapHeap. If an encoder is set fBitmapHeap will be set to NULL in
      * release and crash in debug.
      */
-    void setBitmapEncoder(SkSerializationHelpers::EncodeBitmap);
+    void setBitmapEncoder(SkPicture::EncodeBitmap);
 
 private:
     SkFactorySet* fFactorySet;
@@ -101,7 +101,7 @@ private:
     SkBitmapHeap* fBitmapHeap;
     SkRefCntSet* fTFSet;
 
-    SkSerializationHelpers::EncodeBitmap fBitmapEncoder;
+    SkPicture::EncodeBitmap fBitmapEncoder;
 
     typedef SkFlattenableWriteBuffer INHERITED;
 };
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index f86634a0e2..381bbaec48 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -307,7 +307,7 @@ void SkPicture::initFromStream(SkStream* stream, bool* success, InstallPixelRefP
     }
 }
 
-void SkPicture::serialize(SkWStream* stream, SkSerializationHelpers::EncodeBitmap encoder) const {
+void SkPicture::serialize(SkWStream* stream, EncodeBitmap encoder) const {
     SkPicturePlayback* playback = fPlayback;
 
     if (NULL == playback && fRecord) {
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 722a2c66a8..9ab7b01e49 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -409,7 +409,7 @@ void SkPicturePlayback::flattenToBuffer(SkOrderedWriteBuffer& buffer) const {
 }
 
 void SkPicturePlayback::serialize(SkWStream* stream,
-                                  SkSerializationHelpers::EncodeBitmap encoder) const {
+                                  SkPicture::EncodeBitmap encoder) const {
     writeTagSize(stream, PICT_READER_TAG, fOpData->size());
     stream->write(fOpData->bytes(), fOpData->size());
 
diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h
index fee7d78534..92c099fe07 100644
--- a/src/core/SkPicturePlayback.h
+++ b/src/core/SkPicturePlayback.h
@@ -21,7 +21,6 @@
 #include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkPictureFlat.h"
-#include "SkSerializationHelpers.h"
 
 #ifdef SK_BUILD_FOR_ANDROID
 #include "SkThread.h"
@@ -69,7 +68,7 @@ public:
 
     void draw(SkCanvas& canvas);
 
-    void serialize(SkWStream*, SkSerializationHelpers::EncodeBitmap) const;
+    void serialize(SkWStream*, SkPicture::EncodeBitmap) const;
 
     void dumpSize() const;