[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 b30d5c4ca0704bdf5c85a516ed89836aea9ca43f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 15 17:39:45 2003 +0000

    WebFoundation:
    
            Reviewed by Darin
    
            Name change from WebProtocol to NSURLProtocol.
            No functional changes.
    
            * CacheLoader.subproj/NSURLConnection.m:
            (+[NSURLConnection canHandleRequest:]):
            (-[NSURLConnection _beginLoad]):
            (-[NSURLConnection protocol]):
            * CacheLoader.subproj/NSURLRequest.m:
            (-[NSURLRequest _parametersForReading]):
            (-[NSMutableURLRequest _parametersForWriting]):
            * CacheLoader.subproj/NSURLResponse.m:
            * CacheLoader.subproj/WebCacheManager.m:
            * CacheLoader.subproj/WebProtocolClient.h:
            * Misc.subproj/WebFoundation.h:
            * Misc.subproj/WebNSURLExtras.m:
            (-[NSURL _web_canonicalize]):
            * ProtocolHandlers.subproj/WebAboutProtocol.h:
            * ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
            * ProtocolHandlers.subproj/WebFTPProtocol.h:
            * ProtocolHandlers.subproj/WebFTPProtocol.m:
            * ProtocolHandlers.subproj/WebFileProtocol.h:
            * ProtocolHandlers.subproj/WebHTTPProtocol.h:
            * ProtocolHandlers.subproj/WebHTTPProtocol.m:
            * ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
            * WebFoundation.exp:
            * WebFoundation.pbproj/project.pbxproj:
    
    WebKit:
    
            Reviewed by Darin
    
            Name change from WebProtocol to NSURLProtocol.
            No functional changes.
    
            * WebView.subproj/WebDataProtocol.h:
            * WebView.subproj/WebDataProtocol.m:
            (-[NSURLRequest _webDataRequestParametersForReading]):
            (-[NSURLRequest _webDataRequestParametersForWriting]):
            (+[WebDataProtocol load]):
            * WebView.subproj/WebFrame.m:
    
    WebBrowser:
    
            Reviewed by Darin
    
    	Name change from WebProtocol to NSURLProtocol.
    	No functional changes.
    
            * Debug/DebugUtilities.m:
            (initProtocolHandlers):
            (-[BrowserDocument unregisterAllProtocolHandlers]):
            (-[BrowserDocument reregisterAllProtocolHandlers]):
            (-[BrowserDocument toggleAboutProtocolHandler:]):
            (-[BrowserDocument toggleFileProtocolHandler:]):
            (-[BrowserDocument toggleCFNetworkHTTPProtocolHandler:]):
            (-[BrowserDocument toggleSimpleHTTPProtocolHandler:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e37485b..8f07677 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-15  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        Name change from WebProtocol to NSURLProtocol.
+        No functional changes.
+
+        * WebView.subproj/WebDataProtocol.h:
+        * WebView.subproj/WebDataProtocol.m:
+        (-[NSURLRequest _webDataRequestParametersForReading]):
+        (-[NSURLRequest _webDataRequestParametersForWriting]):
+        (+[WebDataProtocol load]):
+        * WebView.subproj/WebFrame.m:
+
 2003-04-14  Trey Matteson  <trey at apple.com>
 
 	3009051 - Find on Page stops (once) at end of page, should wrap automatically	WebKit
diff --git a/WebKit/WebView.subproj/WebDataProtocol.h b/WebKit/WebView.subproj/WebDataProtocol.h
index b530838..ab444b7 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.h
+++ b/WebKit/WebView.subproj/WebDataProtocol.h
@@ -8,10 +8,10 @@
 #import <Foundation/Foundation.h>
 
 #import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebProtocol.h>
+#import <WebFoundation/NSURLProtocol.h>
 
 
- at interface WebDataProtocol : WebProtocol
+ at interface WebDataProtocol : NSURLProtocol
 {
 }
 @end
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index ebae85d..aeb3e15 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -56,13 +56,13 @@ NSString *WebDataProtocolScheme = @"applewebdata";
 - (WebDataRequestParameters *)_webDataRequestParametersForReading
 {
     Class theClass = [WebDataRequestParameters class];
-    return [WebProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:NO];
+    return [NSURLProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:NO];
 }
 
 - (WebDataRequestParameters *)_webDataRequestParametersForWriting
 {
     Class theClass = [WebDataRequestParameters class];
-    return [WebProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:YES];
+    return [NSURLProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:YES];
 }
 
 - (NSData *)_webDataRequestData
@@ -129,7 +129,7 @@ NSString *WebDataProtocolScheme = @"applewebdata";
 
 + (void)load
 {
-    [WebProtocol registerClass: [self class]];
+    [NSURLProtocol registerClass: [self class]];
 }
 
 + (BOOL)canHandleURL:(NSURL *)theURL
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index f0da6bc..bcc8bdb 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -24,7 +24,6 @@
 
 #import <WebFoundation/NSURLRequest.h>
 #import <WebFoundation/WebNSURLExtras.h>
-#import <WebFoundation/WebProtocol.h>
 
 #import <WebFoundation/WebNSStringExtras.h>
 

-- 
WebKit Debian packaging