WebCore:
Reviewed by Maciej
Renamed a method/parameter for clarity and consistency, as well as some style
cleanups and removing some ridiculously verbose log messages.
Also added an _isEmpty method to the database and bridge for WebKit's use.
Finally, added a central way for both WebKit and WebCore to get the icon database filename
* bridge/mac/WebCoreIconDatabaseBridge.h: Added _isEmpty and defaultDatabaseFilename
* bridge/mac/WebCoreIconDatabaseBridge.mm: Removed an unnecessary semicolon off most of these methods
(-[WebCoreIconDatabaseBridge openSharedDatabaseWithPath:]):
(-[WebCoreIconDatabaseBridge closeSharedDatabase]):
(-[WebCoreIconDatabaseBridge isOpen]):
(-[WebCoreIconDatabaseBridge _isEmpty]): Added
(-[WebCoreIconDatabaseBridge setPrivateBrowsingEnabled:]):
(-[WebCoreIconDatabaseBridge privateBrowsingEnabled]):
(-[WebCoreIconDatabaseBridge iconForPageURL:withSize:]):
(-[WebCoreIconDatabaseBridge iconURLForPageURL:]):
(-[WebCoreIconDatabaseBridge defaultIconWithSize:]):
(-[WebCoreIconDatabaseBridge retainIconForURL:]):
(-[WebCoreIconDatabaseBridge releaseIconForURL:]):
(-[WebCoreIconDatabaseBridge _setIconData:forIconURL:]):
(-[WebCoreIconDatabaseBridge _setHaveNoIconForIconURL:]):
(-[WebCoreIconDatabaseBridge _setIconURL:forPageURL:]):
(-[WebCoreIconDatabaseBridge _hasIconForIconURL:]):
(-[WebCoreIconDatabaseBridge defaultDatabaseFilename]): Added
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::defaultDatabaseFilename): Added
(WebCore::IconDatabase::open):
(WebCore::IconDatabase::isEmpty): Added
(WebCore::IconDatabase::retainIconForURL): Removed log message
(WebCore::IconDatabase::releaseIconForURL): Removed log message
* loader/icon/IconDatabase.h:
WebKit:
Reviewed by John, Timo, Adele, and Darin
In addition to a few style/good-practice cleanups, this patch will convert the old icon database
format to the WebCore format if the WebCore db is empty (implying this conversion has yet to take
place). After the conversion, it will delete all traces of the old format to free the unneeded space
* Misc/WebIconDatabase.m:
(-[WebIconDatabase init]):
(-[WebIconDatabase _setIconURL:forURL:]): Changed the bridge's name for this method to be more clear
(-[WebIconDatabase _createFileDatabase]):
(-[WebIconDatabase _iconDataForIconURL:]): This grabs the raw data for use in the conversion function
(-[WebIconDatabase _convertToWebCoreFormat]): This does the actual conversion
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15841
268f45cc-cd09-0410-ab3c-
d52691b4dbfc