Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1407915 - Ignore loading favicon without url. r=nechen

Browse Source 
MozReview-Commit-ID: IaOXzInWogr

--HG--
extra : rebase_source : 7adc831f10cb339f05887172791db7087451f4da
This commit is contained in:
Jing-wei Wu 2017-10-12 15:00:46 +08:00
parent 2823a2a9a6
commit 75180b3248
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java
View File

@ -20,6 +20,7 @@ import android.content.res.Resources;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.support.v7.widget.ViewUtils;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.MotionEvent;
@ -183,6 +184,12 @@ public class TabsLayoutItemView extends LinearLayout
getResources().getString(R.string.tab_title_prefix_is_playing_audio, tabTitle);
mTitle.setContentDescription(tabTitleWithAudio);
} else {
final String url = tab.getURL();
if (TextUtils.isEmpty(url)) {
// Ignore loading favicon without url.
return;
}
if (mOngoingIconLoad != null) {
mOngoingIconLoad.cancel(true);
}
@ -191,8 +198,9 @@ public class TabsLayoutItemView extends LinearLayout
final int iconSize = resources.getDimensionPixelSize(R.dimen.tab_favicon_size);
final float textSize = resources.getDimensionPixelSize(R.dimen.tab_favicon_text_size);
mOngoingIconLoad = Icons.with(getContext())
.pageUrl(tab.getURL())
final Context appContext = getContext().getApplicationContext();
mOngoingIconLoad = Icons.with(appContext)
.pageUrl(url)
.skipNetwork()
.targetSize(iconSize)
.textSize(textSize)