<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45750] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/45750">45750</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2009-07-10 23:16:28 -0700 (Fri, 10 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Bug 27007: Build fixes when ICONDATABASE is disabled

        &lt;https://bugs.webkit.org/show_bug.cgi?id=27007&gt;

        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:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCorexcodeprojprojectpbxproj">trunk/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkWebCoreloadericonIconDatabasecpp">trunk/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkWebCoreloadericonIconDatabaseh">trunk/WebCore/loader/icon/IconDatabase.h</a></li>
<li><a href="#trunkWebCoreloadericonIconDatabaseNonecpp">trunk/WebCore/loader/icon/IconDatabaseNone.cpp</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacMiscWebIconDatabasemm">trunk/WebKit/mac/Misc/WebIconDatabase.mm</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkWebKitmacWebCoreSupportWebIconDatabaseClientmm">trunk/WebKit/mac/WebCoreSupport/WebIconDatabaseClient.mm</a></li>
<li><a href="#trunkWebKitmacWebViewWebViewmm">trunk/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkWebKitmacWebViewWebViewInternalh">trunk/WebKit/mac/WebView/WebViewInternal.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebCore/ChangeLog        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2009-07-10  David Kilzer  &lt;ddkilzer@apple.com&gt;
+
+        Bug 27007: Build fixes when ICONDATABASE is disabled
+
+        &lt;https://bugs.webkit.org/show_bug.cgi?id=27007&gt;
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
</ins><span class="cx"> 2009-07-10  Daniel Bates  &lt;dbates@intudata.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Adam Barth.
</span></span></pre></div>
<a id="trunkWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.xcodeproj/project.pbxproj (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebCore/WebCore.xcodeproj/project.pbxproj        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -684,6 +684,7 @@
</span><span class="cx">                 441B055C0CD77A2D007C1F18 /* DOMHTMLEmbedElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 4429AAFB0CB84E88007647C5 /* DOMHTMLEmbedElementPrivate.h */; };
</span><span class="cx">                 441B055E0CD77A48007C1F18 /* DOMHTMLIFrameElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 4429AAFD0CB84EA5007647C5 /* DOMHTMLIFrameElementPrivate.h */; };
</span><span class="cx">                 441B05600CD77A65007C1F18 /* DOMHTMLObjectElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 4429AAFF0CB84EC3007647C5 /* DOMHTMLObjectElementPrivate.h */; };
</span><ins>+                445C8DB710015FC90031531A /* IconDatabaseNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 445C8DB610015FC90031531A /* IconDatabaseNone.cpp */; };
</ins><span class="cx">                 447D69030FA626810015CCB1 /* RuntimeApplicationChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = 447D69010FA626810015CCB1 /* RuntimeApplicationChecks.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 447D69040FA626810015CCB1 /* RuntimeApplicationChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = 447D69020FA626810015CCB1 /* RuntimeApplicationChecks.mm */; };
</span><span class="cx">                 448A29BF0A46D9CB0030759F /* JSHTMLOptionsCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */; };
</span><span class="lines">@@ -5628,6 +5629,7 @@
</span><span class="cx">                 4429AAFD0CB84EA5007647C5 /* DOMHTMLIFrameElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLIFrameElementPrivate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 4429AAFF0CB84EC3007647C5 /* DOMHTMLObjectElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLObjectElementPrivate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 4429AB070CB84F81007647C5 /* DOMTextEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMTextEventInternal.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                445C8DB610015FC90031531A /* IconDatabaseNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconDatabaseNone.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 447D69010FA626810015CCB1 /* RuntimeApplicationChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeApplicationChecks.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 447D69020FA626810015CCB1 /* RuntimeApplicationChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RuntimeApplicationChecks.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLOptionsCollection.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -10061,6 +10063,7 @@
</span><span class="cx">                                 5126E6B90A2E3B12005C29FA /* IconDatabase.cpp */,
</span><span class="cx">                                 5126E6BA0A2E3B12005C29FA /* IconDatabase.h */,
</span><span class="cx">                                 51E1ECB80C91C90400DC255B /* IconDatabaseClient.h */,
</span><ins>+                                445C8DB610015FC90031531A /* IconDatabaseNone.cpp */,
</ins><span class="cx">                                 1A2D753C0DE47FAB00F0A648 /* IconFetcher.cpp */,
</span><span class="cx">                                 1A2D753B0DE47FAB00F0A648 /* IconFetcher.h */,
</span><span class="cx">                                 513F14510AB634C400094DDF /* IconLoader.cpp */,
</span><span class="lines">@@ -17871,6 +17874,7 @@
</span><span class="cx">                                 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
</span><span class="cx">                                 514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */,
</span><span class="cx">                                 5126E6BB0A2E3B12005C29FA /* IconDatabase.cpp in Sources */,
</span><ins>+                                445C8DB710015FC90031531A /* IconDatabaseNone.cpp in Sources */,
</ins><span class="cx">                                 1A2D753E0DE47FAB00F0A648 /* IconFetcher.cpp in Sources */,
</span><span class="cx">                                 513F14530AB634C400094DDF /* IconLoader.cpp in Sources */,
</span><span class="cx">                                 B275358E0B053A66002CE64F /* IconMac.mm in Sources */,
</span></span></pre></div>
<a id="trunkWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/icon/IconDatabase.cpp (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/icon/IconDatabase.cpp        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebCore/loader/icon/IconDatabase.cpp        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;IconDatabase.h&quot;
</span><span class="cx"> 
</span><ins>+#if ENABLE(ICONDATABASE)
+
</ins><span class="cx"> #include &quot;AutodrainedPool.h&quot;
</span><span class="cx"> #include &quot;DocumentLoader.h&quot;
</span><span class="cx"> #include &quot;FileSystem.h&quot;
</span><span class="lines">@@ -2067,3 +2069,5 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // ENABLE(ICONDATABASE)
</ins></span></pre></div>
<a id="trunkWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/icon/IconDatabase.h (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/icon/IconDatabase.h        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebCore/loader/icon/IconDatabase.h        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx">     HashSet&lt;String&gt; m_pageURLsPendingImport;
</span><span class="cx">     HashSet&lt;String&gt; m_pageURLsInterestedInIcons;
</span><span class="cx">     HashSet&lt;IconRecord*&gt; m_iconsPendingReading;
</span><ins>+#endif // ENABLE(ICONDATABASE)
</ins><span class="cx"> 
</span><span class="cx"> // *** Sync Thread Only ***
</span><span class="cx"> public:
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx">     
</span><span class="cx">     bool shouldStopThreadActivity() const;
</span><span class="cx"> 
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx"> private:    
</span><span class="cx">     static void* iconDatabaseSyncThreadStart(void *);
</span><span class="cx">     void* iconDatabaseSyncThread();
</span><span class="lines">@@ -238,4 +240,4 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif
</del><ins>+#endif // IconDatabase_h
</ins></span></pre></div>
<a id="trunkWebCoreloadericonIconDatabaseNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/icon/IconDatabaseNone.cpp (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/icon/IconDatabaseNone.cpp        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebCore/loader/icon/IconDatabaseNone.cpp        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;IconDatabase.h&quot;
</span><span class="cx"> 
</span><ins>+#if !ENABLE(ICONDATABASE)
+
</ins><span class="cx"> #include &quot;PlatformString.h&quot;
</span><span class="cx"> #include &quot;SharedBuffer.h&quot;
</span><span class="cx"> #include &lt;wtf/StdLibExtras.h&gt;
</span><span class="lines">@@ -194,4 +196,23 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// ************************
+// *** Sync Thread Only ***
+// ************************
+
+void IconDatabase::importIconURLForPageURL(const String&amp;, const String&amp;)
+{
+}
+
+void IconDatabase::importIconDataForIconURL(PassRefPtr&lt;SharedBuffer&gt;, const String&amp;)
+{
+}
+
+bool IconDatabase::shouldStopThreadActivity() const
+{
+    return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // !ENABLE(ICONDATABASE)
</ins></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebKit/mac/ChangeLog        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2009-07-10  David Kilzer  &lt;ddkilzer@apple.com&gt;
+
+        Bug 27007: Build fixes when ICONDATABASE is disabled
+
+        &lt;https://bugs.webkit.org/show_bug.cgi?id=27007&gt;
+
+        Reviewed by Sam Weinig.
+
+        * 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:]):
+
</ins><span class="cx"> 2009-07-10  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by John Sullivan.
</span></span></pre></div>
<a id="trunkWebKitmacMiscWebIconDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/Misc/WebIconDatabase.mm (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/Misc/WebIconDatabase.mm        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebKit/mac/Misc/WebIconDatabase.mm        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -65,8 +65,12 @@
</span><span class="cx"> 
</span><span class="cx"> static WebIconDatabaseClient* defaultClient()
</span><span class="cx"> {
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx">     static WebIconDatabaseClient* defaultClient = new WebIconDatabaseClient();
</span><span class="cx">     return defaultClient;
</span><ins>+#else
+    return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @interface WebIconDatabase (WebReallyInternal)
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -539,9 +539,11 @@
</span><span class="cx"> 
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidReceiveIcon()
</span><span class="cx"> {
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx">     WebView *webView = getWebView(m_webFrame.get());   
</span><span class="cx">     ASSERT(m_webFrame == [webView mainFrame]);
</span><span class="cx">     [webView _dispatchDidReceiveIconFromWebFrame:m_webFrame.get()];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameLoaderClient::dispatchDidStartProvisionalLoad()
</span><span class="lines">@@ -1636,7 +1638,9 @@
</span><span class="cx"> 
</span><span class="cx"> void WebFrameLoaderClient::registerForIconNotification(bool listen)
</span><span class="cx"> {
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx">     [[m_webFrame.get() webView] _registerForIconNotification:listen];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebFrameLoaderClient::didPerformFirstNavigation() const
</span></span></pre></div>
<a id="trunkWebKitmacWebCoreSupportWebIconDatabaseClientmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebCoreSupport/WebIconDatabaseClient.mm (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebCoreSupport/WebIconDatabaseClient.mm        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebKit/mac/WebCoreSupport/WebIconDatabaseClient.mm        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #import &quot;WebIconDatabaseClient.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #import &quot;WebIconDatabaseInternal.h&quot;
</span><del>-
</del><span class="cx"> #import &lt;WebCore/PlatformString.h&gt;
</span><span class="cx"> 
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx"> 
</span><span class="cx"> bool WebIconDatabaseClient::performImport()
</span><span class="cx"> {
</span><span class="lines">@@ -55,3 +55,5 @@
</span><span class="cx">     // instead of us doing it every iteration
</span><span class="cx">     [[WebIconDatabase sharedIconDatabase] _sendNotificationForURL:pageURL];
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(ICONDATABASE)
</ins></span></pre></div>
<a id="trunkWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebView/WebView.mm (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebView/WebView.mm        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebKit/mac/WebView/WebView.mm        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -2708,9 +2708,11 @@
</span><span class="cx">     _private-&gt;frameLoadDelegate = delegate;
</span><span class="cx">     [self _cacheFrameLoadDelegateImplementations];
</span><span class="cx"> 
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx">     // If this delegate wants callbacks for icons, fire up the icon database.
</span><span class="cx">     if (_private-&gt;frameLoadDelegateImplementations.didReceiveIconForFrameFunc)
</span><span class="cx">         [WebIconDatabase sharedIconDatabase];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - frameLoadDelegate
</span><span class="lines">@@ -5117,6 +5119,7 @@
</span><span class="cx">     return _private-&gt;becomingFirstResponderFromOutside;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx"> - (void)_receivedIconChangedNotification:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx">     // Get the URL for this notification
</span><span class="lines">@@ -5157,6 +5160,7 @@
</span><span class="cx"> 
</span><span class="cx">     [self _didChangeValueForKey:_WebMainFrameIconKey];
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(ICONDATABASE)
</ins><span class="cx"> 
</span><span class="cx"> // Get the appropriate user-agent string for a particular URL.
</span><span class="cx"> - (WebCore::String)_userAgentForURL:(const WebCore::KURL&amp;)url
</span></span></pre></div>
<a id="trunkWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebView/WebViewInternal.h (45749 => 45750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebView/WebViewInternal.h        2009-07-11 06:02:34 UTC (rev 45749)
+++ trunk/WebKit/mac/WebView/WebViewInternal.h        2009-07-11 06:16:28 UTC (rev 45750)
</span><span class="lines">@@ -70,8 +70,10 @@
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_becomingFirstResponderFromOutside;
</span><span class="cx"> 
</span><ins>+#if ENABLE(ICONDATABASE)
</ins><span class="cx"> - (void)_registerForIconNotification:(BOOL)listen;
</span><span class="cx"> - (void)_dispatchDidReceiveIconFromWebFrame:(WebFrame *)webFrame;
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> - (void)_setMouseDownEvent:(NSEvent *)event;
</span><span class="cx"> - (void)_cancelUpdateMouseoverTimer;
</span></span></pre>
</div>
</div>

</body>
</html>