[webkit-reviews] review requested: [Bug 27007] Build fixes when ICONDATABASE is disabled : [Attachment 32324] Patch v1

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Mon Jul 6 14:23:53 PDT 2009


David Kilzer (ddkilzer) <ddkilzer at webkit.org> has asked  for review:
Bug 27007: Build fixes when ICONDATABASE is disabled
https://bugs.webkit.org/show_bug.cgi?id=27007

Attachment 32324: Patch v1
https://bugs.webkit.org/attachment.cgi?id=32324&action=edit

------- Additional Comments from David Kilzer (ddkilzer) <ddkilzer at webkit.org>
Build fixes when ICONDATABASE is disabled

Reviewed by NOBODY (OOPS!).

WebCore:

	* Configurations/WebCore.xcconfig: Exclude IconDatabase.cpp
	from being compiled when ICONDATABASE is disabled, and exclude
	IconDatabaseNone.cpp when ICONDATABASE is enabled.  Reworked
	definition of EXCLUDED_SOURCE_FILE_NAMES.
	* WebCore.xcodeproj/project.pbxproj: Added IconDatabaseNone.cpp
	to the project.
	* 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:
	(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:]):


More information about the webkit-reviews mailing list