Reviewed by Anders.

        - remove some unnecessary uses of WebDataProtocol

        * WebView/WebDataSource.mm: Remove the unneeded include.
        * WebView/WebView.mm:
        (+[WebView _canHandleRequest:]): Don't bother to check for unreachable URL here.
        Any request that has one will be an applewebdata: request, which will pass the check anyway.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 55645d2f54428b06a18a6601ac03ba2994b8b0f1..76fd285a4a92a531a5ce995dba7e935cddb80c38 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-10  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Anders.
+        
+        - remove some unnecessary uses of WebDataProtocol
+
+        * WebView/WebDataSource.mm: Remove the unneeded include.
+        * WebView/WebView.mm:
+        (+[WebView _canHandleRequest:]): Don't bother to check for unreachable URL here.
+        Any request that has one will be an applewebdata: request, which will pass the check anyway.
+
 2006-11-10  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Geoff.

diff --git a/WebKit/WebView/WebDataSource.mm b/WebKit/WebView/WebDataSource.mm
index d1c48998781dbf1741d5b1ce92ab8f9eb1a39e1e..a961d5b9623d8a2e32afe207d68a7fd2b82346ab 100644 (file)
--- a/WebKit/WebView/WebDataSource.mm
+++ b/WebKit/WebView/WebDataSource.mm
@@ -52,7 +52,6 @@
 #import <JavaScriptCore/Assertions.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/KURL.h>
-#import <WebCore/WebDataProtocol.h>
 #import <WebKit/DOMHTML.h>
 #import <WebKit/DOMPrivate.h>
 #import <WebKitSystemInterface.h>

diff --git a/WebKit/WebView/WebView.mm b/WebKit/WebView/WebView.mm
index ba2ba5b55ba35d63acbd9d353ad42c7730fb4e0e..5927b20c96c827a8c1ab45bed2f1713d0e1a50d6 100644 (file)
--- a/WebKit/WebView/WebView.mm
+++ b/WebKit/WebView/WebView.mm
@@ -101,7 +101,6 @@
 #import <WebCore/WebCoreSettings.h>
 #import <WebCore/WebCoreTextRenderer.h>
 #import <WebCore/WebCoreView.h>
-#import <WebCore/WebDataProtocol.h>
 #import <WebKit/DOM.h>
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMPrivate.h>
@@ -1045,11 +1044,6 @@ WebResourceDelegateImplementationCache WebViewGetResourceLoadDelegateImplementat
     if ([NSURLConnection canHandleRequest:request]) {
         return YES;
     }
-    
-    // We're always willing to load alternate content for unreachable URLs
-    if ([request _webDataRequestUnreachableURL]) {
-        return YES;
-    }
 
     return [self _representationExistsForURLScheme:[[request URL] scheme]];
 }