diff options
Diffstat (limited to 'WebCore/loader/icon')
-rw-r--r-- | WebCore/loader/icon/IconDatabase.cpp | 2 | ||||
-rw-r--r-- | WebCore/loader/icon/IconDatabaseNone.cpp | 47 | ||||
-rw-r--r-- | WebCore/loader/icon/IconFetcher.cpp | 2 | ||||
-rw-r--r-- | WebCore/loader/icon/IconLoader.cpp | 9 |
4 files changed, 37 insertions, 23 deletions
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp index 5705f7a..0521381 100644 --- a/WebCore/loader/icon/IconDatabase.cpp +++ b/WebCore/loader/icon/IconDatabase.cpp @@ -149,7 +149,7 @@ bool IconDatabase::open(const String& databasePath) // Lock here as well as first thing in the thread so the thread doesn't actually commence until the createThread() call // completes and m_syncThreadRunning is properly set m_syncLock.lock(); - m_syncThread = createThread(IconDatabase::iconDatabaseSyncThreadStart, this, "WebCore::IconDatabase"); + m_syncThread = createThread(IconDatabase::iconDatabaseSyncThreadStart, this, "WebCore: IconDatabase"); m_syncLock.unlock(); if (!m_syncThread) return false; diff --git a/WebCore/loader/icon/IconDatabaseNone.cpp b/WebCore/loader/icon/IconDatabaseNone.cpp index c76a2c4..a7fb88d 100644 --- a/WebCore/loader/icon/IconDatabaseNone.cpp +++ b/WebCore/loader/icon/IconDatabaseNone.cpp @@ -25,7 +25,10 @@ #include "config.h" #include "IconDatabase.h" + +#include "PlatformString.h" #include "SharedBuffer.h" +#include <wtf/StdLibExtras.h> namespace WebCore { @@ -47,8 +50,8 @@ const int updateTimerDelay = 5; String IconDatabase::defaultDatabaseFilename() { - static String defaultDatabaseFilename = "Icons.db"; - return defaultDatabaseFilename; + DEFINE_STATIC_LOCAL(String, defaultDatabaseFilename, ("Icons.db")); + return defaultDatabaseFilename.copy(); } IconDatabase* iconDatabase() @@ -62,7 +65,7 @@ IconDatabase::IconDatabase() { } -bool IconDatabase::open(const String& databasePath) +bool IconDatabase::open(const String& /*databasePath*/) { return false; } @@ -85,7 +88,7 @@ void IconDatabase::removeAllIcons() { } -void IconDatabase::setPrivateBrowsingEnabled(bool flag) +void IconDatabase::setPrivateBrowsingEnabled(bool /*flag*/) { } @@ -99,7 +102,7 @@ void IconDatabase::readIconForPageURLFromDisk(const String&) } -Image* IconDatabase::iconForPageURL(const String& pageURL, const IntSize& size) +Image* IconDatabase::iconForPageURL(const String& /*pageURL*/, const IntSize& size) { return defaultIcon(size); } @@ -115,33 +118,33 @@ bool IconDatabase::iconDataKnownForIconURL(const String&) return false; } -String IconDatabase::iconURLForPageURL(const String& pageURL) +String IconDatabase::iconURLForPageURL(const String& /*pageURL*/) { return String(); } -Image* IconDatabase::defaultIcon(const IntSize& size) +Image* IconDatabase::defaultIcon(const IntSize& /*size*/) { return 0; } -void IconDatabase::retainIconForPageURL(const String& pageURL) +void IconDatabase::retainIconForPageURL(const String& /*pageURL*/) { } -void IconDatabase::releaseIconForPageURL(const String& pageURL) +void IconDatabase::releaseIconForPageURL(const String& /*pageURL*/) { } -void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> data, const String& iconURL) +void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> /*data*/, const String& /*iconURL*/) { } -void IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL) +void IconDatabase::setIconURLForPageURL(const String& /*iconURL*/, const String& /*pageURL*/) { } -void IconDatabase::setEnabled(bool enabled) +void IconDatabase::setEnabled(bool /*enabled*/) { } @@ -167,6 +170,26 @@ void IconDatabase::allowDatabaseCleanup() { } +size_t IconDatabase::pageURLMappingCount() +{ + return 0; +} + +size_t IconDatabase::retainedPageURLCount() +{ + return 0; +} + +size_t IconDatabase::iconRecordCount() +{ + return 0; +} + +size_t IconDatabase::iconRecordCountWithData() +{ + return 0; +} + void IconDatabase::setClient(IconDatabaseClient*) { } diff --git a/WebCore/loader/icon/IconFetcher.cpp b/WebCore/loader/icon/IconFetcher.cpp index 69eeb7c..d1aa2f3 100644 --- a/WebCore/loader/icon/IconFetcher.cpp +++ b/WebCore/loader/icon/IconFetcher.cpp @@ -101,8 +101,6 @@ static void parseIconLink(HTMLLinkElement* link, Vector<IconLinkEntry>& entries) PassRefPtr<IconFetcher> IconFetcher::create(Frame* frame, IconFetcherClient* client) { Document* document = frame->document(); - if (!document) - return 0; HTMLHeadElement* head = document->head(); if (!head) diff --git a/WebCore/loader/icon/IconLoader.cpp b/WebCore/loader/icon/IconLoader.cpp index b7bf115..5dd000e 100644 --- a/WebCore/loader/icon/IconLoader.cpp +++ b/WebCore/loader/icon/IconLoader.cpp @@ -35,6 +35,7 @@ #include "ResourceHandle.h" #include "ResourceResponse.h" #include "ResourceRequest.h" +#include "SharedBuffer.h" #include "SubresourceLoader.h" #include <wtf/UnusedParam.h> @@ -62,14 +63,6 @@ void IconLoader::startLoading() if (m_resourceLoader) return; - // FIXME: http://bugs.webkit.org/show_bug.cgi?id=10902 - // Once ResourceHandle will load without a DocLoader, we can remove this check. - // A frame may be documentless - one example is a frame containing only a PDF. - if (!m_frame->document()) { - LOG(IconDatabase, "Documentless-frame - icon won't be loaded"); - return; - } - // Set flag so we can detect the case where the load completes before // SubresourceLoader::create returns. m_loadIsInProgress = true; |