Reviewed by Oliver.

        - remove dependency on WebNSURLRequestExtras.h

        * Loader/WebFrameLoader.h:
        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
        (-[WebFrameLoader postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
        (-[WebFrameLoader addExtraFieldsToRequest:mainResource:alwaysFromRequest:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ff1a5ce2b703520779d383d753ba1e452d44fca1..b14b659fc34d89cb1579116d278c1cd810ff4f82 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+
+        - remove dependency on WebNSURLRequestExtras.h
+        
+        * Loader/WebFrameLoader.h:
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+        (-[WebFrameLoader postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+        (-[WebFrameLoader addExtraFieldsToRequest:mainResource:alwaysFromRequest:]):
+
 2006-10-09  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Oliver.

diff --git a/WebKit/Loader/WebFrameLoader.h b/WebKit/Loader/WebFrameLoader.h
index d989a1ea47e2facde3bf3989f843d0638d041776..45cb223bf179adca31ac2252ff721840eca24301 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.h
+++ b/WebKit/Loader/WebFrameLoader.h
@@ -29,16 +29,18 @@
 #import <Cocoa/Cocoa.h>
 
 @class DOMElement;
-@class WebArchive;
 @class WebDocumentLoader;
 @class WebFormState;
 @class WebFrame;
 @class WebFrameBridge;
 @class WebLoader;
 @class WebMainResourceLoader;
+@class WebArchive;
+@protocol WebFrameLoaderClient;
+
+@class WebArchive;
 @class WebPolicyDecisionListener;
 @class WebResource;
-@protocol WebFrameLoaderClient;
 
 typedef enum {
     WebFrameStateProvisional,

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index bd2ab5060341ef92bfccaf59ea02b162c863dee0..a1e0e64007359ea675e40a4244fc002ecc2ae019 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -43,7 +43,6 @@
 #import "WebIconDatabasePrivate.h"
 #import "WebKitErrorsPrivate.h"
 #import "WebNSURLExtras.h"
-#import "WebNSURLRequestExtras.h"
 #import "WebResourcePrivate.h"
 #import "WebViewInternal.h"
 
@@ -579,7 +578,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     BOOL isFormSubmission = (values != nil);
     
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
-    [request setValue:[[client webView] userAgentForURL:[request URL]] forHTTPHeaderField:@"Referer"];
+    [request setValue:referrer forHTTPHeaderField:@"Referer"];
     [self addExtraFieldsToRequest:request mainResource:YES alwaysFromRequest:(event != nil || isFormSubmission)];
     if (_loadType == FrameLoadTypeReload)
         [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
@@ -1865,10 +1864,10 @@ exit:
 
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
     [self addExtraFieldsToRequest:request mainResource:YES alwaysFromRequest:YES];
-    [request _web_setHTTPReferrer:referrer];
+    [request setValue:referrer forHTTPHeaderField:@"Referer"];
     [request setHTTPMethod:@"POST"];
     webSetHTTPBody(request, postData);
-    [request _web_setHTTPContentType:contentType];
+    [request setValue:contentType forHTTPHeaderField:@"Content-Type"];
 
     NSDictionary *action = [self actionInformationForLoadType:FrameLoadTypeStandard isFormSubmission:YES event:event originalURL:URL];
     WebFormState *formState = nil;
@@ -1921,7 +1920,7 @@ exit:
 
 - (void)addExtraFieldsToRequest:(NSMutableURLRequest *)request mainResource:(BOOL)mainResource alwaysFromRequest:(BOOL)f
 {
-    [request _web_setHTTPUserAgent:[[client webView] userAgentForURL:[request URL]]];
+    [request setValue:[[client webView] userAgentForURL:[request URL]] forHTTPHeaderField:@"User-Agent"];
     
     if ([self loadType] == FrameLoadTypeReload)
         [request setValue:@"max-age=0" forHTTPHeaderField:@"Cache-Control"];