Photo Picker Dialog: Add caching for the decoded images.

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
index bd8dba0de3b4683aba1e342f1edd57a12cc7ec72..506753492a005600495be8edf6fa6cf9f4bae2a6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java
@@ -4,10 +4,14 @@
 
 package org.chromium.chrome.browser.photo_picker;
 
+import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.os.AsyncTask;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.TextUtils;
 
+import org.chromium.chrome.R;
+
 import java.util.List;
 
 /**
@@ -21,6 +25,9 @@ public class PickerBitmapViewHolder
     // The bitmap view we are holding on to.
     private final PickerBitmapView mItemView;
 
+    // The screen density.
+    private final float mDensity;

[Theresa, 2017/05/09 14:59:27]

This value isn't used anymore, right?

[Finnur, 2017/05/09 15:08:22]

Correct. Done.

+
     // The request we are showing the bitmap for.
     private PickerBitmap mBitmapDetails;
 
@@ -31,6 +38,7 @@ public class PickerBitmapViewHolder
     public PickerBitmapViewHolder(PickerBitmapView itemView) {
         super(itemView);
         mItemView = itemView;
+        mDensity = itemView.getContext().getResources().getDisplayMetrics().density;
     }
 
     // DecoderServiceHost.ImageDecodedCallback
@@ -41,6 +49,17 @@ public class PickerBitmapViewHolder
             return;
         }
 
+        if (mCategoryView.getHighResBitmaps().get(filePath) == null) {
+            mCategoryView.getHighResBitmaps().put(filePath, bitmap);
+        }
+
+        if (mCategoryView.getLowResBitmaps().get(filePath) == null) {
+            Resources resources = mItemView.getContext().getResources();
+            new BitmapScalerTask(mCategoryView.getLowResBitmaps(), filePath,
+                    resources.getDimensionPixelSize(R.dimen.photo_picker_grainy_thumbnail_size))
+                    .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, bitmap);
+        }
+
         if (!TextUtils.equals(mBitmapDetails.getFilePath(), filePath)) {
             return;
         }
@@ -65,12 +84,24 @@ public class PickerBitmapViewHolder
             return;
         }
 
-        // TODO(finnur): Use cached image, if available.
-
-        mItemView.initialize(mBitmapDetails, null, true);
+        String filePath = mBitmapDetails.getFilePath();
+        Bitmap original = mCategoryView.getHighResBitmaps().get(filePath);
+        if (original != null) {
+            mItemView.initialize(mBitmapDetails, original, false);
+            return;
+        }
 
         int size = mCategoryView.getImageSize();
-        mCategoryView.getDecoderServiceHost().decodeImage(mBitmapDetails.getFilePath(), size, this);
+        Bitmap placeholder = mCategoryView.getLowResBitmaps().get(filePath);
+        if (placeholder != null) {
+            // For performance stats see http://crbug.com/719919.
+            placeholder = BitmapUtils.scale(placeholder, size, false);
+            mItemView.initialize(mBitmapDetails, placeholder, true);
+        } else {
+            mItemView.initialize(mBitmapDetails, null, true);
+        }
+
+        mCategoryView.getDecoderServiceHost().decodeImage(filePath, size, this);
     }
 
     /**