[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:22:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9ee647590c8e840ded8a52af238e8d83641d2baa
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jun 28 20:20:51 2002 +0000
WebBrowser:
Bugs fixes for Downloads
* DownloadMonitor.h:
* DownloadMonitor.m:
(-[DownloadMonitor init]): init totals ivars
(-[DownloadMonitor _findEntryForView:]): added
(-[DownloadMonitor _makeSelectedDownloadsPerformSelector:]): prepended a "_"
(-[DownloadMonitor sheetDidDismiss:returnCode:contextInfo:]): cancel downloads before quit
(-[DownloadMonitor _updateTotals]): added, updates totals ivars
(-[DownloadMonitor validateUserInterfaceItem:]): simplified, reveal allowed only for 1 item
(-[DownloadMonitor didDoubleClick]): added, calls reveal
(-[DownloadMonitor openSelectedDownloads:]): calls _makeSelectedDownloadsPerformSelector
(-[DownloadMonitor stopSelectedDownloads:]): calls _makeSelectedDownloadsPerformSelector
(-[DownloadMonitor revealSelectedDownloads:]): calls _makeSelectedDownloadsPerformSelector
* DownloadProgressEntry.m:
(-[DownloadProgressEntry stop]): only stops active downloads
(-[DownloadProgressEntry reveal]): allowed for items currently downloading
* ListView.m:
(-[ListView mouseDown:]): watch for double-click
WebKit:
* WebView.subproj/IFMainURLHandleClient.h:
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient downloadHandler]): added
(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]): removed [downloadHandler cancel]
* WebView.subproj/IFWebDataSource.mm:
(-[IFWebDataSource stopLoading]): call [downloadHandler cancel] here so clean up is done immediately.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1468 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0670a2c..9528e28 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-28 Chris Blumenberg <cblu at apple.com>
+
+ * WebView.subproj/IFMainURLHandleClient.h:
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient downloadHandler]): added
+ (-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]): removed [downloadHandler cancel]
+ * WebView.subproj/IFWebDataSource.mm:
+ (-[IFWebDataSource stopLoading]): call [downloadHandler cancel] here so clean up is done immediately.
+
2002-06-27 Richard Williamson (local) <rjw at apple.com>
Fixed tiling of progressively loaded images.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0670a2c..9528e28 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-28 Chris Blumenberg <cblu at apple.com>
+
+ * WebView.subproj/IFMainURLHandleClient.h:
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient downloadHandler]): added
+ (-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]): removed [downloadHandler cancel]
+ * WebView.subproj/IFWebDataSource.mm:
+ (-[IFWebDataSource stopLoading]): call [downloadHandler cancel] here so clean up is done immediately.
+
2002-06-27 Richard Williamson (local) <rjw at apple.com>
Fixed tiling of progressively loaded images.
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.h b/WebKit/WebView.subproj/IFMainURLHandleClient.h
index 42d185a..9600b7f 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.h
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.h
@@ -23,6 +23,6 @@
IFDownloadHandler *downloadHandler;
}
- initWithDataSource: (IFWebDataSource *)ds;
-
+- (IFDownloadHandler *) downloadHandler;
@end
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 0c5a455..5951d6c 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -50,6 +50,11 @@
[super dealloc];
}
+- (IFDownloadHandler *) downloadHandler
+{
+ return downloadHandler;
+}
+
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([sender url]));
@@ -79,7 +84,6 @@
[url release];
url = nil;
- [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 09f9699..8bb2050 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -4,8 +4,10 @@
*/
#import <WebKit/IFDocument.h>
+#import <WebKit/IFDownloadHandler.h>
#import <WebKit/IFException.h>
#import <WebKit/IFHTMLRepresentation.h>
+#import <WebKit/IFMainURLHandleClient.h>
#import <WebKit/IFWebCoreBridge.h>
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebController.h>
@@ -190,6 +192,9 @@
// method will also stop loads that may be loading in child frames.
- (void)stopLoading
{
+ // stop download here because we can't rely on IFURLHandleResourceDidCancelLoading
+ // as it isn't sent when the app quits
+ [[_private->mainURLHandleClient downloadHandler] cancel];
[self _recursiveStopLoading];
}
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 09f9699..8bb2050 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -4,8 +4,10 @@
*/
#import <WebKit/IFDocument.h>
+#import <WebKit/IFDownloadHandler.h>
#import <WebKit/IFException.h>
#import <WebKit/IFHTMLRepresentation.h>
+#import <WebKit/IFMainURLHandleClient.h>
#import <WebKit/IFWebCoreBridge.h>
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebController.h>
@@ -190,6 +192,9 @@
// method will also stop loads that may be loading in child frames.
- (void)stopLoading
{
+ // stop download here because we can't rely on IFURLHandleResourceDidCancelLoading
+ // as it isn't sent when the app quits
+ [[_private->mainURLHandleClient downloadHandler] cancel];
[self _recursiveStopLoading];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 42d185a..9600b7f 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -23,6 +23,6 @@
IFDownloadHandler *downloadHandler;
}
- initWithDataSource: (IFWebDataSource *)ds;
-
+- (IFDownloadHandler *) downloadHandler;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 0c5a455..5951d6c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -50,6 +50,11 @@
[super dealloc];
}
+- (IFDownloadHandler *) downloadHandler
+{
+ return downloadHandler;
+}
+
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([sender url]));
@@ -79,7 +84,6 @@
[url release];
url = nil;
- [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 42d185a..9600b7f 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -23,6 +23,6 @@
IFDownloadHandler *downloadHandler;
}
- initWithDataSource: (IFWebDataSource *)ds;
-
+- (IFDownloadHandler *) downloadHandler;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 0c5a455..5951d6c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -50,6 +50,11 @@
[super dealloc];
}
+- (IFDownloadHandler *) downloadHandler
+{
+ return downloadHandler;
+}
+
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([sender url]));
@@ -79,7 +84,6 @@
[url release];
url = nil;
- [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list