diff options
| author | Steve Block <steveblock@google.com> | 2011-06-03 14:56:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:24:37 +0100 |
| commit | 2f4ef9300ef5b74c660927a63057e2fcff0e1905 (patch) | |
| tree | 0b710a92b3094ead24d72a4113194b243f094769 /Source/WebKit/android/jni/WebHistory.cpp | |
| parent | 5d332600324dd9cf9a71dd5cf45b849859890818 (diff) | |
| download | external_webkit-2f4ef9300ef5b74c660927a63057e2fcff0e1905.zip external_webkit-2f4ef9300ef5b74c660927a63057e2fcff0e1905.tar.gz external_webkit-2f4ef9300ef5b74c660927a63057e2fcff0e1905.tar.bz2 | |
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
See http://trac.webkit.org/changeset/81484
Change-Id: I72f818d5d0075c63b658c2d8457d2182a7968c05
Diffstat (limited to 'Source/WebKit/android/jni/WebHistory.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebHistory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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); |