Cleaner external buffer handling in SkWriter32

src/core/SkWriter32.cpp

Index: src/core/SkWriter32.cpp
diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp
index 5e89ed655b70e5d83da4df2588704689898b52e6..07a43d782123b8bfb70ec34fb2a48f8a437eea01 100644
--- a/src/core/SkWriter32.cpp
+++ b/src/core/SkWriter32.cpp
@@ -66,3 +66,18 @@ size_t SkWriter32::WriteStringSize(const char* str, size_t len) {
     // add 1 since we also write a terminating 0
     return SkAlign4(lenBytes + len + 1);
 }
+
+void SkWriter32::grow(size_t size) {
+    bool wasExternal = (fExternal != NULL) && (fData == fExternal);
+    // cause the buffer to grow
+    fInternal.setCount(size);
+    fData = fInternal.begin();
+    if (wasExternal) {
+        // we were external, so copy in the data
+        memcpy(fData, fExternal, fUsed);
+    }
+    // read the grown capacity
+    fCapacity = fInternal.reserved();
+    // expand the buffer to it's full capacity

[mtklein, 2014/02/06 22:01:24]

Can you just add another half sentence explaining why?  Is it,

// Expand the buffer to its full capacity; we're going to be writing the memory
manually rather than calling its methods.

[iancottrell, 2014/02/07 12:20:41]

Done.

[iancottrell, 2014/02/07 12:20:41]

Done.

[iancottrell, 2014/02/07 12:20:41]

Done. This is changing again in the next cl, where I take control of the growth
directly.

+    fInternal.setCount(fCapacity);
+}

[mtklein, 2014/02/06 22:01:24]

Can you add an
  SkASSERT(fInternal.reserved() == fCapacity);
after this line?  Helps document what we're trying to accomplish.

[iancottrell, 2014/02/07 12:20:41]

Done.

[iancottrell, 2014/02/07 12:20:41]

Done.