Reviewed by Adam.

        - fixed the following bugs:

        http://bugs.webkit.org/show_bug.cgi?id=11136
        "REGRESSION: Safari snippet editor doesn't work"
        http://bugs.webkit.org/show_bug.cgi?id=11140
        "REGRESSION: view source window blank"
        http://bugs.webkit.org/show_bug.cgi?id=11146
        "REGRESSION: Instead of showing the error page, Safari opens its Resources folder in the Finder"

        Possibly more.

        * Loader/WebDocumentLoadState.h:
        * Loader/WebDocumentLoadState.m:
        (-[WebDocumentLoadState actualRequest]): New method.
        * WebView/WebDataSource.m:
        (-[WebDataSource _startLoading]): We need to make sure not to start loading the main
        resource with the fake external request for an applewebdata: request.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1538884525cfb5bd5ffbef6d90d5d58040346fab..572f4eca6fa53d85ed2ee7a9c558b5f6901cdf86 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2006-10-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adam.
+        
+        - fixed the following bugs:
+        
+        http://bugs.webkit.org/show_bug.cgi?id=11136
+        "REGRESSION: Safari snippet editor doesn't work"
+        http://bugs.webkit.org/show_bug.cgi?id=11140
+        "REGRESSION: view source window blank"
+        http://bugs.webkit.org/show_bug.cgi?id=11146
+        "REGRESSION: Instead of showing the error page, Safari opens its Resources folder in the Finder"
+        
+        Possibly more.
+
+        * Loader/WebDocumentLoadState.h:
+        * Loader/WebDocumentLoadState.m:
+        (-[WebDocumentLoadState actualRequest]): New method.
+        * WebView/WebDataSource.m:
+        (-[WebDataSource _startLoading]): We need to make sure not to start loading the main
+        resource with the fake external request for an applewebdata: request.
+
 2006-10-05  Adele Peterson  <adele@apple.com>
 
         Reviewed by the letter 'B'.

diff --git a/WebKit/Loader/WebDocumentLoadState.h b/WebKit/Loader/WebDocumentLoadState.h
index 77a7c88859f8a62f9893ec28c8377971a80a3f9d..e69ee2c0676774d3a9138e5547a996f93d458ff2 100644 (file)
--- a/WebKit/Loader/WebDocumentLoadState.h
+++ b/WebKit/Loader/WebDocumentLoadState.h
@@ -71,6 +71,7 @@
 - (NSURLRequest *)originalRequestCopy;
 - (NSMutableURLRequest *)request;
 - (void)setRequest:(NSURLRequest *)request;
+- (NSMutableURLRequest *)actualRequest;
 - (void)replaceRequestURLForAnchorScrollWithURL:(NSURL *)URL;
 - (BOOL)isStopping;
 - (void)stopLoading;

diff --git a/WebKit/Loader/WebDocumentLoadState.m b/WebKit/Loader/WebDocumentLoadState.m
index 52169617786a0c44bd8472489a8b9146b936d8cc..80a5cda42c52ea3b856ff1275466c928813a8489 100644 (file)
--- a/WebKit/Loader/WebDocumentLoadState.m
+++ b/WebKit/Loader/WebDocumentLoadState.m
@@ -106,6 +106,11 @@
     return clientRequest;
 }
 
+- (NSMutableURLRequest *)actualRequest
+{
+    return request;
+}
+
 - (void)replaceRequestURLForAnchorScrollWithURL:(NSURL *)URL
 {
     // assert that URLs differ only by fragment ID

diff --git a/WebKit/WebView/WebDataSource.m b/WebKit/WebView/WebDataSource.m
index 4074461c2cafb7fba39ead2fec5677982294a839..98a3539434f1691d14ab4b3c7ce71a4ae9206ced 100644 (file)
--- a/WebKit/WebView/WebDataSource.m
+++ b/WebKit/WebView/WebDataSource.m
@@ -440,7 +440,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
     else
         identifier = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:[self _webView] identifierForInitialRequest:[_private->loadState originalRequest] fromDataSource:self];
     
-    if (![[_private->loadState frameLoader] startLoadingMainResourceWithRequest:[_private->loadState request] identifier:identifier])
+    if (![[_private->loadState frameLoader] startLoadingMainResourceWithRequest:[_private->loadState actualRequest] identifier:identifier])
         [_private->loadState updateLoading];
 }