[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 14bfdfa3abd5e243452e3e3c9a2f4348879fd7c2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 3 21:24:45 2004 +0000

            Reviewed by Chris.
    
            - fixed <rdar://problem/3677038>: (Need SPI to get URL of favicon for a site)
    
            * Misc.subproj/WebIconDatabase.h: Add iconURLForURL: method.
            * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase iconURLForURL:]): Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ebb09b6..9efa97c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed <rdar://problem/3677038>: (Need SPI to get URL of favicon for a site)
+
+        * Misc.subproj/WebIconDatabase.h: Add iconURLForURL: method.
+        * Misc.subproj/WebIconDatabase.m: (-[WebIconDatabase iconURLForURL:]): Added.
+
 2004-06-02  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebKit/Misc.subproj/WebIconDatabase.h b/WebKit/Misc.subproj/WebIconDatabase.h
index f7b1701..db3d92f 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.h
+++ b/WebKit/Misc.subproj/WebIconDatabase.h
@@ -73,6 +73,13 @@ extern NSSize WebIconLargeSize;  // 128 x 128
 - (NSImage *)iconForURL:(NSString *)URL withSize:(NSSize)size cache:(BOOL)cache;
 
 /*!
+    @method iconURLForURL:withSize:cache:
+    @discussion Returns an icon URL for a web site URL from memory or disk. nil if none is found.
+    @param URL
+*/
+- (NSString *)iconURLForURL:(NSString *)URL;
+
+/*!
     @method defaultIconWithSize:
     @param size
 */
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index ff1e287..88dd13c 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -139,6 +139,11 @@ NSSize WebIconLargeSize = {128, 128};
     return [self iconForURL:URL withSize:size cache:YES];
 }
 
+- (NSString *)iconURLForURL:(NSString *)URL
+{
+    return URL ? [_private->URLToIconURL objectForKey:URL] : nil;
+}
+
 - (NSImage *)defaultIconWithSize:(NSSize)size
 {
     ASSERT(size.width);

-- 
WebKit Debian packaging