remove SkDebugWStream and other cleanups
BUG=skia:
Change-Id: I06c07559b24411bd8bc4cba55bd8880f56486f76
Reviewed-on: https://skia-review.googlesource.com/6729
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 83eee47..f3c99b7 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -187,7 +187,6 @@
@return true on success
*/
virtual bool write(const void* buffer, size_t size) = 0;
- virtual void newline();
virtual void flush();
virtual size_t bytesWritten() const = 0;
@@ -210,6 +209,9 @@
SkASSERT(text);
return this->write(text, strlen(text));
}
+
+ bool newline() { return this->write("\n", strlen("\n")); }
+
bool writeDecAsText(int32_t);
bool writeBigDecAsText(int64_t, int minDigits = 0);
bool writeHexAsText(uint32_t, int minDigits = 0);
@@ -420,22 +422,4 @@
typedef SkWStream INHERITED;
};
-
-class SK_API SkDebugWStream : public SkWStream {
-public:
- SkDebugWStream() : fBytesWritten(0) {}
-
- // overrides
- bool write(const void* buffer, size_t size) override;
- void newline() override;
- size_t bytesWritten() const override { return fBytesWritten; }
-
-private:
- size_t fBytesWritten;
- typedef SkWStream INHERITED;
-};
-
-// for now
-typedef SkFILEStream SkURLStream;
-
#endif