- remove use of NSURLRequest and NSUserDefaults SPI
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem _setFormInfoFromRequest:]):
* Misc.subproj/WebNSURLRequestExtras.h: Added.
* Misc.subproj/WebNSURLRequestExtras.m: Added.
(-[NSURLRequest _web_HTTPReferrer]):
(-[NSURLRequest _web_HTTPContentType]):
(-[NSMutableURLRequest _web_setHTTPContentType:]):
(-[NSMutableURLRequest _web_setHTTPReferrer:]):
(-[NSMutableURLRequest _web_setHTTPUserAgent:]):
* Misc.subproj/WebNSUserDefaultsExtras.h: Added.
* Misc.subproj/WebNSUserDefaultsExtras.m: Added.
(-[NSString _webkit_HTTPStyleLanguageCode]):
(makeLock):
(+[NSUserDefaults _ensureAndLockPreferredLanguageLock]):
(+[NSUserDefaults _webkit_defaultsDidChange]):
(addDefaultsChangeObserver):
(+[NSUserDefaults _webkit_addDefaultsChangeObserver]):
(+[NSUserDefaults _webkit_preferredLanguageCode]):
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView requestWithURLCString:]):
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
(-[WebNetscapePluginEmbeddedView didStart]):
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge createWindowWithURL:frameName:]):
(-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
(-[WebBridge incomingReferrer]):
(-[WebBridge createModalDialogWithURL:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withRequest:customHeaders:referrer:forDataSource:]):
* WebCoreSupport.subproj/WebViewFactory.m:
(-[WebViewFactory defaultLanguageCode]):
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate willSendRequest:redirectResponse:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultUIDelegate openNewWindowWithURL:element:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame _loadItem:withLoadType:]):
(-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
(-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
(-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebView.m:
(-[WebView _cachedResponseForURL:]):
(-[WebView userAgentForURL:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9263
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2005-06-02 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by Adele.
+
+ - remove use of NSURLRequest and NSUserDefaults SPI
+
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem _setFormInfoFromRequest:]):
+ * Misc.subproj/WebNSURLRequestExtras.h: Added.
+ * Misc.subproj/WebNSURLRequestExtras.m: Added.
+ (-[NSURLRequest _web_HTTPReferrer]):
+ (-[NSURLRequest _web_HTTPContentType]):
+ (-[NSMutableURLRequest _web_setHTTPContentType:]):
+ (-[NSMutableURLRequest _web_setHTTPReferrer:]):
+ (-[NSMutableURLRequest _web_setHTTPUserAgent:]):
+ * Misc.subproj/WebNSUserDefaultsExtras.h: Added.
+ * Misc.subproj/WebNSUserDefaultsExtras.m: Added.
+ (-[NSString _webkit_HTTPStyleLanguageCode]):
+ (makeLock):
+ (+[NSUserDefaults _ensureAndLockPreferredLanguageLock]):
+ (+[NSUserDefaults _webkit_defaultsDidChange]):
+ (addDefaultsChangeObserver):
+ (+[NSUserDefaults _webkit_addDefaultsChangeObserver]):
+ (+[NSUserDefaults _webkit_preferredLanguageCode]):
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView requestWithURLCString:]):
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ (-[WebNetscapePluginEmbeddedView didStart]):
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:sendNotification:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge createWindowWithURL:frameName:]):
+ (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
+ (-[WebBridge incomingReferrer]):
+ (-[WebBridge createModalDialogWithURL:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withRequest:customHeaders:referrer:forDataSource:]):
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory defaultLanguageCode]):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate willSendRequest:redirectResponse:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultUIDelegate openNewWindowWithURL:element:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame _loadItem:withLoadType:]):
+ (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
+ (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+ (-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebView.m:
+ (-[WebView _cachedResponseForURL:]):
+ (-[WebView userAgentForURL:]):
+
2005-06-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Don.
#import <WebKit/WebNSDictionaryExtras.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginController.h>
-#import <Foundation/NSURLRequestPrivate.h>
-
#import <CoreGraphics/CoreGraphicsPrivate.h>
// Private keys used in the WebHistoryItem's dictionary representation.
[body release];
}
- newContentType = [[request HTTPContentType] copy];
- newReferrer = [[request HTTPReferrer] copy];
+ newContentType = [[request _web_HTTPContentType] copy];
+ newReferrer = [[request _web_HTTPReferrer] copy];
}
[_private->formData release];
--- /dev/null
+/*
+ WebNSURLRequestExtras.h
+ Private (SPI) header
+ Copyright 2003, Apple, Inc. All rights reserved.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface NSURLRequest (WebNSURLRequestExtras)
+
+- (NSString *)_web_HTTPReferrer;
+- (NSString *)_web_HTTPContentType;
+
+@end
+
+@interface NSMutableURLRequest (WebNSURLRequestExtras)
+
+- (void)_web_setHTTPContentType:(NSString *)contentType;
+- (void)_web_setHTTPReferrer:(NSString *)theReferrer;
+- (void)_web_setHTTPUserAgent:(NSString *)theUserAgent;
+
+@end
--- /dev/null
+/*
+ WebNSURLRequestExtras.m
+ Private (SPI) header
+ Copyright 2005, Apple, Inc. All rights reserved.
+ */
+
+#import <WebKit/WebNSURLRequestExtras.h>
+
+#import <WebKit/WebAssertions.h>
+#import <WebKit/WebNSURLExtras.h>
+
+#define WebContentType (@"Content-Type")
+#define WebUserAgent (@"User-Agent")
+#define WebReferrer (@"Referer")
+
+@implementation NSURLRequest (WebNSURLRequestExtras)
+
+- (NSString *)_web_HTTPReferrer
+{
+ return [self valueForHTTPHeaderField:WebReferrer];
+}
+
+- (NSString *)_web_HTTPContentType
+{
+ return [self valueForHTTPHeaderField:WebContentType];
+}
+
+@end
+
+
+@implementation NSMutableURLRequest (WebNSURLRequestExtras)
+
+- (void)_web_setHTTPContentType:(NSString *)contentType
+{
+ [self setValue:contentType forHTTPHeaderField:WebContentType];
+}
+
+- (void)_web_setHTTPReferrer:(NSString *)theReferrer
+{
+ // Do not set the referrer to a string that refers to a file URL.
+ // That is a potential security hole.
+ if ([theReferrer _webkit_isFileURL]) {
+ return;
+ }
+
+ // Don't allow empty Referer: headers; some servers refuse them
+ if( [theReferrer length] == 0 )
+ theReferrer = nil;
+
+ [self setValue:theReferrer forHTTPHeaderField:WebReferrer];
+}
+
+- (void)_web_setHTTPUserAgent:(NSString *)theUserAgent
+{
+ [self setValue:theUserAgent forHTTPHeaderField:WebUserAgent];
+}
+
+@end
+
--- /dev/null
+/*
+ WebNSUserDefaultsExtras.h
+ Private (SPI) header
+ Copyright 2003, Apple, Inc. All rights reserved.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface NSUserDefaults (WebNSUserDefaultsExtras)
++ (NSString *)_webkit_preferredLanguageCode;
+@end
--- /dev/null
+/*
+ WebNSUserDefaultsExtras.m
+ Private (SPI) header
+ Copyright 2005, Apple, Inc. All rights reserved.
+ */
+
+#import <WebKit/WebNSUserDefaultsExtras.h>
+
+#import <CoreFoundation/CFBundlePriv.h>
+#import <WebKit/WebAssertions.h>
+
+@implementation NSString (WebNSUserDefaultsPrivate)
+
+- (NSString *)_webkit_HTTPStyleLanguageCode
+{
+ // Look up the language code using CFBundle.
+ NSString *languageCode = self;
+ SInt32 languageCodeNumber, regionCodeNumber;
+ if (CFBundleGetLocalizationInfoForLocalization((CFStringRef)self, &languageCodeNumber, ®ionCodeNumber, NULL, NULL)) {
+ CFStringRef shortName = CFMakeCollectable(CFBundleCopyLocalizationForLocalizationInfo(languageCodeNumber, regionCodeNumber, -1, 0xFFFF));
+ if (shortName) {
+ languageCode = [(id)shortName autorelease];
+ }
+ }
+
+ // Make the string lowercase.
+ NSString *lowercaseLanguageCode = [languageCode lowercaseString];
+
+ // Turn a '_' into a '-' if it appears after a 2-letter language code.
+ if ([lowercaseLanguageCode length] < 3 || [lowercaseLanguageCode characterAtIndex:2] != '_') {
+ return lowercaseLanguageCode;
+ }
+ NSMutableString *result = [lowercaseLanguageCode mutableCopy];
+ [result replaceCharactersInRange:NSMakeRange(2, 1) withString:@"-"];
+ return [result autorelease];
+}
+
+@end
+
+@implementation NSUserDefaults (WebNSUserDefaultsExtras)
+
+static NSString *preferredLanguageCode = nil;
+static NSLock *preferredLanguageLock = nil;
+static pthread_once_t preferredLanguageLockOnce = PTHREAD_ONCE_INIT;
+static pthread_once_t addDefaultsChangeObserverOnce = PTHREAD_ONCE_INIT;
+
+static void makeLock(void)
+{
+ preferredLanguageLock = [[NSLock alloc] init];
+}
+
++ (void)_ensureAndLockPreferredLanguageLock
+{
+ pthread_once(&preferredLanguageLockOnce, makeLock);
+ [preferredLanguageLock lock];
+}
+
++ (void)_webkit_defaultsDidChange
+{
+ [self _ensureAndLockPreferredLanguageLock];
+
+ [preferredLanguageCode release];
+ preferredLanguageCode = nil;
+
+ [preferredLanguageLock unlock];
+}
+
+static void addDefaultsChangeObserver(void)
+{
+ [[NSNotificationCenter defaultCenter] addObserver:[NSUserDefaults class]
+ selector:@selector(_webkit_defaultsDidChange)
+ name:NSUserDefaultsDidChangeNotification
+ object:[NSUserDefaults standardUserDefaults]];
+}
+
++ (void)_webkit_addDefaultsChangeObserver
+{
+ pthread_once(&addDefaultsChangeObserverOnce, addDefaultsChangeObserver);
+}
+
++ (NSString *)_webkit_preferredLanguageCode
+{
+ // Get this outside the lock since it might block on the defaults lock, while we are inside registerDefaults:.
+ NSUserDefaults *standardDefaults = [self standardUserDefaults];
+
+ BOOL addObserver = NO;
+
+ [self _ensureAndLockPreferredLanguageLock];
+
+ if (!preferredLanguageCode) {
+ NSArray *languages = [standardDefaults stringArrayForKey:@"AppleLanguages"];
+ if ([languages count] == 0) {
+ preferredLanguageCode = [@"en" retain];
+ } else {
+ preferredLanguageCode = [[[languages objectAtIndex:0] _webkit_HTTPStyleLanguageCode] copy];
+ }
+ addObserver = YES;
+ }
+
+ NSString *code = [[preferredLanguageCode retain] autorelease];
+
+ [preferredLanguageLock unlock];
+
+ if (addObserver) {
+ [self _webkit_addDefaultsChangeObserver];
+ }
+
+ return code;
+}
+
+@end
#import <WebKit/WebNSDictionaryExtras.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <Foundation/NSURLRequestPrivate.h>
-
#import <AppKit/NSEvent_Private.h>
#import <Carbon/Carbon.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
return nil;
}
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
- [request setHTTPReferrer:[[[self webFrame] _bridge] referrer]];
+ [request _web_setHTTPReferrer:[[[self webFrame] _bridge] referrer]];
return request;
}
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebView.h>
-#import <Foundation/NSURLRequestPrivate.h>
-
@implementation WebNetscapePluginEmbeddedView
- (id)initWithFrame:(NSRect)frame
// Check for this and don't start a load in this case.
if (URL != nil && ![URL _web_isEmpty]) {
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
- [request setHTTPReferrer:[[[self webFrame] _bridge] referrer]];
+ [request _web_setHTTPReferrer:[[[self webFrame] _bridge] referrer]];
[self loadRequest:request inTarget:nil withNotifyData:nil sendNotification:NO];
}
}
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebNetscapePluginPackage.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebViewPrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLResponsePrivate.h>
-#import <Foundation/NSURLRequestPrivate.h>
@interface WebNetscapePluginConnectionDelegate : WebBaseResourceHandleDelegate
{
request = [theRequest mutableCopy];
if (hideReferrer) {
- [(NSMutableURLRequest *)request setHTTPReferrer:nil];
+ [(NSMutableURLRequest *)request _web_setHTTPReferrer:nil];
}
_loader = [[WebNetscapePluginConnectionDelegate alloc] initWithStream:self view:view];
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginController.h>
#import <WebKit/WebUIDelegatePrivate.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
if (URL != nil && ![URL _web_isEmpty]) {
request = [NSMutableURLRequest requestWithURL:URL];
- [request setHTTPReferrer:[self referrer]];
+ [request _web_setHTTPReferrer:[self referrer]];
}
WebView *currentWebView = [_frame webView];
// Never use cached data for these requests (xmlhttprequests).
[request setCachePolicy:[[[self dataSource] request] cachePolicy]];
if (!hideReferrer)
- [request setHTTPReferrer:[self referrer]];
+ [request _web_setHTTPReferrer:[self referrer]];
WebView *webView = [_frame webView];
[request setMainDocumentURL:[[[[webView mainFrame] dataSource] request] URL]];
- [request setHTTPUserAgent:[webView userAgentForURL:[request URL]]];
+ [request _web_setHTTPUserAgent:[webView userAgentForURL:[request URL]]];
NSError *error = nil;
id identifier = nil;
- (NSString *)incomingReferrer
{
- return [[[self dataSource] request] HTTPReferrer];
+ return [[[self dataSource] request] _web_HTTPReferrer];
}
- (NSView *)pluginViewWithPackage:(WebPluginPackage *)pluginPackage
if (URL != nil && ![URL _web_isEmpty]) {
request = [NSMutableURLRequest requestWithURL:URL];
- [request setHTTPReferrer:[self referrer]];
+ [request _web_setHTTPReferrer:[self referrer]];
}
WebView *currentWebView = [_frame webView];
#import <WebKit/WebFormDataStream.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebViewPrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
// not affect any other resources. Such changes need to be done
// per request.
[newRequest setCachePolicy:[[source _originalRequest] cachePolicy]];
- [newRequest setHTTPReferrer:referrer];
+ [newRequest _web_setHTTPReferrer:referrer];
WebView *_webView = [source _webView];
[newRequest setMainDocumentURL:[[[[_webView mainFrame] dataSource] request] URL]];
- [newRequest setHTTPUserAgent:[_webView userAgentForURL:[newRequest URL]]];
+ [newRequest _web_setHTTPUserAgent:[_webView userAgentForURL:[newRequest URL]]];
if (![client loadWithRequest:newRequest]) {
client = nil;
#import <WebKit/WebFormDataStream.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebViewPrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
// not affect any other resources. Such changes need to be done
// per request.
[newRequest setCachePolicy:[[source _originalRequest] cachePolicy]];
- [newRequest setHTTPReferrer:referrer];
+ [newRequest _web_setHTTPReferrer:referrer];
WebView *_webView = [source _webView];
[newRequest setMainDocumentURL:[[[[_webView mainFrame] dataSource] request] URL]];
- [newRequest setHTTPUserAgent:[_webView userAgentForURL:[newRequest URL]]];
+ [newRequest _web_setHTTPUserAgent:[_webView userAgentForURL:[newRequest URL]]];
if (![client loadWithRequest:newRequest]) {
client = nil;
#import <WebKit/WebViewFactory.h>
-#import <Foundation/NSUserDefaults_NSURLExtras.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebControllerSets.h>
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebLocalizableStrings.h>
+#import <WebKit/WebNSUserDefaultsExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginDatabase.h>
- (NSString *)defaultLanguageCode
{
- return [NSUserDefaults _web_preferredLanguageCode];
+ return [NSUserDefaults _webkit_preferredLanguageCode];
}
@end
ED2B2475033A2DA800C1A526,
EDD1A5C605C83987008E3150,
EDD1A5C705C83987008E3150,
- BE6DC39A04C62C4E004D0EF6,
BE6DC39904C62C4E004D0EF6,
+ BE6DC39A04C62C4E004D0EF6,
+ 65E0F88308500917007E5CB9,
+ 65E0F88208500917007E5CB9,
+ 65E0F9E408500F23007E5CB9,
+ 65E0F9E508500F23007E5CB9,
F508946902B71D59018A9CD4,
F508946A02B71D59018A9CD4,
9345DDAE0365FB27008635CE,
refType = 4;
sourceTree = "<group>";
};
+ 65E0F88208500917007E5CB9 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = WebNSURLRequestExtras.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 65E0F88308500917007E5CB9 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.objc;
+ path = WebNSURLRequestExtras.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 65E0F88408500917007E5CB9 = {
+ fileRef = 65E0F88208500917007E5CB9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 65E0F88508500917007E5CB9 = {
+ fileRef = 65E0F88308500917007E5CB9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 65E0F9E408500F23007E5CB9 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = WebNSUserDefaultsExtras.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 65E0F9E508500F23007E5CB9 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.objc;
+ path = WebNSUserDefaultsExtras.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 65E0F9E608500F23007E5CB9 = {
+ fileRef = 65E0F9E408500F23007E5CB9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 65E0F9E708500F23007E5CB9 = {
+ fileRef = 65E0F9E508500F23007E5CB9;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
65E1150307EFFEBF009B8BF7 = {
fileEncoding = 30;
isa = PBXFileReference;
65488DA1084FBCCB00831AD0,
65EEDE53084FFB920002DB25,
65EEDE57084FFC9E0002DB25,
+ 65E0F88408500917007E5CB9,
+ 65E0F9E608500F23007E5CB9,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
65488DA2084FBCCB00831AD0,
65EEDE54084FFB920002DB25,
65EEDE58084FFC9E0002DB25,
+ 65E0F88508500917007E5CB9,
+ 65E0F9E708500F23007E5CB9,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebPreferencesPrivate.h>
// anything including possibly releasing self; one example of this is 3266216
[self retain];
- [mutableRequest setHTTPUserAgent:[webView userAgentForURL:[newRequest URL]]];
+ [mutableRequest _web_setHTTPUserAgent:[webView userAgentForURL:[newRequest URL]]];
newRequest = [mutableRequest autorelease];
clientRequest = [newRequest _webDataRequestExternalRequest];
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebLocalizableStrings.h>
#import <WebKit/WebNSPasteboardExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebViewPrivate.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLRequestPrivate.h>
@implementation WebDefaultUIDelegate (WebContextMenu)
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
NSString *referrer = [[webFrame _bridge] referrer];
if (referrer) {
- [request setHTTPReferrer:referrer];
+ [request _web_setHTTPReferrer:referrer];
}
[webView _openNewWindowWithRequest:request];
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebNSObjectExtras.h>
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebViewInternal.h>
#import <WebKit/WebUIDelegate.h>
-#import <Foundation/NSURLRequestPrivate.h>
-
#import <objc/objc-runtime.h>
#ifndef NDEBUG
NSDictionary *action;
if (formData) {
[request setHTTPMethod:@"POST"];
- [request setHTTPReferrer:[item formReferrer]];
+ [request _web_setHTTPReferrer:[item formReferrer]];
webSetHTTPBody(request, formData);
- [request setHTTPContentType:[item formContentType]];
+ [request _web_setHTTPContentType:[item formContentType]];
// Slight hack to test if the WF cache contains the page we're going to. We want
// to know this before talking to the policy delegate, since it affects whether we
- (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest: (BOOL)f
{
- [request setHTTPUserAgent:[[self webView] userAgentForURL:[request URL]]];
+ [request _web_setHTTPUserAgent:[[self webView] userAgentForURL:[request URL]]];
// Don't set the cookie policy URL if it's already been set.
if ([request mainDocumentURL] == nil){
BOOL isFormSubmission = (values != nil);
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
- [request setHTTPReferrer:referrer];
+ [request _web_setHTTPReferrer:referrer];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (event != nil || isFormSubmission)];
if (loadType == WebFrameLoadTypeReload) {
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
[self _addExtraFieldsToRequest:request alwaysFromRequest:YES];
- [request setHTTPReferrer:referrer];
+ [request _web_setHTTPReferrer:referrer];
[request setHTTPMethod:@"POST"];
webSetHTTPBody(request, postData);
- [request setHTTPContentType:contentType];
+ [request _web_setHTTPContentType:contentType];
NSDictionary *action = [self _actionInformationForLoadType:WebFrameLoadTypeStandard isFormSubmission:YES event:event originalURL:URL];
WebFormState *formState = nil;
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebNSURLRequestExtras.h>
#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebPreferences.h>
#import <WebKit/WebPreferencesPrivate.h>
// anything including possibly releasing self; one example of this is 3266216
[self retain];
- [mutableRequest setHTTPUserAgent:[webView userAgentForURL:[newRequest URL]]];
+ [mutableRequest _web_setHTTPUserAgent:[webView userAgentForURL:[newRequest URL]]];
newRequest = [mutableRequest autorelease];
clientRequest = [newRequest _webDataRequestExternalRequest];
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLDownloadPrivate.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLDownloadPrivate.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLResponsePrivate.h>
#import <WebKit/WebNSPrintOperationExtras.h>
#import <WebKit/WebNSEventExtras.h>
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebNSURLRequestExtras.h>
+#import <WebKit/WebNSUserDefaultsExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPolicyDelegate.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLDownloadPrivate.h>
#import <Foundation/NSURLFileTypeMappings.h>
-#import <Foundation/NSURLRequestPrivate.h>
-#import <Foundation/NSUserDefaults_NSURLExtras.h>
#if !BUILDING_ON_PANTHER
#include <CoreGraphics/CGSConnection.h>
- (NSCachedURLResponse *)_cachedResponseForURL:(NSURL *)URL
{
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
- [request setHTTPUserAgent:[self userAgentForURL:URL]];
+ [request _web_setHTTPUserAgent:[self userAgentForURL:URL]];
NSCachedURLResponse *cachedResponse = [[NSURLCache sharedURLCache] cachedResponseForRequest:request];
[request release];
return cachedResponse;
// FIXME: Some day we will start reporting the actual CPU here instead of hardcoding PPC.
- NSString *language = [NSUserDefaults _web_preferredLanguageCode];
+ NSString *language = [NSUserDefaults _webkit_preferredLanguageCode];
id sourceVersion = [[NSBundle bundleForClass:[WebView class]]
objectForInfoDictionaryKey:(id)kCFBundleVersionKey];
NSString *applicationName = _private->applicationNameForUserAgent;