[Webkit-unassigned] [Bug 27007] Build fixes when ICONDATABASE is disabled

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=27007


David Kilzer (ddkilzer) <ddkilzer at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #32396|                            |review?
               Flag|                            |




--- Comment #2 from David Kilzer (ddkilzer) <ddkilzer at webkit.org>  2009-07-07 15:21:31 PDT ---
Created an attachment (id=32396)
 --> (https://bugs.webkit.org/attachment.cgi?id=32396)
        Bug 27007: Build fixes when ICONDATABASE is disabled


        <https://bugs.webkit.org/show_bug.cgi?id=27007>

        Reviewed by NOBODY (OOPS!).

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:]):---
 11 files changed, 97 insertions(+), 2 deletions(-)

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.