Guard against most unintentionally ephemeral SkAutoFoo instantiations.

src/core/SkTSearch.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 "SkTSearch.h"
-#include <ctype.h>
 
 static inline const char* index_into_base(const char*const* base, int index,
                                           size_t elemSize)
 {
     return *(const char*const*)((const char*)base + index * elemSize);
 }
 
 int SkStrSearch(const char*const* base, int count, const char target[],
                 size_t target_len, size_t elemSize)
 {
@@ skipping 44 matching lines @@
     SkAutoAsciiToLC tolc(target, len);
 
     return SkStrSearch(base, count, tolc.lc(), len, elemSize);
 }
 
 int SkStrLCSearch(const char*const* base, int count, const char target[],
                   size_t elemSize)
 {
     return SkStrLCSearch(base, count, target, strlen(target), elemSize);
 }
-
-//////////////////////////////////////////////////////////////////////////////
-
-SkAutoAsciiToLC::SkAutoAsciiToLC(const char str[], size_t len)
-{
-    // see if we need to compute the length
-    if ((long)len < 0) {
-        len = strlen(str);
-    }
-    fLength = len;
-
-    // assign lc to our preallocated storage if len is small enough, or allocate
-    // it on the heap
-    char*   lc;
-    if (len <= STORAGE) {
-        lc = fStorage;
-    } else {
-        lc = (char*)sk_malloc_throw(len + 1);
-    }
-    fLC = lc;
-
-    // convert any asii to lower-case. we let non-ascii (utf8) chars pass
-    // through unchanged
-    for (int i = (int)(len - 1); i >= 0; --i) {
-        int c = str[i];
-        if ((c & 0x80) == 0) {   // is just ascii
-            c = tolower(c);
-        }
-        lc[i] = c;
-    }
-    lc[len] = 0;
-}
-
-SkAutoAsciiToLC::~SkAutoAsciiToLC()
-{
-    if (fLC != fStorage) {
-        sk_free(fLC);
-    }
-}