diff options
4 files changed, 15 insertions, 9 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index b6cbefc..8d75dfc 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -251,14 +251,16 @@ void FrameLoaderClientAndroid::dispatchDidReceiveIcon() { return; WTF::String url(m_frame->document()->url().string()); // Try to obtain the icon image. - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL( - url, WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(url, WebCore::IntSize(16, 16)); // If the request fails, try the original request url. if (!icon) { DocumentLoader* docLoader = m_frame->loader()->activeDocumentLoader(); KURL originalURL = docLoader->originalRequest().url(); - icon = WebCore::iconDatabase().iconForPageURL( - originalURL, WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + icon = WebCore::iconDatabase().synchronousIconForPageURL(originalURL, WebCore::IntSize(16, 16)); } // There is a bug in webkit where cancelling an icon load is treated as a // failure. When this is fixed, we can ASSERT again that we have an icon. diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 29cd17d..be38a16 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -576,7 +576,9 @@ WebFrame::loadStarted(WebCore::Frame* frame) // send it along with the page started notification. jobject favicon = NULL; if (isMainFrame) { - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(urlString, WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(urlString, WebCore::IntSize(16, 16)); if (icon) favicon = webcoreImageToJavaBitmap(env, icon); LOGV("favicons", "Starting load with icon %p for %s", icon, url.string().utf8().data()); diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp index dd68a4e..c0a0906 100644 --- a/Source/WebKit/android/jni/WebHistory.cpp +++ b/Source/WebKit/android/jni/WebHistory.cpp @@ -291,8 +291,9 @@ void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) { int refIndex = url.reverseFind('#'); url = url.substring(0, refIndex); } - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(url, - WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(url, WebCore::IntSize(16, 16)); if (icon) favicon = webcoreImageToJavaBitmap(env, icon); diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp index 53460f9..a8379e3 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.cpp +++ b/Source/WebKit/android/jni/WebIconDatabase.cpp @@ -180,8 +180,9 @@ static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url) LOG_ASSERT(url, "No url given to iconForPageUrl"); WTF::String urlStr = jstringToWtfString(env, url); - WebCore::Image* icon = WebCore::iconDatabase().iconForPageURL(urlStr, - WebCore::IntSize(16, 16)); + // FIXME: This method should not be used from outside WebCore and will be removed. + // http://trac.webkit.org/changeset/81484 + WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(urlStr, WebCore::IntSize(16, 16)); LOGV("Retrieving icon for '%s' %p", urlStr.latin1().data(), icon); return webcoreImageToJavaBitmap(env, icon); } |