diff options
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/jni/WebHistory.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 10 |
2 files changed, 6 insertions, 6 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); diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index a78392b..59901ff 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -698,11 +698,6 @@ class GLDrawFunctor : Functor { if (shouldDraw) wvInstance->updateRectsForGL(); - if (invScreenRect.isEmpty()) { - // NOOP operation if viewport is empty - return 0; - } - WebCore::IntRect inval; int titlebarHeight = screenRect.height() - invScreenRect.height(); @@ -711,6 +706,11 @@ class GLDrawFunctor : Functor { info->clipRight - info->clipLeft, info->clipBottom - info->clipTop); + if (invScreenRect.isEmpty() || screenClip.isEmpty()) { + // NOOP operation if screenRect or clip is empty + return 0; + } + WebCore::IntRect localInvScreenRect = invScreenRect; if (info->isLayer) { // When webview is on a layer, we need to use the viewport relative |