Remove backward compatibility shims from SkStream.h.

include/core/SkStream.h

 /*
  * Copyright 2006 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 SkStream_DEFINED
 #define SkStream_DEFINED
 
@@ skipping 42 matching lines @@
      *  @param buffer when NULL skip size bytes, otherwise copy size bytes into buffer
      *  @param size the number of bytes to skip or copy
      *  @return the number of bytes actually read.
      */
     virtual size_t read(void* buffer, size_t size) = 0;
 
     /** Skip size number of bytes.
      *  @return the actual number bytes that could be skipped.
      */
     size_t skip(size_t size) {
-        //return this->read(NULL, size);
-        //TODO: remove this old logic after updating existing implementations
-        return 0 == size ? 0 : this->read(NULL, size);
+        return this->read(NULL, size);
     }
 
     /** Returns true when all the bytes in the stream have been read.
      *  This may return true early (when there are no more bytes to be read)
      *  or late (after the first unsuccessful read).
-     *
-     *  In Progress: do not use until all implementations are updated.
-     *  TODO: after this is implemented everywhere, make pure virtual.
      */
-    virtual bool isAtEnd() const {
-        SkASSERT(false);
-        return true;
-    }
+    virtual bool isAtEnd() const = 0;
 
     int8_t   readS8();
     int16_t  readS16();
     int32_t  readS32();
 
     uint8_t  readU8() { return (uint8_t)this->readS8(); }
     uint16_t readU16() { return (uint16_t)this->readS16(); }
     uint32_t readU32() { return (uint32_t)this->readS32(); }
 
     bool     readBool() { return this->readU8() != 0; }
@@ skipping 37 matching lines @@
 
     /** Duplicates this stream. If this cannot be done, returns NULL.
      *  The returned stream will be positioned the same as this stream.
      */
     virtual SkStreamSeekable* fork() const { return NULL; }
 
 //SkStreamAsset
     /** Returns true if this stream can report it's total length. */
     virtual bool hasLength() const { return false; }
     /** Returns the total length of the stream. If this cannot be done, returns 0. */
-    virtual size_t getLength() const {
-        //return 0;
-        //TODO: remove the following after everyone is updated.
-        return ((SkStream*)this)->read(NULL, 0);
-    }
+    virtual size_t getLength() const { return 0; }
 
 //SkStreamMemory
     /** Returns the starting address for the data. If this cannot be done, returns NULL. */
     //TODO: replace with virtual const SkData* getData()
     virtual const void* getMemoryBase() { return NULL; }
 
 private:
     typedef SkRefCnt INHERITED;
 };
 
 /** SkStreamRewindable is a SkStream for which rewind and duplicate are required. */
 class SK_API SkStreamRewindable : public SkStream {
 public:
-    //TODO: remove the following after everyone is updated (ensures new behavior on new classes).
-    virtual bool isAtEnd() const SK_OVERRIDE = 0;
-    //TODO: remove the following after everyone is updated (ensures new behavior on new classes).
-    virtual size_t getLength() const SK_OVERRIDE { return 0; }
-
     virtual bool rewind() SK_OVERRIDE = 0;
     virtual SkStreamRewindable* duplicate() const SK_OVERRIDE = 0;
 };
 
 /** SkStreamSeekable is a SkStreamRewindable for which position, seek, move, and fork are required. */
 class SK_API SkStreamSeekable : public SkStreamRewindable {
 public:
     virtual SkStreamSeekable* duplicate() const SK_OVERRIDE = 0;
 
     virtual bool hasPosition() const SK_OVERRIDE { return true; }
@@ skipping 292 matching lines @@
     virtual void newline() SK_OVERRIDE;
 
 private:
     typedef SkWStream INHERITED;
 };
 
 // for now
 typedef SkFILEStream SkURLStream;
 
 #endif