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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit c2fe534f5a927698d6bf95bb26c54b5414d15acb
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 21 17:54:22 2002 +0000

    WebKit:
    
    	- We were loading icons when page loads ended in error. Fixed.
    	- Special-case file URLs once instead of twice by moving NSWorkspace
    	  call out of WebIconLoader
    
            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoader startLoading]): removed file URL special-case
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _loadIcon]): check for document error, send file
    
    WebBrowser:
    
    	- Comparison between a float and int was causing download history to be erased
    	- Set the dock mini window to display # of active downloads
    
            * DownloadMonitor.h: renamed _hourlyTimer to _removeExpiredTimer
            * DownloadMonitor.m:
            (-[DownloadMonitor dealloc]):
            (-[DownloadMonitor updateProgressUI]): set mini dock title
            (-[DownloadMonitor windowDidLoad]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1619 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4421804..b74acc1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-21  Chris Blumenberg  <cblu at apple.com>
+
+	- We were loading icons when page loads ended in error. Fixed.
+	- Special-case file URLs once instead of twice by moving NSWorkspace
+	  call out of WebIconLoader
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader startLoading]): removed file URL special-case
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _loadIcon]): check for document error, send file 
+icon to client if none has been set with the LINK tag
+
 2002-07-21  Maciej Stachowiak  <mjs at apple.com>
 
         * Makefile.am: Remove products from symroots on `make clean'.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4421804..b74acc1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-07-21  Chris Blumenberg  <cblu at apple.com>
+
+	- We were loading icons when page loads ended in error. Fixed.
+	- Special-case file URLs once instead of twice by moving NSWorkspace
+	  call out of WebIconLoader
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader startLoading]): removed file URL special-case
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _loadIcon]): check for document error, send file 
+icon to client if none has been set with the LINK tag
+
 2002-07-21  Maciej Stachowiak  <mjs at apple.com>
 
         * Makefile.am: Remove products from symroots on `make clean'.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index e31bfb9..29ffe49 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -74,14 +74,9 @@
 
 - (void)startLoading
 {
-    if([_private->url isFileURL]){
-        NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-        [_private->delegate receivedPageIcon:[workspace iconForFile:[_private->url path]]];
-    }else{
-        _private->resourceHandle = [[WebResourceHandle alloc] initWithURL:_private->url];
-        [_private->resourceHandle addClient:self];
-        [_private->resourceHandle loadInBackground];
-    }
+    _private->resourceHandle = [[WebResourceHandle alloc] initWithURL:_private->url];
+    [_private->resourceHandle addClient:self];
+    [_private->resourceHandle loadInBackground];
 }
 
 - (void)startLoadingOnlyFromCache
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 33672ec..3a37974 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -138,21 +138,6 @@
     _private->parent = p;
 }
 
-- (void)_setDefaultIconURLIfUnset
-{
-    // Use the site icon from the server's root directory 
-    // since no site icon has already been requested with the LINK tag
-    if(_private->iconURL == nil && !_private->mainDocumentError){
-        NSURL *dataSourceURL = [self wasRedirected] ? [self redirectedURL] : [self inputURL];
-        
-        if([dataSourceURL isFileURL]){
-            _private->iconURL = [dataSourceURL retain];
-        } else {
-            _private->iconURL = [[NSURL _web_URLWithString:@"/favicon.ico" relativeToURL:dataSourceURL] retain];
-        }
-    }
-}
-
 - (void)_setPrimaryLoadComplete: (BOOL)flag
 {
     _private->primaryLoadComplete = flag;
@@ -506,12 +491,26 @@
 {
     WEBKIT_ASSERT(!_private->iconLoader);
 
-    [self _setDefaultIconURLIfUnset];
+    if([self isMainDocument] && !_private->mainDocumentError){
+        
+        // If no icon URL has been set using the LINK tag, use the icon at the server's root directory
+        // If it is file URL, return its icon provided by NSWorkspace.
+        if(_private->iconURL == nil){
+            NSURL *dataSourceURL = [self wasRedirected] ? [self redirectedURL] : [self inputURL];
     
-    if([self isMainDocument] && _private->iconURL != nil) {
-        _private->iconLoader = [[WebIconLoader alloc] initWithURL:_private->iconURL];
-        [_private->iconLoader setDelegate:self];
-        [_private->iconLoader startLoading];
+            if([dataSourceURL isFileURL]){
+                NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[dataSourceURL path]];
+                [_private->locationChangeHandler receivedPageIcon:icon forDataSource:self];
+            } else {
+                _private->iconURL = [[NSURL _web_URLWithString:@"/favicon.ico" relativeToURL:dataSourceURL] retain];
+            }
+        }
+
+        if(_private->iconURL != nil){
+            _private->iconLoader = [[WebIconLoader alloc] initWithURL:_private->iconURL];
+            [_private->iconLoader setDelegate:self];
+            [_private->iconLoader startLoading];
+        }
     }
 }
 

-- 
WebKit Debian packaging