SkBitmap and SkPixelRef no longer need lock/unlock

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 56 matching lines @@
 }
 
 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
   DCHECK(skbitmap);
   DCHECK(!skbitmap->isNull());
   SkColorType color_type = skbitmap->colorType();
   DCHECK((color_type == kRGB_565_SkColorType) ||
          (color_type == kN32_SkColorType));
   ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap(
       skbitmap->width(), skbitmap->height(), color_type);
-  SkAutoLockPixels src_lock(*skbitmap);
   JavaBitmap dst_lock(jbitmap);
   void* src_pixels = skbitmap->getPixels();
   void* dst_pixels = dst_lock.pixels();
   memcpy(dst_pixels, src_pixels, skbitmap->getSize());
 
   return jbitmap;
 }
 
 SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) {
   DCHECK(!jbitmap.size().IsEmpty());
@@ skipping 38 matching lines @@
       return kN32_SkColorType;
     case BITMAP_FORMAT_RGB_565:
       return kRGB_565_SkColorType;
     case BITMAP_FORMAT_NO_CONFIG:
     default:
       return kUnknown_SkColorType;
   }
 }
 
 }  //  namespace gfx