[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 443fe641437aaca2cd9532a319831e2f2922dc85
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 4 05:43:04 2003 +0000

            Reviewed by Richard and Don.
    
            * WebView.subproj/WebDataProtocol.m:
    	(-[NSURLRequest _webDataRequestParametersForWriting]): Renamed
    	from _webDataRequestParameters.
            (-[NSURLRequest _webDataRequestParametersForReading]): Like the
    	above, but make sure nto to create the part if it does not exist.
            (-[NSURLRequest _webDataRequestData]): Use _webDataRequestParametersForReading.
            (-[NSURLRequest _webDataRequestEncoding]): Likewise.
            (-[NSURLRequest _webDataRequestBaseURL]): Likewise.
            (-[NSURLRequest _webDataRequestSetData:]):Use _webDataRequestParametersForWriting.
            (-[NSURLRequest _webDataRequestSetEncoding:]): Likewise.
            (-[NSURLRequest _webDataRequestSetBaseURL:]): Likewise.
            (-[NSURLRequest _webDataRequestExternalRequest]): Use _webDataRequestParametersForReading.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 52dec21..25feb43 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-04-03  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard and Don.
+
+        * WebView.subproj/WebDataProtocol.m:
+	(-[NSURLRequest _webDataRequestParametersForWriting]): Renamed
+	from _webDataRequestParameters.
+        (-[NSURLRequest _webDataRequestParametersForReading]): Like the
+	above, but make sure nto to create the part if it does not exist.
+        (-[NSURLRequest _webDataRequestData]): Use _webDataRequestParametersForReading.
+        (-[NSURLRequest _webDataRequestEncoding]): Likewise.
+        (-[NSURLRequest _webDataRequestBaseURL]): Likewise.
+        (-[NSURLRequest _webDataRequestSetData:]):Use _webDataRequestParametersForWriting.
+        (-[NSURLRequest _webDataRequestSetEncoding:]): Likewise.
+        (-[NSURLRequest _webDataRequestSetBaseURL:]): Likewise.
+        (-[NSURLRequest _webDataRequestExternalRequest]): Use _webDataRequestParametersForReading.
+
 2003-04-03  Richard Williamson   <rjw at apple.com>
 
         Tweaks to minimize access to the parts of a WebDataRequest
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 7371984..ebae85d 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -53,7 +53,13 @@ NSString *WebDataProtocolScheme = @"applewebdata";
     return fakeURL;
 }
 
-- (WebDataRequestParameters *)_webDataRequestParameters
+- (WebDataRequestParameters *)_webDataRequestParametersForReading
+{
+    Class theClass = [WebDataRequestParameters class];
+    return [WebProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:NO];
+}
+
+- (WebDataRequestParameters *)_webDataRequestParametersForWriting
 {
     Class theClass = [WebDataRequestParameters class];
     return [WebProtocol partOfRequest:self withClass:theClass createIfDoesNotExist:YES];
@@ -61,46 +67,46 @@ NSString *WebDataProtocolScheme = @"applewebdata";
 
 - (NSData *)_webDataRequestData
 {
-    WebDataRequestParameters *parameters = [self _webDataRequestParameters];
-    return parameters->data;
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->data : nil;
 }
 
 - (void)_webDataRequestSetData: (NSData *)data
 {
-    WebDataRequestParameters *parameters = [self _webDataRequestParameters];
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
     [parameters->data release];
     parameters->data = [data retain];
 }
 
 - (NSString *)_webDataRequestEncoding
 {
-    WebDataRequestParameters *parameters = [self _webDataRequestParameters];
-    return parameters->encoding;
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->encoding: nil;
 }
 
 - (void)_webDataRequestSetEncoding:(NSString *)encoding
 {
-    WebDataRequestParameters *parameters = [self _webDataRequestParameters];
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
     [parameters->encoding release];
     parameters->encoding = [encoding retain];
 }
 
 - (NSURL *)_webDataRequestBaseURL
 {
-    WebDataRequestParameters *parameters = [self _webDataRequestParameters];
-    return parameters->baseURL;
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
+    return parameters ? parameters->baseURL : nil;
 }
 
 - (void)_webDataRequestSetBaseURL:(NSURL *)baseURL
 {
-    WebDataRequestParameters *parameters = [self _webDataRequestParameters];
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForWriting];
     [parameters->baseURL release];
     parameters->baseURL = [baseURL retain];
 }
 
 - (NSMutableURLRequest *)_webDataRequestExternalRequest
 {
-    WebDataRequestParameters *parameters = [WebProtocol partOfRequest:self withClass:[WebDataRequestParameters class] createIfDoesNotExist:NO];
+    WebDataRequestParameters *parameters = [self _webDataRequestParametersForReading];
     NSMutableURLRequest *newRequest = nil;
     
     if (parameters){

-- 
WebKit Debian packaging