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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 0c58a4893bc6a35e658e816a73de41b9b030b917
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 6 02:47:39 2003 +0000

            Reviewed by Richard.
    
    	Fix build by separating mutating data protocol methods into
    	category on NSMutableURLRequest. Also, formatting fixes.
    
            * WebView.subproj/WebDataProtocol.h:
            * WebView.subproj/WebDataProtocol.m:
            (+[NSURLRequest _webDataRequestURLForData:]):
            (-[NSURLRequest _webDataRequestData]):
            (-[NSURLRequest _webDataRequestEncoding]):
            (-[NSURLRequest _webDataRequestMIMEType]):
            (-[NSURLRequest _webDataRequestBaseURL]):
            (-[NSURLRequest _webDataRequestExternalRequest]):
            (-[NSMutableURLRequest _webDataRequestSetData:]):
            * WebView.subproj/WebFrame.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e83256c..2eacc10 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2003-05-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	Fix build by separating mutating data protocol methods into
+	category on NSMutableURLRequest. Also, formatting fixes.
+
+        * WebView.subproj/WebDataProtocol.h:
+        * WebView.subproj/WebDataProtocol.m:
+        (+[NSURLRequest _webDataRequestURLForData:]):
+        (-[NSURLRequest _webDataRequestData]):
+        (-[NSURLRequest _webDataRequestEncoding]):
+        (-[NSURLRequest _webDataRequestMIMEType]):
+        (-[NSURLRequest _webDataRequestBaseURL]):
+        (-[NSURLRequest _webDataRequestExternalRequest]):
+        (-[NSMutableURLRequest _webDataRequestSetData:]):
+        * WebView.subproj/WebFrame.m:
+
 2003-05-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebKit/WebView.subproj/WebDataProtocol.h b/WebKit/WebView.subproj/WebDataProtocol.h
index 2426cf0..9cb82d1 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.h
+++ b/WebKit/WebView.subproj/WebDataProtocol.h
@@ -19,13 +19,17 @@
 
 @interface NSURLRequest (WebDataRequest)
 + (NSURL *)_webDataRequestURLForData:(NSData *)data;
+- (NSURL *)_webDataRequestBaseURL;
 - (NSData *)_webDataRequestData;
-- (void)_webDataRequestSetData:(NSData *)data;
 - (NSString *)_webDataRequestEncoding;
-- (void)_webDataRequestSetEncoding:(NSString *)encoding;
 - (NSString *)_webDataRequestMIMEType;
+- (NSMutableURLRequest *)_webDataRequestExternalRequest;
+ at end
+
+ at interface NSMutableURLRequest (WebDataRequest)
+- (void)_webDataRequestSetData:(NSData *)data;
+- (void)_webDataRequestSetEncoding:(NSString *)encoding;
 - (void)_webDataRequestSetMIMEType:(NSString *)MIMEType;
-- (NSURL *)_webDataRequestBaseURL;
 - (void)_webDataRequestSetBaseURL:(NSURL *)baseURL;
-- (NSMutableURLRequest *)_webDataRequestExternalRequest;
 @end
+
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index c68cf77..a8a9249 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -48,7 +48,7 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
 
 @implementation NSURLRequest (WebDataRequest)
 
-+ (NSURL *)_webDataRequestURLForData: (NSData *)data
++ (NSURL *)_webDataRequestURLForData:(NSData *)data
 {
     static BOOL registered;
     
@@ -61,7 +61,7 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     
     // The URL we generate is meaningless.  The only interesting properties of the URL
     // are it's scheme and that they be unique for the lifespan of the application.
-    NSURL *fakeURL = [NSURL URLWithString: [NSString stringWithFormat: @"%@://%p", WebDataProtocolScheme, counter++, 0]];
+    NSURL *fakeURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%p", WebDataProtocolScheme, counter++, 0]];
     return fakeURL;
 }
 
