[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 bb4427b9235e09a3c68a017584f9c6ad28d9f5a0
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 5 01:49:46 2002 +0000

    WebKit:
    
    	Fixed: 3116294 - Need "Reload" feature in Downloads window
    
            Reviewed by: rjw
    
            * WebKit.pbproj/project.pbxproj: made WebFramePrivate.h private so that WebBrowser can call _downloadRequest:toPath:
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadDataSource:withLoadType:]): commented out assert that complains about lack of WebView. Long-term solution is to catch this earlier and have a lone datasource download mechanism 3118355.
    
    WebBrowser:
    
    	Fixed: 3116294 - Need "Reload" feature in Downloads window
    
    	Added new download button art.
    
            Reviewed by: sullivan & darin
    
            * DownloadMonitor.h:
            * DownloadMonitor.m:
            (-[DownloadMonitor init]): create new dictionary _reloadingDataSourceToEntry that store pointers of dataSources to entries so the download monitor knows which entry started the reload.
            (-[DownloadMonitor resource:didReceiveResponse:fromDataSource:]): check if this is a reload by checking _reloadingDataSourceToEntry
            (-[DownloadMonitor setEntry:forReloadingDataSource:]): new, called by the entry to set itself as a reloading downlaod
            * DownloadProgressEntry.h:
            * DownloadProgressEntry.m:
            (-[DownloadProgressEntry _setController:]): new, for when a controller is created for reload
            (-[DownloadProgressEntry _setDataSource:]): tweak
            (-[DownloadProgressEntry _setRequest:]): new, need to retain the request so it can be used for reload
            (-[DownloadProgressEntry _setStartDate:]): new, allows to set the date more then just once
            (-[DownloadProgressEntry dealloc]): release the request and controller
            (-[DownloadProgressEntry reload]): make a controller, set it up, start download, reset the entry
            (-[DownloadProgressEntry setDone:]): release the controller because it won't be needed
            * DownloadRow.h:
            * DownloadRow.m:
            (-[DownloadRow _repositionSubviews]): new, moves widgets around
            (-[DownloadRow _setButtonAttributes]): new, sets attributes of the button
            (-[DownloadRow _startProgressAnimation]): simplified, just deal with progress bar
            (-[DownloadRow _startDiskCopyAnimation]): simplified, just deal with progress bar
            (-[DownloadRow _stopProgressAnimation]): simplified, just deal with progress bar
            (-[DownloadRow _updateStage]): call _repositionSubviews and _setButtonAttributes
            (-[DownloadRow awakeFromNib]): save the origins of the widgets
            (-[DownloadRow reload:]): call [entry reload]
            * English.lproj/Localizable.strings:
            * ResourceProgressEntry.m:
            (-[ResourceProgressEntry setBytesLoaded:]): remove error, added comment
            * Resources/Images/Download_Reload.tif: Added.
            * Resources/Images/Download_ReloadPressed.tif: Added.
            * Resources/Images/Download_Reveal.tif:
            * Resources/Images/Download_RevealPressed.tif:
            * Resources/Images/Download_Stop.tif:
            * Resources/Images/Download_StopPressed.tif:
            * WebBrowser.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0f5ac0d..b851baf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-04  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3116294 - Need "Reload" feature in Downloads window
+
+        Reviewed by: rjw
+
+        * WebKit.pbproj/project.pbxproj: made WebFramePrivate.h private so that WebBrowser can call _downloadRequest:toPath:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadDataSource:withLoadType:]): commented out assert that complains about lack of WebView. Long-term solution is to catch this earlier and have a lone datasource download mechanism 3118355.
+
 2002-12-04  Trey Matteson  <trey at apple.com>
 
 	3097585 - Crash in -[WebFrame(WebPrivate) _isLoadComplete] at result of google image search
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 12e3696..2252acf 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -2312,6 +2312,9 @@
 			fileRef = 9CF0E249021361B00ECA16EA;
 			isa = PBXBuildFile;
 			settings = {
+				ATTRIBUTES = (
+					Private,
+				);
 			};
 		};
 		9CF0E24C021361B10ECA16EA = {
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 083c00f..c794668 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1506,7 +1506,9 @@ static const char * const loadTypeNames[] = {
     // Unfortunately the view must be non-nil, this is ultimately due
     // to KDE parser requiring a KHTMLView.  Once we settle on a final
     // KDE drop we should fix this dependency.
-    ASSERT([self webView] != nil);
+
+    // This is commented out because for the download reload feature, we need to be able to start a load without a WebView involved.
+    //ASSERT([self webView] != nil);
 
     [self stopLoading];
 

-- 
WebKit Debian packaging