Pass JavaRef to Java methods in ui.

ui/android/resources/resource_manager_impl.cc

 // Copyright 2014 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/android/resources/resource_manager_impl.h"
 
 #include <inttypes.h>
 #include <stddef.h>
 
 #include <utility>
@@ skipping 17 matching lines @@
 #include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/rect.h"
 
 using base::android::JavaArrayOfIntArrayToIntVector;
 using base::android::JavaRef;
 
 namespace ui {
 
 // static
-ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {
+ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(
+    const JavaRef<jobject>& jobj) {
   return reinterpret_cast<ResourceManagerImpl*>(
       Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(),
                                         jobj));
 }
 
 ResourceManagerImpl::ResourceManagerImpl(gfx::NativeWindow native_window)
     : ui_resource_manager_(nullptr) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_obj_.Reset(
       env, Java_ResourceManager_create(env, native_window->GetJavaObject(),
@@ skipping 147 matching lines @@
                "resource_id", res_id);
 
   std::unordered_map<int, std::unique_ptr<Resource>>::iterator item =
       resources_[res_type].find(res_id);
   if (item == resources_[res_type].end()) {
     resources_[res_type][res_id] = base::MakeUnique<Resource>();
   }
 
   Resource* resource = resources_[res_type][res_id].get();
 
-  gfx::JavaBitmap jbitmap(bitmap.obj());
+  gfx::JavaBitmap jbitmap(bitmap);
   resource->size = jbitmap.size();
   resource->padding.SetRect(padding_left, padding_top,
                             padding_right - padding_left,
                             padding_bottom - padding_top);
   resource->aperture.SetRect(aperture_left, aperture_top,
                              aperture_right - aperture_left,
                              aperture_bottom - aperture_top);
 
   SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(jbitmap);
   skbitmap.setImmutable();
@@ skipping 32 matching lines @@
     jfloat scaled_sprite_height) {
   // Construct source and destination rectangles for each frame from
   // |frame_rects|.
   std::vector<std::vector<int>> all_frame_rects_vector;
   JavaArrayOfIntArrayToIntVector(env, frame_rects.obj(),
                                  &all_frame_rects_vector);
   CrushedSpriteResource::SrcDstRects src_dst_rects =
       ProcessCrushedSpriteFrameRects(all_frame_rects_vector);
 
   SkBitmap skbitmap =
-      gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(bitmap.obj()));
+      gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(bitmap));
 
   std::unique_ptr<CrushedSpriteResource> resource =
       base::MakeUnique<CrushedSpriteResource>(
           skbitmap,
           src_dst_rects,
           gfx::Size(unscaled_sprite_width, unscaled_sprite_height),
           gfx::Size(scaled_sprite_width, scaled_sprite_height));
 
   crushed_sprite_resources_[bitmap_res_id].swap(resource);
 }
@@ skipping 70 matching lines @@
     const JavaRef<jobject>& jobj,
     jint bitmap_res_id,
     const JavaRef<jobject>& bitmap) {
   std::unordered_map<int, std::unique_ptr<CrushedSpriteResource>>::iterator
       item = crushed_sprite_resources_.find(bitmap_res_id);
   if (item == crushed_sprite_resources_.end()) {
     // Cannot reload a resource that has not been previously loaded.
     return;
   }
   SkBitmap skbitmap =
-      gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(bitmap.obj()));
+      gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(bitmap));
   item->second->SetBitmap(skbitmap);
 }
 
 // static
 bool ResourceManagerImpl::RegisterResourceManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ResourceManagerImpl::PreloadResourceFromJava(AndroidResourceType res_type,
                                                   int res_id) {
@@ skipping 18 matching lines @@
   TRACE_EVENT2("ui",
                "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava",
                "bitmap_res_id", bitmap_res_id,
                "metadata_res_id", metadata_res_id);
   Java_ResourceManager_crushedSpriteResourceRequested(
       base::android::AttachCurrentThread(), java_obj_, bitmap_res_id,
       metadata_res_id, reloading);
 }
 
 }  // namespace ui