SkPDF: alloc less memory for strings

src/pdf/SkPDFTypes.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeflate.h"
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
@@ skipping 92 matching lines @@
             char buffer[3] = {'#', '\0', '\0'};
             buffer[1] = kHex[(*n >> 4) & 0xF];
             buffer[2] = kHex[*n & 0xF];
             o->write(buffer, sizeof(buffer));
         } else {
             o->write(n, 1);
         }
     }
 }
 
-static void write_string(SkWStream* o, const SkString& s) {
-    o->write(s.c_str(), s.size());
-}
-
-static SkString format_string(const SkString& s) {
-    return SkPDFUtils::FormatString(s.c_str(), s.size());
-}
-
-static SkString format_string(const char* s) {
-    return SkPDFUtils::FormatString(s, strlen(s));
-}
-
 void SkPDFUnion::emitObject(SkWStream* stream,
                             const SkPDFObjNumMap& objNumMap,
                             const SkPDFSubstituteMap& substitutes) const {
     switch (fType) {
         case Type::kInt:
             stream->writeDecAsText(fIntValue);
             return;
         case Type::kBool:
             stream->writeText(fBoolValue ? "true" : "false");
             return;
         case Type::kScalar:
             SkPDFUtils::AppendScalar(fScalarValue, stream);
             return;
         case Type::kName:
             stream->writeText("/");
             SkASSERT(is_valid_name(fStaticString));
             stream->writeText(fStaticString);
             return;
         case Type::kString:
             SkASSERT(fStaticString);
-            write_string(stream, format_string(fStaticString));
+            SkPDFUtils::WriteString(stream, fStaticString,
+                                    strlen(fStaticString));
             return;
         case Type::kNameSkS:
             stream->writeText("/");
             write_name_escaped(stream, pun(fSkString)->c_str());
             return;
         case Type::kStringSkS:
-            write_string(stream, format_string(*pun(fSkString)));
+            SkPDFUtils::WriteString(stream, pun(fSkString)->c_str(),
+                                    pun(fSkString)->size());
             return;
         case Type::kObjRef:
             stream->writeDecAsText(objNumMap.getObjectNumber(
                     substitutes.getSubstitute(fObject)));
             stream->writeText(" 0 R");  // Generation number is always 0.
             return;
         case Type::kObject:
             fObject->emitObject(stream, objNumMap, substitutes);
             return;
         default:
@@ skipping 410 matching lines @@
 
 void SkPDFImageDumpStats() {
     SkDebugf("\ntotal PDF drawImage/drawBitmap calls: %d\n"
              "total PDF jpeg images: %d\n"
              "total PDF regular images: %d\n",
              gDrawImageCalls.load(),
              gJpegImageObjects.load(),
              gRegularImageObjects.load());
 }
 #endif // SK_PDF_IMAGE_STATS