Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc

Issue 1031293002: Fix crashes due to gfx::Image unsafe thread passing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary Pass() Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h" 5 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
6 6
7 #include "base/android/jni_array.h" 7 #include "base/android/jni_array.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 27 matching lines...) Expand all
38 using bookmarks::android::JavaBookmarkIdGetType; 38 using bookmarks::android::JavaBookmarkIdGetType;
39 using bookmarks::BookmarkNode; 39 using bookmarks::BookmarkNode;
40 using bookmarks::BookmarkType; 40 using bookmarks::BookmarkType;
41 using content::WebContents; 41 using content::WebContents;
42 using content::BrowserThread; 42 using content::BrowserThread;
43 using enhanced_bookmarks::ImageRecord; 43 using enhanced_bookmarks::ImageRecord;
44 44
45 namespace { 45 namespace {
46 46
47 void Callback(ScopedJavaGlobalRef<jobject>* j_callback, 47 void Callback(ScopedJavaGlobalRef<jobject>* j_callback,
48 const ImageRecord& image_record) { 48 scoped_refptr<ImageRecord> image_record) {
49 JNIEnv* env = base::android::AttachCurrentThread(); 49 JNIEnv* env = base::android::AttachCurrentThread();
50 50
51 scoped_ptr<ScopedJavaGlobalRef<jobject> > j_callback_ptr(j_callback); 51 scoped_ptr<ScopedJavaGlobalRef<jobject> > j_callback_ptr(j_callback);
52 ScopedJavaLocalRef<jstring> j_url = 52 ScopedJavaLocalRef<jstring> j_url =
53 base::android::ConvertUTF8ToJavaString(env, image_record.url.spec()); 53 base::android::ConvertUTF8ToJavaString(env, image_record->url.spec());
54 54
55 SkBitmap bitmap = image_record.image.AsBitmap(); 55 SkBitmap bitmap = image_record->image->AsBitmap();
56 ScopedJavaLocalRef<jobject> j_bitmap; 56 ScopedJavaLocalRef<jobject> j_bitmap;
57 if (!bitmap.isNull()) { 57 if (!bitmap.isNull()) {
58 j_bitmap = gfx::ConvertToJavaBitmap(&bitmap); 58 j_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
59 } 59 }
60 60
61 enhanced_bookmarks::android::Java_SalientImageCallback_onSalientImageReady( 61 enhanced_bookmarks::android::Java_SalientImageCallback_onSalientImageReady(
62 env, j_callback_ptr->obj(), j_bitmap.Release(), j_url.Release()); 62 env, j_callback_ptr->obj(), j_bitmap.Release(), j_url.Release());
63 } 63 }
64 64
65 } // namespace 65 } // namespace
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 return reinterpret_cast<jlong>(new EnhancedBookmarksBridge( 317 return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
318 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); 318 env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
319 } 319 }
320 320
321 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) { 321 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {
322 return RegisterNativesImpl(env); 322 return RegisterNativesImpl(env);
323 } 323 }
324 324
325 } // namespace android 325 } // namespace android
326 } // namespace enhanced_bookmarks 326 } // namespace enhanced_bookmarks
OLDNEW
« no previous file with comments | « chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc ('k') | components/enhanced_bookmarks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698