[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 6bb36b70e560a5d76dea40f68b9b88068a2d79cc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 18 22:57:16 2002 +0000

            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoader iconFromCache]):
            (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
    	Don't process each icon twice. We need to have the loader as a client even for the
    	synchronous case because of the user agent issue, but that causes double work.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1860 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c3c6677..9e2c069 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-18  Darin Adler  <darin at apple.com>
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader iconFromCache]):
+        (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
+	Don't process each icon twice. We need to have the loader as a client even for the
+	synchronous case because of the user agent issue, but that causes double work.
+
 2002-08-16  Darin Adler  <darin at apple.com>
 
 	Step 3 in adding user agent API to WebKit and WebFoundation.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c3c6677..9e2c069 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-18  Darin Adler  <darin at apple.com>
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader iconFromCache]):
+        (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
+	Don't process each icon twice. We need to have the loader as a client even for the
+	synchronous case because of the user agent issue, but that causes double work.
+
 2002-08-16  Darin Adler  <darin at apple.com>
 
 	Step 3 in adding user agent API to WebKit and WebFoundation.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index bc80d87..edcccbb 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -18,6 +18,7 @@
     WebResourceHandle *handle;
     id delegate;
     NSURL *URL;
+    BOOL doingSyncLoad;
 }
 
 @end;
@@ -137,7 +138,9 @@
                                                                attributes:attributes
                                                                     flags:WebResourceHandleFlagNone];
     if (handle) {        
+        _private->doingSyncLoad = YES;
         NSData *data = [handle loadInForeground];
+        _private->doingSyncLoad = NO;
         if (data) {
             icon = [[[NSImage alloc] initWithData:data] autorelease];
             if (icon) {
@@ -186,6 +189,9 @@
 
 - (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)sender data:(NSData *)data
 {
+    if (_private->doingSyncLoad) {
+        return;
+    }
     NSImage *icon = [[NSImage alloc] initWithData:data];
     if (icon) {
         [[self class] _resizeImage:icon];

-- 
WebKit Debian packaging