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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit e76cd78cb3394d4404e1c068b12b98994d4568b5
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 25 15:32:20 2002 +0000

    WebFoundation:
    
    	Removed this method from WebResourceHandle:
    
    	+(BOOL)canInitWithURL:(NSURL *)theURL;
    
    	replaced with:
    
    	+(BOOL)canInitWithRequest:(WebResourceRequest *)request;
    
    	Also added a convenience method to WebResourceRequest that
    	allocates, inits, and returns an autoreleased instance.
    
            * CacheLoader.subproj/WebResourceHandle.h:
            * CacheLoader.subproj/WebResourceHandle.m:
            (+[WebResourceHandle canInitWithRequest:])
            * CacheLoader.subproj/WebResourceRequest.h:
            * CacheLoader.subproj/WebResourceRequest.m:
            (+[WebResourceRequest requestWithURL:])
    
    WebKit:
    
            Removed this method from WebResourceHandle:
    
            +(BOOL)canInitWithURL:(NSURL *)theURL;
    
            replaced with:
    
            +(BOOL)canInitWithRequest:(WebResourceRequest *)request;
    
    	Callers have been updated to reflect the change.
    
            * WebView.subproj/WebDefaultPolicyDelegate.m:
            (+[WebDefaultPolicyDelegate defaultURLPolicyForURL:])
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _shouldShowURL:])
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2162 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a72f1e5..c0d48ce 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,22 @@
 2002-09-25  Ken Kocienda  <kocienda at apple.com>
 
+        Removed this method from WebResourceHandle:
+
+        +(BOOL)canInitWithURL:(NSURL *)theURL;
+
+        replaced with:
+
+        +(BOOL)canInitWithRequest:(WebResourceRequest *)request;
+
+	Callers have been updated to reflect the change.
+
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (+[WebDefaultPolicyDelegate defaultURLPolicyForURL:])
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _shouldShowURL:])
+
+2002-09-25  Ken Kocienda  <kocienda at apple.com>
+
         More moves to the new WebResourceHandleDelegate API.   
 
         This change moves all WebResourceHandleDelegate implementors to:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a72f1e5..c0d48ce 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
 2002-09-25  Ken Kocienda  <kocienda at apple.com>
 
+        Removed this method from WebResourceHandle:
+
+        +(BOOL)canInitWithURL:(NSURL *)theURL;
+
+        replaced with:
+
+        +(BOOL)canInitWithRequest:(WebResourceRequest *)request;
+
+	Callers have been updated to reflect the change.
+
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (+[WebDefaultPolicyDelegate defaultURLPolicyForURL:])
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _shouldShowURL:])
+
+2002-09-25  Ken Kocienda  <kocienda at apple.com>
+
         More moves to the new WebResourceHandleDelegate API.   
 
         This change moves all WebResourceHandleDelegate implementors to:
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 62ffc46..51c391f 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -8,13 +8,14 @@
 #import <WebKit/WebDefaultPolicyDelegate.h>
 #import <WebKit/WebFrame.h>
 #import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
 
 
 @implementation WebDefaultPolicyDelegate
 
 + (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL
 {
-    if([WebResourceHandle canInitWithURL:URL]){
+    if([WebResourceHandle canInitWithRequest:[WebResourceRequest requestWithURL:URL]]){
         return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyUseContentPolicy];
     }else{
         return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyOpenExternally];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index c1a36a5..9fda926 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -581,7 +581,7 @@ static const char * const stateNames[] = {
         case WebURLPolicyUseContentPolicy:
             // handle non-file case first because it's short and sweet
             if (![URL isFileURL]) {
-                if (![WebResourceHandle canInitWithURL:URL]) {
+                if (![WebResourceHandle canInitWithRequest:[WebResourceRequest requestWithURL:URL]]) {
                     [self handleUnimplementablePolicy:URLPolicy errorCode:WebErrorCannotShowURL forURL:URL];
                     return NO;
                 }

-- 
WebKit Debian packaging