diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-10 13:11:08 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-05-10 13:11:08 -0700 |
| commit | d236e597b13a93d21eafa2edeacb5092076937e1 (patch) | |
| tree | 2af59c3f6b557ff3405c9937fb8510ec85f157a3 /Source/WebKit/android/jni/WebHistory.cpp | |
| parent | 78d0003d44a4fa393275929d92c8e4929e70c7fa (diff) | |
| download | external_webkit-d236e597b13a93d21eafa2edeacb5092076937e1.zip external_webkit-d236e597b13a93d21eafa2edeacb5092076937e1.tar.gz external_webkit-d236e597b13a93d21eafa2edeacb5092076937e1.tar.bz2 | |
Ensure getFavicon() does not return uninitialized bitmaps.
While a web page is loading, it may not have a favicon. We should
return null in this case.
Bug: 6467873
Change-Id: Id3ee882fdd59679f3cfddb739661e020a4463399
Diffstat (limited to 'Source/WebKit/android/jni/WebHistory.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebHistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp index f01b622..0c4652a 100644 --- a/Source/WebKit/android/jni/WebHistory.cpp +++ b/Source/WebKit/android/jni/WebHistory.cpp @@ -263,7 +263,7 @@ static jobject WebHistoryGetFavicon(JNIEnv* env, jobject obj, jint ptr) return 0; WebHistoryItem* item = reinterpret_cast<WebHistoryItem*>(ptr); MutexLocker locker(item->m_lock); - if (!item->m_faviconCached) { + if (!item->m_faviconCached && !item->m_favicon.isNull()) { jobject favicon = GraphicsJNI::createBitmap(env, new SkBitmap(item->m_favicon), false, NULL); |