Add buffer helper to read directly into SkString to avoid extra copying

src/core/SkOrderedReadBuffer.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
@@ skipping 70 matching lines @@
 }
 
 uint32_t SkOrderedReadBuffer::readUInt() {
     return fReader.readU32();
 }
 
 int32_t SkOrderedReadBuffer::read32() {
     return fReader.readInt();
 }
 
-char* SkOrderedReadBuffer::readString() {
-    const char* string = fReader.readString();
-    const size_t length = strlen(string);
-    char* value = (char*)sk_malloc_throw(length + 1);
-    strcpy(value, string);
-    return value;
+void SkOrderedReadBuffer::readString(SkString* string) {
+    size_t len;
+    const char* strContents = fReader.readString(&len);
+    string->set(strContents, len);
 }
 
 void* SkOrderedReadBuffer::readEncodedString(size_t* length, SkPaint::TextEncoding encoding) {
     SkDEBUGCODE(int32_t encodingType = ) fReader.readInt();
     SkASSERT(encodingType == encoding);
     *length =  fReader.readInt();
     void* data = sk_malloc_throw(*length);
     memcpy(data, fReader.skip(SkAlign4(*length)), *length);
     return data;
 }
@@ skipping 175 matching lines @@
         if (sizeRecorded != sizeRead) {
             // we could try to fix up the offset...
             sk_throw();
         }
     } else {
         // we must skip the remaining data
         fReader.skip(sizeRecorded);
     }
     return obj;
 }