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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 41111aa9d989955cccfe14e47cc89727aa08878f
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 31 23:39:37 2004 +0000

    WebKit:
    
            - fixed <rdar://problem/3577917>: API: mechanism for displaying error
            page for failed page load
    
            This was not commented on for a week in macosx-api-reviewers, so it
            has the silent rubber stamp of approval.
    
            Note that it isn't guarded by "Tiger only" availability macros because
            we (probably) want to use it in Panther for Safari. Maybe what we should
            do is guard the API with "Tiger only" macros but add an SPI version
            that Safari uses?
    
            Reviewed by Dave.
    
            * WebView.subproj/WebDataSource.h:
            moved unreachableURL to here
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSource unreachableURL]):
            moved this from private category to main section
    
            * WebView.subproj/WebDataSourcePrivate.h:
            removed unreachableURL from here
    
            * WebView.subproj/WebFrame.h:
            moved loadAlternateHTMLString... to here
            * WebView.subproj/WebFrame.m:
            (-[WebFrame loadAlternateHTMLString:baseURL:forUnreachableURL:]):
            moved this from private category to main section
    
            * WebView.subproj/WebFramePrivate.h:
            removed unreachableURL from here
    
    WebBrowser:
    
            Reviewed by Dave.
    
            * BrowserDocument.m:
            removed #import of WebDataSourcePrivate now that error-page stuff is API
            * BrowserWebController.m:
            ditto
            * BrowserWindowController.m:
            ditto
            * LoadProgressMonitor.m:
            ditto
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2e94872..e71e9d3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,36 @@
+2004-03-31  John Sullivan  <sullivan at apple.com>
+
+        - fixed <rdar://problem/3577917>: API: mechanism for displaying error 
+        page for failed page load
+        
+        This was not commented on for a week in macosx-api-reviewers, so it
+        has the silent rubber stamp of approval.
+        
+        Note that it isn't guarded by "Tiger only" availability macros because
+        we (probably) want to use it in Panther for Safari. Maybe what we should
+        do is guard the API with "Tiger only" macros but add an SPI version
+        that Safari uses?
+
+        Reviewed by Dave.
+
+        * WebView.subproj/WebDataSource.h:
+        moved unreachableURL to here
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource unreachableURL]):
+        moved this from private category to main section
+        
+        * WebView.subproj/WebDataSourcePrivate.h:
+        removed unreachableURL from here
+        
+        * WebView.subproj/WebFrame.h:
+        moved loadAlternateHTMLString... to here
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame loadAlternateHTMLString:baseURL:forUnreachableURL:]):
+        moved this from private category to main section
+        
+        * WebView.subproj/WebFramePrivate.h:
+        removed unreachableURL from here
+
 2004-03-31  Richard Williamson   <rjw at apple.com>
 
 	Changed to reflect NP_runtime.h to npruntime.h.
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 797e158..1ad8259 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -101,4 +101,12 @@
 */
 - (NSString *)pageTitle;
 
+/*!
+    @method unreachableURL
+    @discussion This will be non-nil only for dataSources created by calls to the 
+    WebFrame method loadAlternateHTMLString:baseURL:forUnreachableURL:.
+    @result returns the unreachableURL for which this dataSource is showing alternate content, or nil
+*/
+- (NSURL *)unreachableURL;
+
 @end
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index b9fd507..be18ac8 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -106,11 +106,6 @@
     return _private->subresources;
 }
 
-- (NSURL *)unreachableURL
-{
-    return [_private->originalRequest _webDataRequestUnreachableURL];
-}
-
 - (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL
 {
     if ([URL isFileURL]) {
@@ -1017,4 +1012,9 @@
     return [[self representation] title];
 }
 
+- (NSURL *)unreachableURL
+{
+    return [_private->originalRequest _webDataRequestUnreachableURL];
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 0e85ed3..ec8768f 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -121,14 +121,6 @@
 - (void)addSubresource:(WebResource *)subresource;
 - (void)addSubresources:(NSArray *)subresources;
 
-/*!
-    @method unreachableURL
-    @discussion This will be non-nil only for dataSources created by calls to the 
-    WebFrame method loadAlternateHTMLString:baseURL:forUnreachableURL:.
-    @result returns the unreachableURL for which this dataSource is showing alternate content, or nil
- */
-- (NSURL *)unreachableURL;
-
 // Other private methods
 - (NSDictionary *)_subresourcesDictionary;
 - (NSFileWrapper *)_fileWrapperForURL:(NSURL *)URL;
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index f5615f9..9733650 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -77,6 +77,21 @@
 - (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)URL;
 
 /*!
+    @method loadAlternateHTMLString:baseURL:forUnreachableURL:
+    @abstract Loads a page to display as a substitute for a URL that could not be reached.
+    @discussion This allows clients to display page-loading errors in the webview itself.
+    This is typically called while processing the WebFrameLoadDelegate method
+    -webView:didFailProvisionalLoadWithError:forFrame: or one of the the WebPolicyDelegate methods
+    -webView:decidePolicyForMIMEType:request:frame:decisionListener: or
+    -webView:unableToImplementPolicyWithError:frame:. If it is called from within one of those
+    three delegate methods then the back/forward list will be maintained appropriately.
+    @param string The string to use for the main page of the document.
+    @param baseURL The baseURL to apply to relative URLs within the document.
+    @param unreachableURL The URL for which this page will serve as alternate content.
+*/
+- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
+
+/*!
     @method dataSource
     @discussion Returns the committed data source.  Will return nil if the
     provisional data source hasn't yet been loaded.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 240ae90..47899a7 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -254,11 +254,6 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
 
 @implementation WebFrame (WebPrivate)
 
-- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)URL forUnreachableURL:(NSURL *)unreachableURL
-{
-    [self _loadHTMLString:string baseURL:URL unreachableURL:unreachableURL];
-}
-
 - (void)loadWebArchive:(WebArchive *)webArchive
 {
     WebResource *mainResource = [webArchive mainResource];
@@ -2618,6 +2613,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     [self _loadHTMLString:string baseURL:URL unreachableURL:nil];
 }
 
+- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)URL forUnreachableURL:(NSURL *)unreachableURL
+{
+    [self _loadHTMLString:string baseURL:URL unreachableURL:unreachableURL];
+}
+
 - (void)stopLoading
 {
     // If this method is called from within this method, infinite recursion can occur (3442218). Avoid this.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 986de6e..1efcad6 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -120,21 +120,6 @@ extern NSString *WebPageCacheDocumentViewKey;
 // API Considerations:
 - (void)loadWebArchive:(WebArchive *)webArchive;
 
-/*!
-    @method loadAlternateHTMLString:baseURL:forUnreachableURL:
-    @abstract Loads a page to display as a substitute for a URL that could not be reached.
-    @discussion This allows clients to display page-loading errors in the webview itself.
-    This is typically called while processing the WebFrameLoadDelegate method
-    -webView:didFailProvisionalLoadWithError:forFrame: or one of the the WebPolicyDelegate methods
-    -webView:decidePolicyForMIMEType:request:frame:decisionListener: or
-    -webView:unableToImplementPolicyWithError:frame:. If it is called from within one of those
-    three delegate methods then the back/forward list will be maintained appropriately.
-    @param string The string to use for the main page of the document.
-    @param baseURL The baseURL to apply to relative URLs within the document.
-    @param unreachableURL The URL for which this page will serve as alternate content.
-*/
-- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
-
 // Other private methods
 - (NSURLRequest *)_webDataRequestForData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL;
 - (void)_loadRequest:(NSURLRequest *)request subresources:(NSArray *)subresources;

-- 
WebKit Debian packaging