-
rdar://problem/8648311https://bugs.webkit.org/show_bug.cgi?id=56216beidson@apple.com authored
Rework disabled IconDatabase builds while allowing for a pluggable icon database implementation. ../WebCore: Reviewed by Sam Weinig. Project file stuff: * Android.mk: * CMakeLists.txt: * GNUmakefile.am: * WebCore.gyp/WebCore.gyp: * WebCore.gypi: * WebCore.pro: * WebCore.xcodeproj/project.pbxproj: * WebCore.vcproj/WebCore.vcproj: * loader/icon/IconDatabase.cpp: * loader/icon/IconDatabase.h: Inherit from IconDatabaseBase. * loader/icon/IconDatabaseBase.cpp: Added. (WebCore::IconDatabaseBase::iconURLForPageURL): (WebCore::iconDatabase): (WebCore::setGlobalIconDatabase): * loader/icon/IconDatabaseBase.h: Added. (WebCore::IconDatabaseBase::IconDatabaseBase): (WebCore::IconDatabaseBase::~IconDatabaseBase): (WebCore::IconDatabaseBase::setEnabled): (WebCore::IconDatabaseBase::isEnabled): (WebCore::IconDatabaseBase::defaultIcon): (WebCore::IconDatabaseBase::retainIconForPageURL): (WebCore::IconDatabaseBase::releaseIconForPageURL): (WebCore::IconDatabaseBase::iconForPageURL): (WebCore::IconDatabaseBase::setIconURLForPageURL): (WebCore::IconDatabaseBase::setIconDataForIconURL): (WebCore::IconDatabaseBase::iconDataKnownForIconURL): (WebCore::IconDatabaseBase::loadDecisionForIconURL): (WebCore::IconDatabaseBase::pageURLMappingCount): (WebCore::IconDatabaseBase::retainedPageURLCount): (WebCore::IconDatabaseBase::iconRecordCount): (WebCore::IconDatabaseBase::iconRecordCountWithData): (WebCore::IconDatabaseBase::importIconURLForPageURL): (WebCore::IconDatabaseBase::importIconDataForIconURL): (WebCore::IconDatabaseBase::shouldStopThreadActivity): (WebCore::IconDatabaseBase::open): (WebCore::IconDatabaseBase::close): (WebCore::IconDatabaseBase::removeAllIcons): (WebCore::IconDatabaseBase::setPrivateBrowsingEnabled): (WebCore::IconDatabaseBase::setClient): * loader/icon/IconDatabaseNone.cpp: Removed. ../WebKit/mac: Reviewed by Anders Carlsson * Misc/WebIconDatabase.mm: (+[WebIconDatabase _checkIntegrityBeforeOpening]): Call these static methods on IconDatabase::, not iconDatabase(). (-[WebIconDatabase _startUpIconDatabase]): Ditto. (importToWebCoreFormat): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@80900 268f45cc-cd09-0410-ab3c-d52691b4dbfc
3180d973