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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 3e22c9bfc75f6d0843a9dcea4c6631d1f80d9e5f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 29 18:13:13 2002 +0000

            Added stopLoading to startLoading to cancel any pending loads before
            new loads start.  This doesn't work yet because of loader bugs, but will
            once those are fixed.
    
            Adding logging for redirects.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@891 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6877e8b..b804c36 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-03-29  Richard Williamson  <rjw at apple.com>
+
+        Added stopLoading to startLoading to cancel any pending loads before
+        new loads start.  This doesn't work yet because of loader bugs, but will
+        once those are fixed.
+        
+        Adding logging for redirects.
+        
+	* Misc.subproj/WebKitDebug.h:
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:didRedirectToURL:]):
+	* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame startLoading]):
+
 2002-03-29  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFramePrivate dealloc]): Deref the
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6877e8b..b804c36 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-03-29  Richard Williamson  <rjw at apple.com>
+
+        Added stopLoading to startLoading to cancel any pending loads before
+        new loads start.  This doesn't work yet because of loader bugs, but will
+        once those are fixed.
+        
+        Adding logging for redirects.
+        
+	* Misc.subproj/WebKitDebug.h:
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:didRedirectToURL:]):
+	* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame startLoading]):
+
 2002-03-29  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFramePrivate dealloc]): Deref the
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 61dbe3c..7e0c147 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -22,6 +22,8 @@
 #define WEBKIT_LOG_EVENTS			0x00010000
 #define WEBKIT_LOG_VIEW				0x00020000
 
+#define WEBKIT_LOG_REDIRECT			0x00040000
+
 // ranges reserved for different uses to enable easy isolation of certain log messages
 #define WEBKIT_LOG_GENERIC_RANGE		0x000000FF
 #define WEBKIT_LOG_CORE_RANGE			0x0000FF00	
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 6711bbc..8b1cac1 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -84,6 +84,7 @@
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
 {
+    WEBKITDEBUGLEVEL1 (WEBKIT_LOG_REDIRECT, "url = %s\n", [[url absoluteString] cString]);
 }
 
 @end
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 63ae1a2..626cd51 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -157,6 +157,9 @@
 {
     IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
     
+    // Stop loading any previous loads that may be currently active.
+    [self stopLoading];
+    
     // Force refresh is irrelevant, as this will always be the first load.
     // The controller will transition the provisional data source to the
     // committed data source.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 63ae1a2..626cd51 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -157,6 +157,9 @@
 {
     IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
     
+    // Stop loading any previous loads that may be currently active.
+    [self stopLoading];
+    
     // Force refresh is irrelevant, as this will always be the first load.
     // The controller will transition the provisional data source to the
     // committed data source.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 6711bbc..8b1cac1 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -84,6 +84,7 @@
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
 {
+    WEBKITDEBUGLEVEL1 (WEBKIT_LOG_REDIRECT, "url = %s\n", [[url absoluteString] cString]);
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 6711bbc..8b1cac1 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -84,6 +84,7 @@
 
 - (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
 {
+    WEBKITDEBUGLEVEL1 (WEBKIT_LOG_REDIRECT, "url = %s\n", [[url absoluteString] cString]);
 }
 
 @end

-- 
WebKit Debian packaging