Reviewed by Beth

        Since I just pushed the default URL icon from WebKit to WebCore, but
        WebKit was still using its version of the default icon, this patch makes it
        use the WebCore version

        * Misc/WebIconDatabase.m:
        (-[WebIconDatabase defaultIconWithSize:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c4ec0d28a50345bfb556c0a74ee358023c1cffa1..1ae8ecf13d9462f78ee20d33ba78b1b646d65d94 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-23  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Beth
+        Since I just pushed the default URL icon from WebKit to WebCore, but
+        WebKit was still using its version of the default icon, this patch makes it
+        use the WebCore version
+
+        * Misc/WebIconDatabase.m:
+        (-[WebIconDatabase defaultIconWithSize:]):
+
 2006-08-22  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Brady.

diff --git a/WebKit/Misc/WebIconDatabase.m b/WebKit/Misc/WebIconDatabase.m
index 811343d9e4c5397b8eb69a4c6b0bd4570cfa2391..be28b1e2def59e772fbf638322c4e78dfa8b22a8 100644 (file)
--- a/WebKit/Misc/WebIconDatabase.m
+++ b/WebKit/Misc/WebIconDatabase.m
@@ -235,6 +235,10 @@ NSSize WebIconLargeSize = {128, 128};
     ASSERT(size.width);
     ASSERT(size.height);
     
+#ifdef ICONDEBUG
+    return [_private->databaseBridge defaultIconWithSize:size];
+#endif
+    
     if (!_private->defaultIcons) {
         NSString *path = [[NSBundle bundleForClass:[self class]] pathForResource:@"url_icon" ofType:@"tiff"];
         if (path) {