[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 2fb08f623ec896f90da6e74edf55bc19f312ffa3
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 28 18:42:43 2003 +0000

    WebFoundation:
    
            Reviewed by Trey
    
            NSURLConnection class method changed name:
                canInitWithRequest: -> canHandleRequest:
    
            Moved to API-approved model for synchronous loads.
    	Removed some files made obsolete by this change.
    
            * CacheLoader.subproj/NSURLConnection.h:
            * CacheLoader.subproj/NSURLConnection.m:
            (+[NSURLConnection canHandleRequest:]):
            * CacheLoader.subproj/WebSynchronousDelegate.h:
            * CacheLoader.subproj/WebSynchronousDelegate.m:
            (-[WebSynchronousDelegate run:]):
            (-[WebSynchronousDelegate resourceData]):
            * CacheLoader.subproj/WebSynchronousResult.h: Removed.
            * CacheLoader.subproj/WebSynchronousResult.m: Removed.
            * CacheLoader.subproj/WebSynchronousResultPrivate.h: Removed.
            * ChangeLog:
            * Misc.subproj/WebFoundation.h:
            * WebFoundation.exp:
            * WebFoundation.pbproj/project.pbxproj:
    
    WebKit:
    
            Reviewed by Trey
    
            NSURLConnection class method changed name:
                canInitWithRequest: -> canHandleRequest:
    
            Moved to API-approved model for synchronous loads.
            Removed fixme I put in yesterday having to do with
    	reposting form data. The feature is fully functional
    	again.
    
            * Plugins.subproj/WebNetscapePluginStream.m:
            (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
            * WebView.subproj/WebDefaultContextMenuDelegate.m:
            (-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
            * WebView.subproj/WebDefaultPolicyDelegate.m:
            (-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadItem:fromItem:withLoadType:]):
            (-[WebFrame _continueAfterNavigationPolicy:]):
    
    WebBrowser:
    
            Reviewed by Trey
    
    	NSURLConnection class method changed name:
    	    canInitWithRequest: -> canHandleRequest:
    
            * BrowserWebController.m:
            (-[BrowserWebController decidePolicyForAction:andRequest:inFrame:newFrameName:decisionListener:]):
            * ContextMenuHandler.m:
            (-[ContextMenuHandler webView:contextMenuItemsForElement:defaultMenuItems:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 53bb79d..c5ff2a3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,27 @@
 2003-03-28  Ken Kocienda  <kocienda at apple.com>
 
+        Reviewed by Trey
+
+        NSURLConnection class method changed name:
+            canInitWithRequest: -> canHandleRequest:
+
+        Moved to API-approved model for synchronous loads.
+        Removed fixme I put in yesterday having to do with
+	reposting form data. The feature is fully functional
+	again.
+
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultContextMenuDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (-[WebDefaultPolicyDelegate webView:decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:]):
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadItem:fromItem:withLoadType:]):
+        (-[WebFrame _continueAfterNavigationPolicy:]):
+
+2003-03-28  Ken Kocienda  <kocienda at apple.com>
+
         Reviewed by Darin
 
         Cosmetic change. Instances of 'resource' as a local variable
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 9118ecd..eddb643 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -21,7 +21,7 @@
 {
     [super init];
 
-    if(!theRequest || !thePluginPointer || ![NSURLConnection canInitWithRequest:theRequest]){
+    if(!theRequest || !thePluginPointer || ![NSURLConnection canHandleRequest:theRequest]){
         return nil;
     }
 
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index cd413b3..6cfb10e 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -106,7 +106,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
     linkURL = [element objectForKey:WebElementLinkURLKey];
 
     if (linkURL) {
-        if([NSURLConnection canInitWithRequest:[NSURLRequest requestWithURL:linkURL]]){
+        if([NSURLConnection canHandleRequest:[NSURLRequest requestWithURL:linkURL]]){
             [menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenLinkInNewWindow]];
             [menuItems addObject:[self menuItemWithTag:WebMenuItemTagDownloadLinkToDisk]];
             [menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopyLinkToClipboard]];
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 4951bbd..9934c67 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -62,7 +62,7 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
 				inFrame:(WebFrame *)frame
 		       decisionListener:(WebPolicyDecisionListener *)listener
 {
-    if ([NSURLConnection canInitWithRequest:request]) {
+    if ([NSURLConnection canHandleRequest:request]) {
 	[listener use];
     } else {
 	// A file URL shouldn't fall through to here, but if it did,
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 0c8afc6..8e40454 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -35,8 +35,6 @@
 #import <WebFoundation/NSURLRequestPrivate.h>
 #import <WebFoundation/NSURLResponse.h>
 
-#import <WebFoundation/WebSynchronousResult.h>
-
 #import <objc/objc-runtime.h>
 
 #ifndef NDEBUG
@@ -1104,9 +1102,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                 // have the item vanish when we try to use it in the ensuing nav.  This should be
                 // extremely rare, but in that case the user will get an error on the navigation.
                 [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
-                /* WebFoundation API FIXME: fix when new synchronous code is implemented */
-                //WebSynchronousResult *result = [WebResource sendSynchronousRequest:request];
-                if (NO) { 
+                NSURLResponse *synchResponse = nil;
+                [NSURLConnection sendSynchronousRequest:request returningResponse:&synchResponse];
+                if (synchResponse == nil) { 
                     // Not in WF cache
                     [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
                     action = [self _actionInformationForNavigationType:WebNavigationTypeFormResubmitted event:nil originalURL:itemURL];
@@ -1430,7 +1428,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         [[self webView] _downloadURL:[request URL]];
         break;
     case WebPolicyUse:
-        if (![NSURLConnection canInitWithRequest:request]) {
+        if (![NSURLConnection canHandleRequest:request]) {
             [self _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowURL forURL:[request URL]];
         } else {
             shouldContinue = YES;

-- 
WebKit Debian packaging