[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 83523a5959edb92229a27befee82f80a7836e953
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 9 23:16:06 2002 +0000

            Reviewed by Chris.
    
    	- fixed 3122608 -- REGRESSION: Downloads can't be cancelled
    
    	When I fixed the leak for other categories of policy interruption, I messed
    	things up for downloads. Added new parameters to handle this right.
    
            * WebView.subproj/WebBaseResourceHandleDelegate.h: Remove isDownload flag.
            * WebView.subproj/WebBaseResourceHandleDelegate.m:
            (-[WebBaseResourceHandleDelegate isDownload]): Return NO, override in subclass.
            (-[WebBaseResourceHandleDelegate handle:didReceiveResponse:]): Call isDownload
    	method instead of looking at flag directly.
    
            * WebView.subproj/WebControllerPrivate.h: Add complete: parameter to _mainReceivedError:.
            * WebView.subproj/WebControllerPrivate.m:
            (-[WebController _mainReceivedError:fromDataSource:complete:]): If complete is NO, then
    	don't mark the primary load as complete.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient isDownload]): Added. Returns YES if downloadHandler is non-nil.
            (-[WebMainResourceClient receivedError:complete:]): Added complete parameter. Call the
    	_setPrimaryLoadComplete: method in the download case (fixes a possible leak), and pass
    	the complete parameter through to the controller.
            (-[WebMainResourceClient cancel]): Pass complete:YES.
            (-[WebMainResourceClient interruptForPolicyChangeAndKeepLoading:]): Added the keepLoading
    	flag, and pass complete:!keepLoading.
            (-[WebMainResourceClient stopLoadingForPolicyChange]): Pass keepLoading:NO.
            (-[WebMainResourceClient continueAfterContentPolicy:response:]): Pass keepLoading:YES,
    	and remove the call to the now-obsolete setIsDownload:.
            (-[WebMainResourceClient handle:didFailLoadingWithError:]): Pass complete:YES.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cb7d73a..28baa87 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,7 +2,7 @@
 
         Reviewed by Chris.
 
-	- fixed 3122608 -- Downloads can't be cancelled
+	- fixed 3122608 -- REGRESSION: Downloads can't be cancelled
 
 	When I fixed the leak for other categories of policy interruption, I messed
 	things up for downloads. Added new parameters to handle this right.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 2269ff3..e089c6c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -924,14 +924,10 @@
 {
 }
 
-#if INTERCEPT_ALL_CLICKS // gonna do this soon
-
 - (NSView *)hitTest:(NSPoint)point
 {
     // We handle all clicks. We don't allow subviews to handle them.
     return [super hitTest:point] ? self : nil;
 }
 
-#endif
-
 @end

-- 
WebKit Debian packaging