https://bugs.webkit.org/show_bug.cgi?id=56216

Fix the Qt build following the same pattern of the patch.

../WebCore: 

* loader/icon/IconDatabase.h:
* loader/icon/IconDatabaseBase.cpp:
(WebCore::IconDatabaseBase::databasePath): Added to the virtual base.
* loader/icon/IconDatabaseBase.h:
(WebCore::IconDatabaseBase::isOpen): Ditto.

../WebKit/qt: 

Reviewed by attempt at build fix!

* Api/qwebsettings.cpp:
(QWebSettings::setIconDatabasePath): Call the static method via IconDatabase:: and not via iconDatabase()



git-svn-id: svn://svn.chromium.org/blink/trunk@80905 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-11  Brady Eidson  <beidson@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=56216
+        Fix the Qt build following the same pattern of the patch.
+
+        * loader/icon/IconDatabase.h:
+        * loader/icon/IconDatabaseBase.cpp:
+        (WebCore::IconDatabaseBase::databasePath): Added to the virtual base.
+        * loader/icon/IconDatabaseBase.h:
+        (WebCore::IconDatabaseBase::isOpen): Ditto.
+
 2011-03-11  Ben Taylor  <bentaylor.solx86@gmail.com>
 
         Reviewed by Alexey Proskuryakov.

third_party/WebKit/Source/WebCore/loader/icon/IconDatabase.h

@@ -128,8 +128,8 @@ private:
 
 // *** Any Thread ***
 public:
-    bool isOpen() const;
-    String databasePath() const;
+    virtual bool isOpen() const;
+    virtual String databasePath() const;
     static String defaultDatabaseFilename();
 
 private:

third_party/WebKit/Source/WebCore/loader/icon/IconDatabaseBase.cpp

@@ -36,6 +36,11 @@ String IconDatabaseBase::iconURLForPageURL(const String&)
     return String();
 }
 
+String IconDatabaseBase::databasePath() const
+{
+    return String();
+}
+
 static IconDatabaseBase* globalDatabase = 0;
 
 // Functions to get/set the global icon database.

third_party/WebKit/Source/WebCore/loader/icon/IconDatabaseBase.h

@@ -83,6 +83,9 @@ public:
 
     virtual void setPrivateBrowsingEnabled(bool) { }
     virtual void setClient(IconDatabaseClient*) { }
+    
+    virtual bool isOpen() const { return false; }
+    virtual String databasePath() const;
 
 };
 

third_party/WebKit/Source/WebKit/qt/Api/qwebsettings.cpp

@@ -645,7 +645,7 @@ QString QWebSettings::defaultTextEncoding() const
 */
 void QWebSettings::setIconDatabasePath(const QString& path)
 {
-    WebCore::iconDatabase().delayDatabaseCleanup();
+    WebCore::IconDatabase::delayDatabaseCleanup();
 
     if (!path.isEmpty()) {
         WebCore::iconDatabase().setEnabled(true);

third_party/WebKit/Source/WebKit/qt/ChangeLog

+2011-03-11  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by attempt at build fix!
+
+        https://bugs.webkit.org/show_bug.cgi?id=56216
+        Fix the Qt build following the same pattern of the patch.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettings::setIconDatabasePath): Call the static method via IconDatabase:: and not via iconDatabase()
+
 2011-03-11  Alexis Menard  <alexis.menard@openbossa.org>
 
         Reviewed by Ariya Hidayat.