Switch SkPDFStream's internal storage from SkStream to SkData

src/pdf/SkPDFStream.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFStream_DEFINED
@@ skipping 56 matching lines @@
         fSubstitute.reset(stream);
     }
 
     SkPDFStream* getSubstitute() {
         return fSubstitute.get();
     }
 
     void setData(SkData* data);
     void setData(SkStream* stream);
 
-    SkStream* getData() {
-        return fData.get();
-    }
+    SkData* getData() { return fData.get(); }
 
     void setState(State state) {
         fState = state;
     }
 
+    size_t dataSize();

[mtklein, 2014/06/25 15:53:17]

move this up with getData?

[hal.canary, 2014/06/25 18:00:30]

Done.

+
     State getState() {
         return fState;
     }
 
 private:
     // Indicates what form (or if) the stream has been requested.
     State fState;
 
-    // TODO(vandebo): Use SkData (after removing deprecated constructor).
-    SkAutoTUnref<SkStream> fData;
+    SkAutoTUnref<SkData> fData;
     SkAutoTUnref<SkPDFStream> fSubstitute;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif