Guard against most unintentionally ephemeral SkAutoFoo instantiations.

src/core/SkString.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 "SkString.h"
@@ skipping 608 matching lines @@
     other.validate();
 
     SkTSwap<Rec*>(fRec, other.fRec);
 #ifdef SK_DEBUG
     SkTSwap<const char*>(fStr, other.fStr);
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkAutoUCS2::SkAutoUCS2(const char utf8[]) {
-    size_t len = strlen(utf8);
-    fUCS2 = (uint16_t*)sk_malloc_throw((len + 1) * sizeof(uint16_t));
-
-    uint16_t* dst = fUCS2;
-    for (;;) {
-        SkUnichar uni = SkUTF8_NextUnichar(&utf8);
-        *dst++ = SkToU16(uni);
-        if (uni == 0) {
-            break;
-        }
-    }
-    fCount = (int)(dst - fUCS2);
-}
-
-SkAutoUCS2::~SkAutoUCS2() {
-    sk_free(fUCS2);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 SkString SkStringPrintf(const char* format, ...) {
     SkString formattedOutput;
     char buffer[kBufferSize];
     ARGS_TO_BUFFER(format, buffer, kBufferSize);
     formattedOutput.set(buffer);
     return formattedOutput;
 }
 
 #undef VSNPRINTF
 #undef SNPRINTF