Scrub deprecated Skia APIs.

ui/gfx/android/java_bitmap.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/android/java_bitmap.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
@@ skipping 64 matching lines @@
   DCHECK(!size.IsEmpty());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jname(ConvertUTF8ToJavaString(env, name));
   return Java_BitmapHelper_decodeDrawableResource(
       env, jname.obj(), size.width(), size.height());
 }
 
 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
   DCHECK(skbitmap);
   DCHECK(!skbitmap->isNull());
-  SkBitmap::Config bitmap_config = skbitmap->getConfig();
+  SkBitmap::Config bitmap_config = skbitmap->config();

[reed1, 2014/05/07 18:06:22]

use colortypes?

   DCHECK((bitmap_config == SkBitmap::kRGB_565_Config) ||
          (bitmap_config == SkBitmap::kARGB_8888_Config));
   ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap(
       skbitmap->width(), skbitmap->height(), bitmap_config);
   SkAutoLockPixels src_lock(*skbitmap);
   JavaBitmap dst_lock(jbitmap.obj());
   void* src_pixels = skbitmap->getPixels();
   void* dst_pixels = dst_lock.pixels();
   memcpy(dst_pixels, src_pixels, skbitmap->getSize());
 
@@ skipping 39 matching lines @@
       return SkBitmap::kARGB_8888_Config;
     case BITMAP_FORMAT_RGB_565:
       return SkBitmap::kRGB_565_Config;
     case BITMAP_FORMAT_NO_CONFIG:
     default:
       return SkBitmap::kNo_Config;
   }
 }
 
 }  //  namespace gfx