Some favicon cleanup/upstreaming

chrome/android/java/src/org/chromium/chrome/browser/Tab.java

 // 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.
 
 package org.chromium.chrome.browser;
 
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ skipping 873 matching lines @@
         if (mNativePage != null) return mNativePage.getTitle();
         if (mContentViewCore != null) return mContentViewCore.getTitle();
         return "";
     }
 
     /**
      * @return The bitmap of the favicon scaled to 16x16dp. null if no favicon
      *         is specified or it requires the default favicon.
      */
     public Bitmap getFavicon() {
-        if (mContentViewCore != null) {
-            if (mFavicon == null || !mContentViewCore.getUrl().equals(mFaviconUrl)) {
-                if (mNativeTabAndroid == 0) return null;
-                mFavicon = nativeGetFavicon(mNativeTabAndroid);
-                mFaviconUrl = mContentViewCore.getUrl();
+        String url = getUrl();
+        // Invalidate our cached values if necessary.
+        if (url == null || !url.equals(mFaviconUrl)) {
+            mFavicon = null;
+            mFaviconUrl = null;
+        }
+
+        if (mFavicon == null) {
+            // If we have no content return null.
+            if (getNativePage() == null && getContentViewCore() == null) return null;
+
+            Bitmap favicon = nativeGetFavicon(mNativeTabAndroid);
+
+            // If the favicon is not yet valid (i.e. it's eitehr blank or a placeholder), then do

[Yaron, 2014/08/22 22:11:12]

either

[David Trainor- moved to gerrit, 2014/08/25 17:49:31]

Done.

+            // not cache the results.  We still return this though so we have something to show.
+            if (favicon != null && nativeIsFaviconValid(mNativeTabAndroid)) {

[Yaron, 2014/08/22 22:11:12]

Instead of the extra JNI call, move this isfaviconvalid check into
nativeGetFavicon.

[David Trainor- moved to gerrit, 2014/08/25 17:49:31]

Need to pull it out :(.  We still want to grab the favicon result in that case,
we just don't want to cache it (if we're matching downstream behavior).

+                mFavicon = favicon;
+                mFaviconUrl = url;
             }
+
+            return favicon;
         }
+
         return mFavicon;
     }
 
     /**
      * Loads the tab if it's not loaded (e.g. because it was killed in background).
      * @return true iff tab load was triggered
      */
     @CalledByNative
     public boolean loadIfNeeded() {
         return false;
@@ skipping 251 matching lines @@
     private native WebContents nativeGetWebContents(long nativeTabAndroid);
     private native Profile nativeGetProfileAndroid(long nativeTabAndroid);
     private native int nativeLoadUrl(long nativeTabAndroid, String url, String extraHeaders,
             byte[] postData, int transition, String referrerUrl, int referrerPolicy,
             boolean isRendererInitiated);
     private native int nativeGetSecurityLevel(long nativeTabAndroid);
     private native void nativeSetActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url,
             String title);
     private native boolean nativePrint(long nativeTabAndroid);
     private native Bitmap nativeGetFavicon(long nativeTabAndroid);
+    private native boolean nativeIsFaviconValid(long nativeTabAndroid);
 }