Changeset 28718

Timestamp:

2007-12-14 12:25:33 (9 months ago)

Author:

darin@apple.com

Message:

WebKit/mac:

Reviewed by Brady.

• fix http://bugs.webkit.org/show_bug.cgi?id=16296 <rdar://problem/5635641> -didReceiveIcon:forFrame: never called

• WebView/WebView.mm: (-setFrameLoadDelegate:): Call sharedIconDatabase if the a didReceiveIcon method is present.

WebKitTools:

• DumpRenderTree/mac/FrameLoadDelegate.mm: Don't implement didReceiveIcon delegate method since it now triggers unwanted icon loading. We only had it because we implemented "all" delegate methods here.

Location:

trunk

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2007-12-14  Darin Adler  <darin@apple.com>
+
+        Reviewed by Brady.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16296
+          <rdar://problem/5635641> -[WebFrameLoadDelegate didReceiveIcon:forFrame:] never called
+
+        * WebView/WebView.mm:
+        (-[WebView setFrameLoadDelegate:]): Call [WebIconDatabase sharedIconDatabase] if the
+        a didReceiveIcon method is present.
+
 2007-12-14  Darin Adler  <darin@apple.com>
 

trunk/WebKit/mac/WebView/WebView.mm

@@ -2139 +2139 @@
     _private->frameLoadDelegate = delegate;
     [self _cacheFrameLoadDelegateImplementations];
+
+    // If this delegate wants callbacks for icons, fire up the icon database.
+    if (_private->frameLoadDelegateImplementations.didReceiveIconForFrameFunc)
+        [WebIconDatabase sharedIconDatabase];
 }
 
@@ -4055 +4059 @@
     [self _registerForIconNotification:NO];
 
-    WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(self);
-    if (implementations->didReceiveIconForFrameFunc) {
+    WebFrameLoadDelegateImplementationCache* cache = &_private->frameLoadDelegateImplementations;
+    if (cache->didReceiveIconForFrameFunc) {
         Image* image = iconDatabase()->iconForPageURL(core(webFrame)->loader()->url().string(), IntSize(16, 16));
         if (NSImage *icon = webGetNSImage(image, NSMakeSize(16, 16)))
-            CallFrameLoadDelegate(implementations->didReceiveIconForFrameFunc, self, @selector(webView:didReceiveIcon:forFrame:), icon, webFrame);
+            CallFrameLoadDelegate(cache->didReceiveIconForFrameFunc, self, @selector(webView:didReceiveIcon:forFrame:), icon, webFrame);
     }
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-12-14  Darin Adler  <darin@apple.com>
+
+        * DumpRenderTree/mac/FrameLoadDelegate.mm: Don't implement didReceiveIcon delegate method
+        since it now triggers unwanted icon loading. We only had it because we implemented "all"
+        delegate methods here.
+
 2007-12-14  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm

@@ -296 +296 @@
 }
 
-- (void)webView:(WebView *)sender didReceiveIcon:(NSImage *)image forFrame:(WebFrame *)frame
-{
-    if (!done && layoutTestController->dumpFrameLoadCallbacks()) {
-        NSString *string = [NSString stringWithFormat:@"%@ - didReceiveIconForFrame", [frame _drt_descriptionSuitableForTestResult]];
-        printf ("%s\n", [string UTF8String]);
-    }
-}
-
 - (void)webView:(WebView *)sender didChangeLocationWithinPageForFrame:(WebFrame *)frame
 {