@@ -70,6 +70,50 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     return [NSURLProtocol propertyForKey:WebDataRequestPropertyKey inRequest:self];
 }
 
+- (NSData *)_webDataRequestData
+{
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->data : nil;
+}
+
+- (NSString *)_webDataRequestEncoding
+{
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->encoding : nil;
+}
+
+- (NSString *)_webDataRequestMIMEType
+{
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->MIMEType : nil;
+}
+
+- (NSURL *)_webDataRequestBaseURL
+{
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->baseURL : nil;
+}
+
+- (NSMutableURLRequest *)_webDataRequestExternalRequest
+{
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    NSMutableURLRequest *newRequest = nil;
+    
+    if (parameters){
+        newRequest = [[self mutableCopyWithZone:[self zone]] autorelease];
+        NSURL *baseURL = [self _webDataRequestBaseURL];
+        if (baseURL)
+            [newRequest setURL:baseURL]; 
+        else
+            [newRequest setURL:[NSURL URLWithString:@"about:blank"]];
+    } 
+    return newRequest;
+}
+
+ at end
+
+ at implementation NSMutableURLRequest (WebDataRequest)
+
 - (WebDataRequestParameters *)_webDataRequestParametersForWriting
 {
     WebDataRequestParameters *result = [NSURLProtocol propertyForKey:WebDataRequestPropertyKey inRequest:self];
@@ -80,25 +124,13 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     return result;
 }
 
-- (NSData *)_webDataRequestData
-{
-    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
-    return parameters ? parameters->data : nil;
-}
-
-- (void)_webDataRequestSetData: (NSData *)data
+- (void)_webDataRequestSetData:(NSData *)data
 {
     WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
     [parameters->data release];
     parameters->data = [data retain];
 }
 
-- (NSString *)_webDataRequestEncoding
-{
-    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
-    return parameters ? parameters->encoding: nil;
-}
-
 - (void)_webDataRequestSetEncoding:(NSString *)encoding
 {
     WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
@@ -106,12 +138,6 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     parameters->encoding = [encoding retain];
 }
 
-- (NSString *)_webDataRequestMIMEType
-{
-    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
-    return parameters ? parameters->MIMEType: nil;
-}
-
 - (void)_webDataRequestSetMIMEType:(NSString *)type
 {
     WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
@@ -119,12 +145,6 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     parameters->MIMEType = [type retain];
 }
 
-- (NSURL *)_webDataRequestBaseURL
-{
-    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
-    return parameters ? parameters->baseURL : nil;
-}
-
 - (void)_webDataRequestSetBaseURL:(NSURL *)baseURL
 {
     WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
@@ -132,24 +152,9 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     parameters->baseURL = [baseURL retain];
 }
 
-- (NSMutableURLRequest *)_webDataRequestExternalRequest
-{
-    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
-    NSMutableURLRequest *newRequest = nil;
-    
-    if (parameters){
-        newRequest = [[self mutableCopyWithZone: [self zone]] autorelease];
-        NSURL *baseURL = [self _webDataRequestBaseURL];
-        if (baseURL)
-            [newRequest setURL: baseURL]; 
-        else
-            [newRequest setURL: [NSURL URLWithString: @"about:blank"]];
-    } 
-    return newRequest;
-}
+ at end
 
 
- at end
 
 // Implement the required methods for the concrete subclass of WebProtocolHandler
 // that will handle our custom protocol.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 724c3a1..850cd98 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -114,7 +114,7 @@
 - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName: (NSString *)encodingName baseURL:(NSURL *)URL;
 {
     NSURL *fakeURL = [NSURLRequest _webDataRequestURLForData: data];
-    NSURLRequest *request = [[[NSURLRequest alloc] initWithURL: fakeURL] autorelease];
+    NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] initWithURL: fakeURL] autorelease];
     [request _webDataRequestSetData:data];
     [request _webDataRequestSetEncoding:encodingName];
     [request _webDataRequestSetBaseURL:URL];

-- 
WebKit Debian packaging