From afec8e01b31500328646269eadfaff1913adceba Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 3 Jun 2011 13:33:46 +0100
Subject: Merge WebKit at r82507: Use icon database through IconDatabaseBase

See http://trac.webkit.org/changeset/80900

Change-Id: Ia724c78b9db4665a0c30cc214c2d6fa61e81f888
---
 Source/WebKit/android/jni/WebIconDatabase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebKit/android/jni')

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);
-- 
cgit v1.1