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

Clean up IconDatabaseBase header.

Reviewed by Sam Weinig.

-Get rid of the "PlatformString.h" include and replace it with a forward declaration.
-Group methods by which are used in WebCore directly and which are used in WebKit ports.

This'll make it easier to use in external frameworks (like WebKit2).

* loader/icon/IconDatabase.h:
* loader/icon/IconDatabaseBase.h:
(WebCore::IconDatabaseBase::retainIconForPageURL):
(WebCore::IconDatabaseBase::releaseIconForPageURL):
(WebCore::IconDatabaseBase::iconForPageURL):
(WebCore::IconDatabaseBase::setIconURLForPageURL):
(WebCore::IconDatabaseBase::setIconDataForIconURL):
(WebCore::IconDatabaseBase::iconDataKnownForIconURL):
(WebCore::IconDatabaseBase::loadDecisionForIconURL):
(WebCore::IconDatabaseBase::importIconURLForPageURL):
(WebCore::IconDatabaseBase::importIconDataForIconURL):
(WebCore::IconDatabaseBase::open):



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

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-14  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=56296
+        Clean up IconDatabaseBase header.
+
+        -Get rid of the "PlatformString.h" include and replace it with a forward declaration.
+        -Group methods by which are used in WebCore directly and which are used in WebKit ports.
+
+        This'll make it easier to use in external frameworks (like WebKit2).
+
+        * loader/icon/IconDatabase.h:
+        * loader/icon/IconDatabaseBase.h:
+        (WebCore::IconDatabaseBase::retainIconForPageURL):
+        (WebCore::IconDatabaseBase::releaseIconForPageURL):
+        (WebCore::IconDatabaseBase::iconForPageURL):
+        (WebCore::IconDatabaseBase::setIconURLForPageURL):
+        (WebCore::IconDatabaseBase::setIconDataForIconURL):
+        (WebCore::IconDatabaseBase::iconDataKnownForIconURL):
+        (WebCore::IconDatabaseBase::loadDecisionForIconURL):
+        (WebCore::IconDatabaseBase::importIconURLForPageURL):
+        (WebCore::IconDatabaseBase::importIconDataForIconURL):
+        (WebCore::IconDatabaseBase::open):
+
 2011-03-14  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r81026.

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

@@ -34,6 +34,7 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>
 
 #if ENABLE(ICONDATABASE)
 #include "SQLiteDatabase.h"

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

@@ -26,9 +26,10 @@
 #ifndef IconDatabaseBase_h
 #define IconDatabaseBase_h
 
-#include "PlatformString.h"
-
+#include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/PassRefPtr.h>
+
 
 namespace WebCore { 
 
@@ -36,6 +37,7 @@ class DocumentLoader;
 class IconDatabaseClient;
 class Image;
 class IntSize;
+class SharedBuffer;
 
 enum IconLoadDecision {
     IconLoadYes,
@@ -52,22 +54,27 @@ protected:
 public:
     virtual ~IconDatabaseBase() { }
 
-    virtual void setEnabled(bool) { }
+    // Used internally by WebCore
     virtual bool isEnabled() const { return false; }
+    
+    virtual Image* iconForPageURL(const String&, const IntSize&) { return 0; }
     virtual Image* defaultIcon(const IntSize&) { return 0; }
-
+    
     virtual void retainIconForPageURL(const String&) { }
     virtual void releaseIconForPageURL(const String&) { }
 
-    virtual Image* iconForPageURL(const String&, const IntSize&) { return 0; }
     virtual String iconURLForPageURL(const String&);
-    virtual void setIconURLForPageURL(const String&, const String&) { }
-
-    virtual void setIconDataForIconURL(PassRefPtr<SharedBuffer>, const String&) { }
     virtual bool iconDataKnownForIconURL(const String&) { return false; }
     virtual IconLoadDecision loadDecisionForIconURL(const String&, DocumentLoader*) { return IconLoadNo; }
+    
+    virtual void setIconURLForPageURL(const String&, const String&) { }
+    virtual void setIconDataForIconURL(PassRefPtr<SharedBuffer>, const String&) { }
+
+    // Used within one or more WebKit ports.
+    // We should try to remove these dependencies from the IconDatabaseBase class.
+
+    virtual void setEnabled(bool) { }
 
-    // Support for WebCoreStatistics in WebKit
     virtual size_t pageURLMappingCount() { return 0; }
     virtual size_t retainedPageURLCount() { return 0; }
     virtual size_t iconRecordCount() { return 0; }