[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 17fd8f405a78b8b4a3ae4c166aaa316e5867620f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 27 22:52:23 2002 +0000

    	- fixed 3031583 -- directory.apple.com now gives "unsupported" redirect
    
            * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithURL:attributes:flags:]):
    	Don't create the resource handle here. It's a bit too early.
            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading:]):
    	Create the resource handle here, now that we have a controller to get a user agent from.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleWillUseUserAgent:forURL:]): Add an assert that will catch
    	any future problems of this kind.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge defersLoading]): Added. New call for use in WebCore.
            (-[WebBridge setDefersLoading:]): Added. New call for use in WebCore.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5898c01..fc42719 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-08-27  Darin Adler  <darin at apple.com>
+
+	- fixed 3031583 -- directory.apple.com now gives "unsupported" redirect
+
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithURL:attributes:flags:]):
+	Don't create the resource handle here. It's a bit too early.
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading:]):
+	Create the resource handle here, now that we have a controller to get a user agent from.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleWillUseUserAgent:forURL:]): Add an assert that will catch
+	any future problems of this kind.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge defersLoading]): Added. New call for use in WebCore.
+        (-[WebBridge setDefersLoading:]): Added. New call for use in WebCore.
+
 2002-08-26  Darin Adler  <darin at apple.com>
 
 	Add machinery for deferring callbacks. Not used yet.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5898c01..fc42719 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-08-27  Darin Adler  <darin at apple.com>
+
+	- fixed 3031583 -- directory.apple.com now gives "unsupported" redirect
+
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource initWithURL:attributes:flags:]):
+	Don't create the resource handle here. It's a bit too early.
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _startLoading:]):
+	Create the resource handle here, now that we have a controller to get a user agent from.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleWillUseUserAgent:forURL:]): Add an assert that will catch
+	any future problems of this kind.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge defersLoading]): Added. New call for use in WebCore.
+        (-[WebBridge setDefersLoading:]): Added. New call for use in WebCore.
+
 2002-08-26  Darin Adler  <darin at apple.com>
 
 	Add machinery for deferring callbacks. Not used yet.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 4d3f8b9..8fdce67 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -323,4 +323,14 @@
     return [[[[frame controller] mainFrame] webView] previousKeyView];
 }
 
+- (BOOL)defersLoading
+{
+    return [[frame controller] _defersCallbacks];
+}
+
+- (void)setDefersLoading:(BOOL)defers
+{
+    [[frame controller] _setDefersCallbacks:defers];
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 4eef05d..9553786 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -43,8 +43,6 @@
     _private->inputURL = [URL retain];
     _private->flags = theFlags;
     _private->attributes = [theAttributes retain];
-    _private->mainHandleClient = [[WebMainResourceClient alloc] initWithDataSource: self];
-    _private->mainHandle = [[WebResourceHandle alloc] initWithClient:_private->mainHandleClient URL:_private->inputURL attributes:theAttributes flags:theFlags];
     
     ++WebDataSourceCount;
     
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index d2412d2..703438d 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -189,6 +189,10 @@
     [[_private->controller locationChangeHandler] locationChangeStartedForDataSource:self];
 
     // Fire this guy up.
+    if (!_private->mainHandle) {
+        _private->mainHandleClient = [[WebMainResourceClient alloc] initWithDataSource: self];
+        _private->mainHandle = [[WebResourceHandle alloc] initWithClient:_private->mainHandleClient URL:_private->inputURL attributes:_private->attributes flags:_private->flags];
+    }
     [_private->mainHandle loadInBackground];
 }
 
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 52ee251..480728d 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -103,6 +103,7 @@
 
 - (NSString *)handleWillUseUserAgent:(WebResourceHandle *)handle forURL:(NSURL *)URL
 {
+    WEBKIT_ASSERT([dataSource controller]);
     return [[dataSource controller] userAgentForURL:URL];
 }
 
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 52ee251..480728d 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -103,6 +103,7 @@
 
 - (NSString *)handleWillUseUserAgent:(WebResourceHandle *)handle forURL:(NSURL *)URL
 {
+    WEBKIT_ASSERT([dataSource controller]);
     return [[dataSource controller] userAgentForURL:URL];
 }
 

-- 
WebKit Debian packaging