diff options
| author | Steve Block <steveblock@google.com> | 2011-06-03 14:43:36 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:24:36 +0100 |
| commit | 5d332600324dd9cf9a71dd5cf45b849859890818 (patch) | |
| tree | 7a4ab4db40c3c3f1b0a26b8634b07c7cfc576a7f /Source/WebKit | |
| parent | 24bd542d53743a6d367519174823cc57ad9cd3f8 (diff) | |
| download | external_webkit-5d332600324dd9cf9a71dd5cf45b849859890818.zip external_webkit-5d332600324dd9cf9a71dd5cf45b849859890818.tar.gz external_webkit-5d332600324dd9cf9a71dd5cf45b849859890818.tar.bz2 | |
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
See http://trac.webkit.org/changeset/81824
Change-Id: I2e3b588b7d38211310bd6bf488f1a8d3f6edac5d
Diffstat (limited to 'Source/WebKit')
| -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 e6892cc..53460f9 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.cpp +++ b/Source/WebKit/android/jni/WebIconDatabase.cpp @@ -157,7 +157,7 @@ static void Open(JNIEnv* env, jobject obj, jstring path) } if (didSetPermissions) { LOGV("Opening WebIconDatabase file '%s'", pathStr.latin1().data()); - bool res = iconDb.open(pathStr); + bool res = iconDb.open(pathStr, WebCore::IconDatabase::defaultDatabaseFilename()); if (!res) LOGE("Open failed!"); } else |