-
ddkilzer@apple.com authored
<https://bugs.webkit.org/show_bug.cgi?id=27007> Reviewed by Sam Weinig. WebCore: * WebCore.xcodeproj/project.pbxproj: Added IconDatabaseNone.cpp to the project. * loader/icon/IconDatabase.cpp: Added #if ENABLE(ICONDATABASE)/#endif macro guard. * loader/icon/IconDatabase.h: Removed three public methods from #if ENABLE(ICONDATABASE)/#endif macro so that they may be stubbed out in IconDatabaseNone.cpp. * loader/icon/IconDatabaseNone.cpp: Added #if !ENABLE(ICONDATABASE)/#endif macro guard. (WebCore::IconDatabase::importIconURLForPageURL): Added. (WebCore::IconDatabase::importIconDataForIconURL): Added. (WebCore::IconDatabase::shouldStopThreadActivity): Added. WebKit/mac: * Misc/WebIconDatabase.mm: (defaultClient): Return 0 if ICONDATABASE is disabled. * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchDidReceiveIcon): Commented out the body of the method if ICONDATABASE is disabled. (WebFrameLoaderClient::registerForIconNotification): Ditto. * WebCoreSupport/WebIconDatabaseClient.mm: Added #if ENABLE(ICONDATABASE)/#endif guard to source. * WebView/WebView.mm: (-[WebView setFrameLoadDelegate:]): Wrapped code that starts the icon database machinery in #if ENABLE(ICONDATABASE)/#endif. (-[WebView _registerForIconNotification:]): Wrapped method in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _dispatchDidReceiveIconFromWebFrame:]): Ditto. * WebView/WebViewInternal.h: Wrapped methods in #if ENABLE(ICONDATABASE)/#endif guard. (-[WebView _registerForIconNotification:]): (-[WebView _dispatchDidReceiveIconFromWebFrame:]): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45750 268f45cc-cd09-0410-ab3c-d52691b4dbfc
8c80d4f2