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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 1c5265b5009e4770e5a410d0edc578250243c68e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 27 06:32:27 2004 +0000

            Reviewed by Dave.
    
    	- fix further problems with Emerson feed: redirection for RSS feeds
    
    	This is done by removing removing the calls to defer callbacks
    	while waiting for
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient continueAfterNavigationPolicy:formState:]):
            (-[WebMainResourceClient connection:willSendRequest:redirectResponse:]):
            (-[WebMainResourceClient continueAfterContentPolicy:response:]):
            (-[WebMainResourceClient checkContentPolicyForResponse:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94c2c6a..6e747e9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2004-05-26  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fix further problems with Emerson feed: redirection for RSS feeds
+
+	This is done by removing removing the calls to defer callbacks
+	while waiting for
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient continueAfterNavigationPolicy:formState:]):
+        (-[WebMainResourceClient connection:willSendRequest:redirectResponse:]):
+        (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+        (-[WebMainResourceClient checkContentPolicyForResponse:]):
+
 2004-05-26  Chris Blumenberg  <cblu at apple.com>
 
 	Added and implemented proposed dragging API changes. These changes are necessary to make JS dragging work properly.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 93b95ef..b6abf6a 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -100,7 +100,6 @@
 
 -(void)continueAfterNavigationPolicy:(NSURLRequest *)_request formState:(WebFormState *)state
 {
-    [[dataSource _webView] setDefersCallbacks:NO];
     if (!_request) {
 	[self stopLoadingForPolicyChange];
     }
@@ -188,7 +187,6 @@
     // when the main load was started.
     [dataSource _setRequest:newRequest];
     
-    [[dataSource _webView] setDefersCallbacks:YES];
     [[dataSource webFrame] _checkNavigationPolicyForRequest:newRequest
                                                  dataSource:dataSource
                                                   formState:nil
@@ -201,8 +199,6 @@
 
 -(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(NSURLResponse *)r
 {
-    [[dataSource _webView] setDefersCallbacks:NO];
-
     switch (contentPolicy) {
     case WebPolicyUse:
 	if (![WebView canShowMIMEType:[r MIMEType]]) {
@@ -265,7 +261,6 @@
     policyResponse = [r retain];
 
     WebView *wv = [dataSource _webView];
-    [wv setDefersCallbacks:YES];
     [l retain];
     [[wv _policyDelegateForwarder] webView:wv decidePolicyForMIMEType:[r MIMEType]
                                                             request:[dataSource request]
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 93b95ef..b6abf6a 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -100,7 +100,6 @@
 
 -(void)continueAfterNavigationPolicy:(NSURLRequest *)_request formState:(WebFormState *)state
 {
-    [[dataSource _webView] setDefersCallbacks:NO];
     if (!_request) {
 	[self stopLoadingForPolicyChange];
     }
@@ -188,7 +187,6 @@
     // when the main load was started.
     [dataSource _setRequest:newRequest];
     
-    [[dataSource _webView] setDefersCallbacks:YES];
     [[dataSource webFrame] _checkNavigationPolicyForRequest:newRequest
                                                  dataSource:dataSource
                                                   formState:nil
@@ -201,8 +199,6 @@
 
 -(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(NSURLResponse *)r
 {
-    [[dataSource _webView] setDefersCallbacks:NO];
-
     switch (contentPolicy) {
     case WebPolicyUse:
 	if (![WebView canShowMIMEType:[r MIMEType]]) {
@@ -265,7 +261,6 @@
     policyResponse = [r retain];
 
     WebView *wv = [dataSource _webView];
-    [wv setDefersCallbacks:YES];
     [l retain];
     [[wv _policyDelegateForwarder] webView:wv decidePolicyForMIMEType:[r MIMEType]
                                                             request:[dataSource request]

-- 
WebKit Debian packaging