[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 0772a7dce2539901c4362b710ebd22160510dcf5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 2 22:59:47 2003 +0000

    	Fix for 3250352.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _startLoading:]):
    	Check respondsToSelector: before calling.
    
            * WebView.subproj/WebResourceLoadDelegate.h:
            * WebView.subproj/WebUIDelegate.h:
    	Headerdoc tweaks.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4471 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fc78ba6..3afb0ba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-06-02  Richard Williamson  <rjw at apple.com>
+
+	Fix for 3250352.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _startLoading:]):
+	Check respondsToSelector: before calling.
+
+        * WebView.subproj/WebResourceLoadDelegate.h:
+        * WebView.subproj/WebUIDelegate.h:
+	Headerdoc tweaks.
+
 === Safari-81 ===
 
 2003-06-02  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index feb3dd3..41b0181 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -6,6 +6,7 @@
 
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebDataProtocol.h>
+#import <WebKit/WebDefaultResourceLoadDelegate.h>
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebException.h>
 #import <WebKit/WebFrameLoadDelegate.h>
@@ -187,9 +188,15 @@
         [self _commitIfReady: pageCache];
     } else if (!_private->mainClient) {
         _private->loadingFromPageCache = NO;
-        _private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
+        
         id identifier;
-        identifier = [[_private->webView resourceLoadDelegate] webView:_private->webView identifierForInitialRequest:_private->originalRequest fromDataSource:self];
+        id resourceLoadDelegate = [_private->webView resourceLoadDelegate];
+        if ([resourceLoadDelegate respondsToSelector:@selector(webView:identifierForInitialRequest:fromDataSource:)])
+            identifier = [resourceLoadDelegate webView:_private->webView identifierForInitialRequest:_private->originalRequest fromDataSource:self];
+        else
+            identifier = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:_private->webView identifierForInitialRequest:_private->originalRequest fromDataSource:self];
+            
+        _private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
         [_private->mainClient setIdentifier: identifier];
         [[self webFrame] _addExtraFieldsToRequest:_private->request alwaysFromRequest: NO];
         if (![_private->mainClient loadWithRequest:_private->request]) {
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 0e0a331..86dc71a 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -52,7 +52,7 @@
     @result Returns the request, which may be mutated by the implementor, although typically
     will be request.
 */
-- (NSURLRequest *)webView:(WebView *)sender resource:identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource;
+- (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource;
 
 /*!
     @method webView:resource:didReceiveAuthenticationChallenge:fromDataSource:
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index b3168e6..4dc43c8 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -143,7 +143,7 @@ enum {
 - (void)webView:(WebView *)sender setStatusText:(NSString *)text;
 
 /*!
-    @method webViewStatusText
+    @method webViewStatusText:
     @abstract Get the currently displayed status text.
     @param sender The WebView sending the delegate method.
     @result The status text

-- 
WebKit Debian packaging