commit 884300dca5531f60535501424bbd86b30e20450a
author Ben Wagner <bungeman@google.com> Fri Dec 16 16:51:41 2016 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 19:02:53 2016 +0000
tree bd55d2a075890c222fc70dda7043ddfc08967491
parent 9f67f044dd8765184669af6fd38e7feeff8777f9

Remove SkDynamicMemoryWStream::getOffset.

This method does the same thing as ::bytesWritten but has a confusing
name. It appears there are no external users, so remove it.

Change-Id: I06aed269200c34c2dda36605092f8ea37fcec693
Reviewed-on: https://skia-review.googlesource.com/6188
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

tests/PDFGlyphsToUnicodeTest.cpp

diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index a256c93..0d87cd7d 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -90,7 +90,7 @@
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResult,
-                                            buffer.getOffset()));
+                                            buffer.bytesWritten()));
 
     // Remove characters and ranges.
     buffer.reset();
@@ -108,7 +108,7 @@
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResultChop1,
-                                            buffer.getOffset()));
+                                            buffer.bytesWritten()));
 
     // Remove characters from range to downdrade it to one char.
     buffer.reset();
@@ -122,7 +122,7 @@
 endbfchar\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0, expectedResultChop2,
-                                            buffer.getOffset()));
+                                            buffer.bytesWritten()));
 
     buffer.reset();
 
@@ -139,7 +139,7 @@
 
     REPORTER_ASSERT(reporter, stream_equals(buffer, 0,
                                             expectedResultSingleBytes,
-                                            buffer.getOffset()));
+                                            buffer.bytesWritten()));
 
     glyphToUnicode.reset();
     glyphsInSubset.reset();
@@ -176,5 +176,5 @@
 endbfrange\n";
 
     REPORTER_ASSERT(reporter, stream_equals(buffer2, 0, expectedResult2,
-                                            buffer2.getOffset()));
+                                            buffer2.bytesWritten()));
 }

tests/PDFOpaqueSrcModeToSrcOverTest.cpp

diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
index e15234d..8b3cfe0 100644
--- a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
+++ b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
@@ -33,7 +33,7 @@
     U8CPU alpha = SK_AlphaOPAQUE;
     run_test(&srcMode, SkBlendMode::kSrc, alpha);
     run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha);
-    REPORTER_ASSERT(r, srcMode.getOffset() == srcOverMode.getOffset());
+    REPORTER_ASSERT(r, srcMode.bytesWritten() == srcOverMode.bytesWritten());
     // The two PDFs should be equal because they have an opaque alpha.
 
     srcMode.reset();
@@ -42,6 +42,6 @@
     alpha = 0x80;
     run_test(&srcMode, SkBlendMode::kSrc, alpha);
     run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha);
-    REPORTER_ASSERT(r, srcMode.getOffset() > srcOverMode.getOffset());
+    REPORTER_ASSERT(r, srcMode.bytesWritten() > srcOverMode.bytesWritten());
     // The two PDFs should not be equal because they have a non-opaque alpha.
 }

tests/StreamTest.cpp

diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index b64de69..4b8923f 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -84,7 +84,7 @@
     for (i = 0; i < 100; i++) {
         REPORTER_ASSERT(reporter, ds.write(s, 26));
     }
-    REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
+    REPORTER_ASSERT(reporter, ds.bytesWritten() == 100 * 26);
 
     char* dst = new char[100 * 26 + 1];
     dst[100*26] = '*';
@@ -97,7 +97,7 @@
     {
         std::unique_ptr<SkStreamAsset> stream(ds.detachAsStream());
         REPORTER_ASSERT(reporter, 100 * 26 == stream->getLength());
-        REPORTER_ASSERT(reporter, ds.getOffset() == 0);
+        REPORTER_ASSERT(reporter, ds.bytesWritten() == 0);
         test_loop_stream(reporter, stream.get(), s, 26, 100);
 
         std::unique_ptr<SkStreamAsset> stream2(stream->duplicate());
@@ -115,12 +115,12 @@
     for (i = 0; i < 100; i++) {
         REPORTER_ASSERT(reporter, ds.write(s, 26));
     }
-    REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
+    REPORTER_ASSERT(reporter, ds.bytesWritten() == 100 * 26);
 
     {
         // Test that this works after a snapshot.
         std::unique_ptr<SkStreamAsset> stream(ds.detachAsStream());
-        REPORTER_ASSERT(reporter, ds.getOffset() == 0);
+        REPORTER_ASSERT(reporter, ds.bytesWritten() == 0);
         test_loop_stream(reporter, stream.get(), s, 26, 100);
 
         std::unique_ptr<SkStreamAsset> stream2(stream->duplicate());