Bug 1258470 - Part 7: Remove thumbnail: support. draft
authorNick Alexander <nalexander@mozilla.com>
Tue, 21 Jun 2016 10:48:21 -0700
changeset 380999 bbdf1277e792b27926ad3917a5c476be61c2fa50
parent 380998 1c69c10d3f5f6015ecb7cdb6dfe26e555276cad1
child 381000 cdc106c00c9d5c8a6422b7734f50f491f0bfe5e3
push id21383
push usernalexander@mozilla.com
push dateFri, 24 Jun 2016 00:16:43 +0000
bugs1258470
milestone50.0a1
Bug 1258470 - Part 7: Remove thumbnail: support. This changes behaviour: the list of tabs to stream will no longer have icons. MozReview-Commit-ID: FKwypLxzJwa
mobile/android/base/java/org/mozilla/gecko/gfx/BitmapUtils.java
--- a/mobile/android/base/java/org/mozilla/gecko/gfx/BitmapUtils.java
+++ b/mobile/android/base/java/org/mozilla/gecko/gfx/BitmapUtils.java
@@ -10,19 +10,16 @@ import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.util.GeckoJarReader;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UIAsyncTask;
-import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
-import org.mozilla.gecko.ThumbnailHelper;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -75,21 +72,16 @@ public final class BitmapUtils {
         }
 
         if (data.startsWith("data")) {
             final BitmapDrawable d = new BitmapDrawable(context.getResources(), getBitmapFromDataURI(data));
             runOnBitmapFoundOnUiThread(loader, d);
             return;
         }
 
-        if (data.startsWith("thumbnail:")) {
-            getThumbnailDrawable(context, data, loader);
-            return;
-        }
-
         if (data.startsWith("jar:") || data.startsWith("file://")) {
             (new UIAsyncTask.WithoutParams<Drawable>(ThreadUtils.getBackgroundHandler()) {
                 @Override
                 public Drawable doInBackground() {
                     try {
                         if (data.startsWith("jar:jar")) {
                             return GeckoJarReader.getBitmapDrawable(
                                     context, context.getResources(), data);
@@ -142,32 +134,16 @@ public final class BitmapUtils {
 
             runOnBitmapFoundOnUiThread(loader, d);
             return;
         }
 
         runOnBitmapFoundOnUiThread(loader, null);
     }
 
-    public static void getThumbnailDrawable(final Context context, final String data, final BitmapLoader loader) {
-         int id = Integer.parseInt(data.substring(10), 10);
-         final Tab tab = Tabs.getInstance().getTab(id);
-         runOnBitmapFoundOnUiThread(loader, tab.getThumbnail());
-         Tabs.registerOnTabsChangedListener(new Tabs.OnTabsChangedListener() {
-                 @Override
-                 public void onTabChanged(Tab t, Tabs.TabEvents msg, String data) {
-                     if (tab == t && msg == Tabs.TabEvents.THUMBNAIL) {
-                         Tabs.unregisterOnTabsChangedListener(this);
-                         runOnBitmapFoundOnUiThread(loader, t.getThumbnail());
-                     }
-                 }
-             });
-         ThumbnailHelper.getInstance().getAndProcessThumbnailFor(tab);
-    }
-
     public static Bitmap decodeByteArray(byte[] bytes) {
         return decodeByteArray(bytes, null);
     }
 
     public static Bitmap decodeByteArray(byte[] bytes, BitmapFactory.Options options) {
         return decodeByteArray(bytes, 0, bytes.length, options);
     }