diff options
| author | Steve Block <steveblock@google.com> | 2011-06-03 13:33:46 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:24:35 +0100 |
| commit | afec8e01b31500328646269eadfaff1913adceba (patch) | |
| tree | 4e1f75bb91ba3b16d0a9f3de16d6db72368cb1cd | |
| parent | b0b14195c45ffb5d126d15a9e9fea4b42501f0c8 (diff) | |
| download | external_webkit-afec8e01b31500328646269eadfaff1913adceba.zip external_webkit-afec8e01b31500328646269eadfaff1913adceba.tar.gz external_webkit-afec8e01b31500328646269eadfaff1913adceba.tar.bz2 | |
Merge WebKit at r82507: Use icon database through IconDatabaseBase
See http://trac.webkit.org/changeset/80900
Change-Id: Ia724c78b9db4665a0c30cc214c2d6fa61e81f888
| -rw-r--r-- | Source/WebKit/android/jni/WebIconDatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp index 83c46f4..e6892cc 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.cpp +++ b/Source/WebKit/android/jni/WebIconDatabase.cpp @@ -134,7 +134,7 @@ void WebIconDatabase::deliverNotifications() static void Open(JNIEnv* env, jobject obj, jstring path) { - WebCore::IconDatabase& iconDb = WebCore::iconDatabase(); + WebCore::IconDatabaseBase& iconDb = WebCore::iconDatabase(); if (iconDb.isOpen()) return; iconDb.setEnabled(true); |