for X in {Dec,BigDec,Scalar}, SkWStream::write"X"AsText no longer mallocs

src/core/SkStream.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkStream.h"
@@ skipping 69 matching lines @@
 }
 
 bool SkWStream::writeText(const char text[])
 {
     SkASSERT(text);
     return this->write(text, strlen(text));
 }
 
 bool SkWStream::writeDecAsText(int32_t dec)
 {
-    SkString    tmp;
-    tmp.appendS32(dec);
-    return this->write(tmp.c_str(), tmp.size());
+    char buffer[SkStrAppendS32_MaxSize];

[reed1, 2014/11/06 21:45:09]

does the buffer need to be this const + 1, to have a slot for the terminating 0?

[hal.canary, 2014/11/06 22:26:30]

SkWStream::write(void*, size_t) doesn't need a terminating '\0' and those
functions do not insert one.  See SkString::insertS32 for an example.

[reed1, 2014/11/07 14:52:28]

Ah, right.

I'll add some dox so I can remind myself in SkString.h

+    char* stop = SkStrAppendS32(buffer, dec);
+    return this->write(buffer, stop - buffer);
 }
 
 bool SkWStream::writeBigDecAsText(int64_t dec, int minDigits)
 {
-    SkString    tmp;
-    tmp.appendS64(dec, minDigits);
-    return this->write(tmp.c_str(), tmp.size());
+    char buffer[SkStrAppendU64_MaxSize];
+    char* stop = SkStrAppendU64(buffer, dec, minDigits);
+    return this->write(buffer, stop - buffer);
 }
 
 bool SkWStream::writeHexAsText(uint32_t hex, int digits)
 {
     SkString    tmp;
     tmp.appendHex(hex, digits);
     return this->write(tmp.c_str(), tmp.size());
 }
 
 bool SkWStream::writeScalarAsText(SkScalar value)
 {
-    SkString    tmp;
-    tmp.appendScalar(value);
-    return this->write(tmp.c_str(), tmp.size());
+    char buffer[SkStrAppendScalar_MaxSize];
+    char* stop = SkStrAppendScalar(buffer, value);
+    return this->write(buffer, stop - buffer);
 }
 
 bool SkWStream::write8(U8CPU value) {
     uint8_t v = SkToU8(value);
     return this->write(&v, 1);
 }
 
 bool SkWStream::write16(U16CPU value) {
     uint16_t v = SkToU16(value);
     return this->write(&v, 2);
@@ skipping 778 matching lines @@
     SkDynamicMemoryWStream tempStream;
     const size_t bufferSize = 4096;
     char buffer[bufferSize];
     do {
         size_t bytesRead = stream->read(buffer, bufferSize);
         tempStream.write(buffer, bytesRead);
     } while (!stream->isAtEnd());
     return tempStream.detachAsStream();  // returns a SkBlockMemoryStream,
                                          // cheaper than copying to SkData
 }