SkPDF: SkPDFString is no longer aware of wide 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 "SkPDFTypes.h"
@@ skipping 115 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFString::SkPDFString(const char value[])
     : fValue(FormatString(value, strlen(value))) {
 }
 
 SkPDFString::SkPDFString(const SkString& value)
     : fValue(FormatString(value.c_str(), value.size())) {
 }
 
-SkPDFString::SkPDFString(const uint16_t* value, size_t len, bool wideChars)
-    : fValue(FormatString(value, len, wideChars)) {
-}
-
 SkPDFString::~SkPDFString() {}
 
 void SkPDFString::emitObject(SkWStream* stream,
                              const SkPDFObjNumMap&,
                              const SkPDFSubstituteMap&) {
     stream->write(fValue.c_str(), fValue.size());
 }
 
 // static
-SkString SkPDFString::FormatString(const char* input, size_t len) {
-    return DoFormatString(input, len, false, false);
-}
-
-SkString SkPDFString::FormatString(const uint16_t* input, size_t len,
-                                   bool wideChars) {
-    return DoFormatString(input, len, true, wideChars);
-}
-
-// static
-SkString SkPDFString::DoFormatString(const void* input, size_t len,
-                                     bool wideInput, bool wideOutput) {
+SkString SkPDFString::FormatString(const char* cin, size_t len) {
     SkASSERT(len <= kMaxLen);
-    const uint16_t* win = (const uint16_t*) input;
-    const char* cin = (const char*) input;
-
-    if (wideOutput) {
-        SkASSERT(wideInput);
-        SkString result;
-        result.append("<");
-        for (size_t i = 0; i < len; i++) {
-            result.appendHex(win[i], 4);
-        }
-        result.append(">");
-        return result;
-    }
 
     // 7-bit clean is a heuristic to decide what string format to use;
     // a 7-bit clean string should require little escaping.
     bool sevenBitClean = true;
     for (size_t i = 0; i < len; i++) {
-        SkASSERT(!wideInput || !(win[i] & ~0xFF));
-        char val = wideInput ? win[i] : cin[i];
-        if (val > '~' || val < ' ') {
+        if (cin[i] > '~' || cin[i] < ' ') {
             sevenBitClean = false;
             break;
         }
     }
-
     SkString result;
     if (sevenBitClean) {
         result.append("(");
         for (size_t i = 0; i < len; i++) {
-            SkASSERT(!wideInput || !(win[i] & ~0xFF));
-            char val = wideInput ? win[i] : cin[i];
-            if (val == '\\' || val == '(' || val == ')') {
+            if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') {
                 result.append("\\");
             }
-            result.append(&val, 1);
+            result.append(&cin[i], 1);
         }
         result.append(")");
     } else {
         result.append("<");
         for (size_t i = 0; i < len; i++) {
-            SkASSERT(!wideInput || !(win[i] & ~0xFF));
-            unsigned char val = wideInput ? win[i] : cin[i];
-            result.appendHex(val, 2);
+            result.appendHex(static_cast<unsigned char>(cin[i]), 2);
         }
         result.append(">");
     }
-
     return result;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFName::SkPDFName(const char name[]) : fValue(FormatName(SkString(name))) {}
 SkPDFName::SkPDFName(const SkString& name) : fValue(FormatName(name)) {}
 SkPDFName::~SkPDFName() {}
 
 bool SkPDFName::operator==(const SkPDFName& b) const {
@@ skipping 224 matching lines @@
     fObjects.push(obj);
     return true;
 }
 
 int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const {
     int32_t* objectNumberFound = fObjectNumbers.find(obj);
     SkASSERT(objectNumberFound);
     return *objectNumberFound;
 }