commit 189e251f6e10a122bad63af109367adcd7d97ecb
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 23:59:16 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 23:59:16 2013 +0000
tree 101fd6c3c831842d6079722c1255f91e3be562f4
parent 568b0a74792cd8c8abee1ed835a785da3e4592a2

Revert r10171 due to test failure in StreamTest



git-svn-id: http://skia.googlecode.com/svn/trunk/include@10172 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkStream.h

diff --git a/core/SkStream.h b/core/SkStream.h
index 1930f3f..31ed7bc 100644
--- a/core/SkStream.h
+++ b/core/SkStream.h
@@ -280,7 +280,7 @@
 
     virtual size_t getLength() const SK_OVERRIDE;
 
-    virtual const void* getMemoryBase() SK_OVERRIDE;
+    const void* getMemoryBase() SK_OVERRIDE;
 
 private:
     SkFILE*     fFILE;
@@ -423,10 +423,7 @@
      */
     SkData* copyToData() const;
 
-    /** Reset, returning a reader stream with the current content. */
-    SkStreamAsset* detatchAsStream();
-
-    /** Reset the stream to its original, empty, state. */
+    // reset the stream to its original state
     void reset();
     void padToAlign4();
 private:
@@ -438,10 +435,6 @@
 
     void invalidateCopy();
 
-    // For access to the Block type.
-    friend class SkBlockMemoryStream;
-    friend class SkBlockMemoryRefCnt;
-
     typedef SkWStream INHERITED;
 };