chrome/browser/android/shortcut_helper.cc - Issue 2218413002: Calls ShortcutHelper::FinalizeLauncherIcon() on worker thread instead of on IO thread

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/browser/android/shortcut_helper.cc

Issue 2218413002: Calls ShortcutHelper::FinalizeLauncherIcon() on worker thread instead of on IO thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months 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

« chrome/browser/android/shortcut_helper.h ('K') | « chrome/browser/android/shortcut_helper.h ('k') | chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h » ('j') | chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/shortcut_helper.cc

diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc

index 9afc8153bd7de246235d75b5390318a9dccdd170..d0a7aa53b96d5c3bf78ccf2ce1e63c0a0e9faf17 100644

--- a/chrome/browser/android/shortcut_helper.cc

+++ b/chrome/browser/android/shortcut_helper.cc

@@ -236,10 +236,11 @@ void ShortcutHelper::StoreWebappSplashImage(

}

// static

-SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap,

- const GURL& url,

- bool* is_generated) {

- DCHECK_CURRENTLY_ON(content::BrowserThread::IO);

+SkBitmap ShortcutHelper::FinalizeLauncherIconInBackground(

+ const SkBitmap& bitmap,

+ const GURL& url,

+ bool* is_generated) {

+ DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());

JNIEnv* env = base::android::AttachCurrentThread();

ScopedJavaLocalRef<jobject> result;