chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java - Issue 1504183003: Fix favicon updating in document mode.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

Issue 1504183003: Fix favicon updating in document mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

index dce0bfeaf66cb12ab1f70085402cbcc75fd512c8..2f8c437919dfd1a2752621c5a376e618a5053c2b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

@@ -113,6 +113,7 @@ public class DocumentActivity extends ChromeActivity {

@Override

public void onFaviconUpdated(Tab tab, Bitmap icon) {

+ if (icon == null) return;

if (mLargestFavicon == null || icon.getWidth() > mLargestFavicon.getWidth()

|| icon.getHeight() > mLargestFavicon.getHeight()) {

mLargestFavicon = icon;

@@ -145,6 +146,7 @@ public class DocumentActivity extends ChromeActivity {

int statusCode) {

if (!isNavigationToDifferentPage) return;

mLargestFavicon = null;

+ updateTaskDescription();

}

@Override

« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java » ('j') | no next file with comments »