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: https://svn.webkit.org/repository/webkit/trunk@6697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94c2c6a56ef05b08853639aa81fb47ad7a23bc1f..6e747e920cc1dcfe87b27eb530e5cbc8c62f168b 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2004-05-26  Maciej Stachowiak  <mjs@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@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 93b95ef99c1cd6061e32fc986f6ff8809baa8dd2..b6abf6ac05d4ccc437b40b25d6279b938f109a69 100644 (file)
--- 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 93b95ef99c1cd6061e32fc986f6ff8809baa8dd2..b6abf6ac05d4ccc437b40b25d6279b938f109a69 100644 (file)
--- 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]