remove unneeded reference to SkTScopedPtr

src/images/SkImageDecoder_libwebp.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkColorPriv.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
-#include "SkTScopedPtr.h"
 
 // A WebP decoder only, on top of (subset of) libwebp
 // For more information on WebP image format, and libwebp library, see:
 //   http://code.google.com/speed/webp/
 //   http://www.webmproject.org/code/#libwebp_webp_image_decoder_library
 //   http://review.webmproject.org/gitweb?p=libwebp.git
 
 #include <stdio.h>
 extern "C" {
 // If moving libwebp out of skia source tree, path for webp headers must be
@@ skipping 302 matching lines @@
 
     // The image can be decoded directly to decodedBitmap if
     //   1. the region is within the image range
     //   2. bitmap's config is compatible
     //   3. bitmap's size is same as the required region (after sampled)
     bool directDecode = (rect == region) &&
                         (decodedBitmap->isNull() ||
                          (is_config_compatible(*decodedBitmap) &&
                          (decodedBitmap->width() == width) &&
                          (decodedBitmap->height() == height)));
-    SkTScopedPtr<SkBitmap> adb;
+
+    SkBitmap tmpBitmap;
     SkBitmap *bitmap = decodedBitmap;
 
     if (!directDecode) {
-        // allocates a temp bitmap
-        bitmap = new SkBitmap;
-        adb.reset(bitmap);
+        bitmap = &tmpBitmap;
     }
 
     if (bitmap->isNull()) {
         if (!setDecodeConfig(bitmap, width, height)) {
             return false;
         }
         // alloc from native heap if it is a temp bitmap. (prevent GC)
         bool allocResult = (bitmap == decodedBitmap)
                                ? allocPixelRef(bitmap, NULL)
                                : bitmap->allocPixels();
@@ skipping 222 matching lines @@
     // Magic matches, call decoder
     return SkNEW(SkWEBPImageDecoder);
 }
 
 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
       return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
 }
 
 static SkTRegistry<SkImageDecoder*, SkStream*> gDReg(sk_libwebp_dfactory);
 static SkTRegistry<SkImageEncoder*, SkImageEncoder::Type> gEReg(sk_libwebp_efactory);