[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:48:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c0ea11ca23a527dc0498f1b36840e0c04224674b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 23 20:04:23 2003 +0000
WebKit:
Reviewed by Darin
Removed dependency on Foundation NSURL_NSURLExtras file.
Copied the required methods from that file to WebNSURLExtras,
temporarily renaming the methods that are now in both
places to have a _webkit_ prefix. The names will be changed
back once every one is living on a Foundation version that
no longer contains these methods.
The files below were changed in one of three ways:
1. Rename _web_URLWithString: to _web_URLWithDataAsString:
2. Tweak headers to depend on WebNSURLExtras instead of NSURL_NSURLExtras.
3. At call sites, tweak names of methods that moved to WebKit (_web_ -> _webkit_).
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem URL]):
* History.subproj/WebHistoryPrivate.m:
* History.subproj/WebURLsWithTitles.m:
(+[WebURLsWithTitles URLsFromPasteboard:]):
* Misc.subproj/WebIconDatabase.m:
(-[WebIconDatabase _iconForFileURL:withSize:]):
* Misc.subproj/WebIconLoader.m:
* Misc.subproj/WebNSPasteboardExtras.m:
(-[NSPasteboard _web_bestURL]):
* Misc.subproj/WebNSURLExtras.h:
* Misc.subproj/WebNSURLExtras.m:
(ReleaseIfNotNULL):
(+[NSURL _web_URLWithDataAsString:]):
(+[NSURL _web_URLWithDataAsString:relativeToURL:]):
(+[NSURL _web_URLWithData:]):
(+[NSURL _web_URLWithData:relativeToURL:]):
(-[NSURL _web_originalData]):
(-[NSURL _web_displayableString]):
(-[NSURL _web_URLStringLength]):
(-[NSURL _webkit_canonicalize]):
(-[NSURL _webkit_URLByRemovingFragment]):
(-[NSURL _webkit_isJavaScriptURL]):
(-[NSURL _webkit_scriptIfJavaScriptURL]):
(-[NSURL _webkit_isFTPDirectoryURL]):
(-[NSURL _webkit_shouldLoadAsEmptyDocument]):
(isHexDigit):
(hexDigitValue):
(-[NSString _webkit_isJavaScriptURL]):
(-[NSString _webkit_stringByReplacingValidPercentEscapes]):
(-[NSString _webkit_scriptIfJavaScriptURL]):
* Misc.subproj/WebNSViewExtras.m:
* Panels.subproj/WebAuthenticationPanel.m:
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView requestWithURLCString:]):
(-[WebBaseNetscapePluginView loadPluginRequest:]):
(-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
* Plugins.subproj/WebNullPluginView.m:
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge requestedURLString]):
* WebCoreSupport.subproj/WebCookieAdapter.m:
(-[WebCookieAdapter cookiesForURL:]):
(-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _setTitle:]):
(-[WebDataSource _loadIcon]):
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _transitionToCommitted:]):
(-[WebFrame _shouldReloadForCurrent:andDestination:]):
(-[WebFrame _URLsMatchItem:]):
* WebView.subproj/WebFrameView.m:
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _elementAtPoint:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
(-[WebMainResourceClient loadWithRequest:]):
(-[WebMainResourceClient setDefersCallbacks:]):
WebBrowser:
Reviewed by Darin
Removed dependency on Foundation NSURL_NSURLExtras file.
Copied the required methods from that file to WebNSURLExtras
in WebKit. WebBrowser code now depends on that file instead.
In order to avoid method name collisions, the WebNSURLExtras
some methods have been temporarily renamed to have a _webkit_
prefix. The names will be changed back once every one is
living on a Foundation version that no longer contains these methods.
The files below were changed in one of three ways:
1. Rename _web_URLWithString: to _web_URLWithDataAsString:
2. Tweak headers to depend on WebNSURLExtras instead of NSURL_NSURLExtras.
3. At call sites, tweak names of methods that moved to WebKit (_web_ -> _webkit_).
* AppController.m:
(-[AppController handleURLEvent:withReplyEvent:]):
* BookmarkSource.m:
* BookmarksViewController.m:
* BrowserDocument.m:
(-[BrowserDocument initWithContentsOfURL:ofType:]):
(-[BrowserDocument goToScriptSpecifiedURL]):
(-[BrowserDocument goHome:]):
* BrowserDocumentController.m:
(-[BrowserDocumentController openDocumentWithContentsOfURL:display:]):
(-[BrowserDocumentController URLFromShortcutFile:]):
(-[BrowserDocumentController openDocument:]):
(-[BrowserDocumentController goToURL:windowPolicy:]):
* BrowserNSNetServiceExtras.m:
(-[NSNetService URL]):
* BrowserNSStringExtras.m:
(-[NSString possibleURLsForUserTypedString]):
(-[NSString bestURLForUserTypedString]):
* BrowserWebBookmarkExtras.m:
(-[WebBookmark _goToWithWindowPolicy:]):
(-[WebBookmark URLsForGoToAllWithTitles:]):
* BrowserWebController.m:
(-[BrowserWebView mouseoverTextForElement:modifierFlags:]):
(-[BrowserWebView webView:unableToImplementPolicyWithError:frame:]):
(-[BrowserWebView webView:decidePolicyForMIMEType:request:frame:decisionListener:]):
(-[BrowserWebView locationFieldURL]):
(-[BrowserWebView goToRequest:withTabLabel:allowJavaScript:waitInQueue:]):
(-[BrowserWebView goToURL:withFallbackURLs:]):
* BrowserWindowController.m:
(-[BrowserWindowController goToToolbarLocationWithWindowPolicy:]):
(-[BrowserWindowController replaceTabURLs:usingTabLabelsFromBookmarks:]):
(-[BrowserWindowController goToBookmarks]):
* ContextMenuHandler.m:
(-[BrowserWebView goToAddress:]):
* Debug/DebugUtilities.m:
(-[WebHistory populateHistoryWithTestData:]):
* DownloadProgressEntry.m:
* FrameProgressEntry.m:
(-[FrameProgressEntry URL]):
* GlobalHistory.m:
(-[GlobalHistory updateDisplayTitleForHistoryItem:]):
* GoogleSearchChannel.m:
(-[GoogleSearchChannel URLWithSearchCriteria:]):
* LoadProgressMonitor.m:
(-[LoadProgressMonitor launchApplicationSheetEnded:returnCode:contextInfo:]):
(-[LoadProgressMonitor pluginErrorSheetEnded:returnCode:contextInfo:]):
* LocationChangeError.m:
(-[LocationChangeHandler specializedMessageForError:dataSource:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler webView:locationChangeDone:forDataSource:]):
* LocationFieldEditor.m:
(-[LocationFieldEditor paste:]):
* Preferences.subproj/AdvancedPreferences.m:
(-[AdvancedPreferences setStyleSheetPathPreference:]):
* RendezvousController.m:
(-[RendezvousController init]):
* ResourceProgressEntry.m:
(-[ResourceProgressEntry open]):
(-[ResourceProgressEntry download]):
* Test/PageLoadTestRunner.m:
(-[PageLoadTestRunner setSingleTestURL:]):
(-[PageLoadTestRunner loadTestSuiteFile:]):
(-[PageLoadTestRunner pageLoadStarted:]):
* TitleBarButton.m:
(-[TitleBarButton showPathRepresentingPopUpMenuForEvent:URL:]):
* URLCompletionController.m:
* WebBookmarkLeaf.m:
(-[WebBookmarkLeaf setURLString:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4692 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a3538f1..c55b6d0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,80 @@
+2003-07-23 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Darin
+
+ Removed dependency on Foundation NSURL_NSURLExtras file.
+ Copied the required methods from that file to WebNSURLExtras,
+ temporarily renaming the methods that are now in both
+ places to have a _webkit_ prefix. The names will be changed
+ back once every one is living on a Foundation version that
+ no longer contains these methods.
+
+ The files below were changed in one of three ways:
+ 1. Rename _web_URLWithString: to _web_URLWithDataAsString:
+ 2. Tweak headers to depend on WebNSURLExtras instead of NSURL_NSURLExtras.
+ 3. At call sites, tweak names of methods that moved to WebKit (_web_ -> _webkit_).
+
+ * History.subproj/WebHistory.m:
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem URL]):
+ * History.subproj/WebHistoryPrivate.m:
+ * History.subproj/WebURLsWithTitles.m:
+ (+[WebURLsWithTitles URLsFromPasteboard:]):
+ * Misc.subproj/WebIconDatabase.m:
+ (-[WebIconDatabase _iconForFileURL:withSize:]):
+ * Misc.subproj/WebIconLoader.m:
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ (-[NSPasteboard _web_bestURL]):
+ * Misc.subproj/WebNSURLExtras.h:
+ * Misc.subproj/WebNSURLExtras.m:
+ (ReleaseIfNotNULL):
+ (+[NSURL _web_URLWithDataAsString:]):
+ (+[NSURL _web_URLWithDataAsString:relativeToURL:]):
+ (+[NSURL _web_URLWithData:]):
+ (+[NSURL _web_URLWithData:relativeToURL:]):
+ (-[NSURL _web_originalData]):
+ (-[NSURL _web_displayableString]):
+ (-[NSURL _web_URLStringLength]):
+ (-[NSURL _webkit_canonicalize]):
+ (-[NSURL _webkit_URLByRemovingFragment]):
+ (-[NSURL _webkit_isJavaScriptURL]):
+ (-[NSURL _webkit_scriptIfJavaScriptURL]):
+ (-[NSURL _webkit_isFTPDirectoryURL]):
+ (-[NSURL _webkit_shouldLoadAsEmptyDocument]):
+ (isHexDigit):
+ (hexDigitValue):
+ (-[NSString _webkit_isJavaScriptURL]):
+ (-[NSString _webkit_stringByReplacingValidPercentEscapes]):
+ (-[NSString _webkit_scriptIfJavaScriptURL]):
+ * Misc.subproj/WebNSViewExtras.m:
+ * Panels.subproj/WebAuthenticationPanel.m:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView requestWithURLCString:]):
+ (-[WebBaseNetscapePluginView loadPluginRequest:]):
+ (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
+ * Plugins.subproj/WebNullPluginView.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge requestedURLString]):
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ (-[WebCookieAdapter cookiesForURL:]):
+ (-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setTitle:]):
+ (-[WebDataSource _loadIcon]):
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted:]):
+ (-[WebFrame _shouldReloadForCurrent:andDestination:]):
+ (-[WebFrame _URLsMatchItem:]):
+ * WebView.subproj/WebFrameView.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _elementAtPoint:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+ (-[WebMainResourceClient loadWithRequest:]):
+ (-[WebMainResourceClient setDefersCallbacks:]):
+
2003-07-22 Darin Adler <darin at apple.com>
* English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index 660062c..7c21dba 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -10,11 +10,10 @@
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSURLExtras.h>
#import <Foundation/NSError.h>
#import <WebKit/WebAssertions.h>
-#import <Foundation/NSURL_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <WebCore/WebCoreHistory.h>
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 2d3a8a3..72b181d 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -10,11 +10,11 @@
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconLoader.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPluginController.h>
#import <WebKit/WebAssertions.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
@@ -264,7 +264,7 @@ NSString *WebHistoryItemChangedNotification = @"WebHistoryItemChangedNotificatio
- (NSURL *)URL
{
- return _private->URLString ? [NSURL _web_URLWithString:_private->URLString] : nil;
+ return _private->URLString ? [NSURL _web_URLWithDataAsString:_private->URLString] : nil;
}
- (NSString *)target
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index b9f244c..3af3aac 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -11,13 +11,13 @@
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSURLExtras.h>
#import <Foundation/NSError.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
#import <Foundation/NSCalendarDate_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
NSString *FileVersionKey = @"WebHistoryFileVersion";
NSString *DatesArrayKey = @"WebHistoryDates";
diff --git a/WebKit/History.subproj/WebURLsWithTitles.m b/WebKit/History.subproj/WebURLsWithTitles.m
index 83e2691..708c9c3 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.m
+++ b/WebKit/History.subproj/WebURLsWithTitles.m
@@ -8,7 +8,7 @@
#import "WebURLsWithTitles.h"
-#import <Foundation/NSURL_NSURLExtras.h>
+#import <WebKit/WebNSURLExtras.h>
@implementation WebURLsWithTitles
@@ -77,7 +77,7 @@
count = [URLStrings count];
URLs = [NSMutableArray arrayWithCapacity:count];
for (index = 0; index < count; ++index) {
- [URLs addObject:[NSURL _web_URLWithString:[URLStrings objectAtIndex:index]]];
+ [URLs addObject:[NSURL _web_URLWithDataAsString:[URLStrings objectAtIndex:index]]];
}
return URLs;
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 483e81c..a16ea06 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -11,9 +11,9 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebKit/WebFileDatabase.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSURLExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
NSString * const WebIconDatabaseVersionKey = @"WebIconDatabaseVersion";
NSString * const WebIconsOnDiskKey = @"WebIconsOnDisk";
@@ -426,7 +426,7 @@ NSSize WebIconLargeSize = {128, 128};
ASSERT(size.height);
NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
- NSString *path = [[NSURL _web_URLWithString:file] path];
+ NSString *path = [[NSURL _web_URLWithDataAsString:file] path];
NSString *suffix = [path pathExtension];
NSImage *icon = nil;
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 6559e60..c0498ea 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -10,8 +10,8 @@
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconDatabasePrivate.h>
+#import <WebKit/WebNSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
#import <Foundation/NSURLRequestPrivate.h>
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index d85fc62..49dc586 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -7,12 +7,12 @@
//
#import <WebKit/WebNSPasteboardExtras.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebURLsWithTitles.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebAssertions.h>
#import <Foundation/NSString_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <ApplicationServices/ApplicationServicesPriv.h>
@@ -46,14 +46,14 @@ NSString *WebURLNamePboardType = nil;
NSURL *URLFromPasteboard = [NSURL URLFromPasteboard:self];
NSString *scheme = [URLFromPasteboard scheme];
if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
- return [URLFromPasteboard _web_canonicalize];
+ return [URLFromPasteboard _webkit_canonicalize];
}
}
if ([types containsObject:NSStringPboardType]) {
NSString *URLString = [self stringForType:NSStringPboardType];
if ([URLString _web_looksLikeAbsoluteURL]) {
- NSURL *URL = [[NSURL _web_URLWithString:URLString] _web_canonicalize];
+ NSURL *URL = [[NSURL _web_URLWithDataAsString:URLString] _webkit_canonicalize];
if (URL) {
return URL;
}
@@ -67,7 +67,7 @@ NSString *WebURLNamePboardType = nil;
BOOL isDirectory;
if([[NSFileManager defaultManager] fileExistsAtPath:file isDirectory:&isDirectory] && !isDirectory){
if ([WebView canShowFile:file]) {
- return [[NSURL fileURLWithPath:file] _web_canonicalize];
+ return [[NSURL fileURLWithPath:file] _webkit_canonicalize];
}
}
}
diff --git a/WebKit/Misc.subproj/WebNSURLExtras.h b/WebKit/Misc.subproj/WebNSURLExtras.h
index a47f375..158786d 100644
--- a/WebKit/Misc.subproj/WebNSURLExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLExtras.h
@@ -6,16 +6,35 @@
#import <Foundation/Foundation.h>
-#import <Foundation/NSURL_NSURLExtras.h>
-
@interface NSURL (WebNSURLExtras)
++ (NSURL *)_web_URLWithDataAsString:(NSString *)string;
++ (NSURL *)_web_URLWithDataAsString:(NSString *)string relativeToURL:(NSURL *)baseURL;
+
+ (NSURL *)_web_URLWithData:(NSData *)data;
+ (NSURL *)_web_URLWithData:(NSData *)data relativeToURL:(NSURL *)baseURL;
-- (NSData *)_web_URLAsData;
+- (NSData *)_web_originalData;
-- (NSString *)_web_absoluteString;
+- (NSString *)_web_displayableString;
- (int)_web_URLStringLength;
+// FIXME: change these names back to _web_ when identically-named
+// methods are removed from Foundation
+- (NSURL *)_webkit_canonicalize;
+- (NSURL *)_webkit_URLByRemovingFragment;
+- (BOOL)_webkit_isJavaScriptURL;
+- (NSString *)_webkit_scriptIfJavaScriptURL;
+- (BOOL)_webkit_isFTPDirectoryURL;
+- (BOOL)_webkit_shouldLoadAsEmptyDocument;
+
+ at end
+
+ at interface NSString (WebNSURLExtras)
+
+// FIXME: change these names back to _web_ when identically-named
+// methods are removed from Foundation
+- (NSString *)_webkit_stringByReplacingValidPercentEscapes;
+- (NSString *)_webkit_scriptIfJavaScriptURL;
+
@end
diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index ba40717..82a0653 100644
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -1,21 +1,55 @@
/*
- WebNSURLExtras.h
+ WebNSURLExtras.m
Private (SPI) header
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebNSURLExtras.h>
+#import <WebKit/WebAssertions.h>
+
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURLProtocolPrivate.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+
+#if 0
+// URL API FIXME: Use new URL API when available
+static int URLBytesBufferLength = 2048;
+#endif
+
+static inline void ReleaseIfNotNULL(CFTypeRef object)
+{
+ if (object) {
+ CFRelease(object);
+ }
+}
+
@implementation NSURL (WebNSURLExtras)
-+ (NSURL *)_web_URLWithData:(NSData *)data
++ (NSURL *)_web_URLWithDataAsString:(NSString *)string
{
- NSString *string = [[[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding] autorelease];
- return [NSURL _web_URLWithString:string];
+ return [NSURL _web_URLWithString:string relativeToURL:nil];
#if 0
// URL API FIXME: Use new URL API when available
- return (NSURL *)CFURLCreateAbsoluteURLWithBytes(NULL, [data bytes], [data length], NSISOLatin1StringEncoding, NULL, YES);
+ return [self _web_URLWithDataAsString:string relativeToURL:nil];
#endif
+}
+
++ (NSURL *)_web_URLWithDataAsString:(NSString *)string relativeToURL:(NSURL *)baseURL
+{
+ return [NSURL _web_URLWithString:string relativeToURL:baseURL];
+#if 0
+ // URL API FIXME: Use new URL API when available
+ string = [string _web_stringByTrimmingWhitespace];
+ NSData *data = [string dataUsingEncoding:NSISOLatin1StringEncoding];
+ return [self _web_URLWithData:data relativeToURL:baseURL];
+#endif
+}
+
++ (NSURL *)_web_URLWithData:(NSData *)data
+{
+ return [self _web_URLWithData:data relativeToURL:nil];
}
+ (NSURL *)_web_URLWithData:(NSData *)data relativeToURL:(NSURL *)baseURL
@@ -24,20 +58,19 @@
return [NSURL _web_URLWithString:string relativeToURL:baseURL];
#if 0
// URL API FIXME: Use new URL API when available
- return (NSURL *)CFURLCreateAbsoluteURLWithBytes(NULL, [data bytes], [data length], NSISOLatin1StringEncoding, (CFURLRef)baseURL, YES);
-#endif
+ return (NSURL *)CFURLCreateAbsoluteURLWithBytes(NULL, [data bytes], [data length], kCFStringEncodingISOLatin1, baseURL, YES);
+#endif
}
-- (NSData *)_web_URLAsData
+- (NSData *)_web_originalData
{
return [[self absoluteString] dataUsingEncoding:NSISOLatin1StringEncoding allowLossyConversion:YES];
#if 0
- // URL API FIXME: Convert to new URL API when available
+ // URL API FIXME: Use new URL API when available
NSData *result = nil;
- static int URLAsDataBufferSize = 2048;
- UInt8 static_buffer[URLAsDataBufferSize];
- CFIndex bytesFilled = CFURLGetBytes((CFURLRef)self, static_buffer, URLAsDataBufferSize);
+ UInt8 static_buffer[URLBytesBufferLength];
+ CFIndex bytesFilled = CFURLGetBytes((CFURLRef)self, static_buffer, URLBytesBufferLength);
if (bytesFilled != -1) {
result = [NSData dataWithBytes:static_buffer length:bytesFilled];
}
@@ -46,6 +79,7 @@
UInt8 *buffer = malloc(bytesToAllocate);
bytesFilled = CFURLGetBytes((CFURLRef)self, buffer, bytesToAllocate);
NSURL_ASSERT(bytesFilled == bytesToAllocate);
+ // buffer is adopted by the NSData
result = [NSData dataWithBytesNoCopy:buffer length:bytesFilled];
}
@@ -53,18 +87,18 @@
#endif
}
-- (NSString *)_web_absoluteString
+- (NSString *)_web_displayableString
{
return [self absoluteString];
#if 0
- // URL API FIXME: Convert to new URL API when available
- return [[[NSString alloc] initWithData:[self _web_URLAsData] encoding:NSISOLatin1StringEncoding] autorelease];
+ // URL API FIXME: Use new URL API when available
+ return [[[NSString alloc] initWithData:[self _originalData] encoding:NSISOLatin1StringEncoding] autorelease];
#endif
}
- (int)_web_URLStringLength
{
- return [[self _web_absoluteString] length];
+ return [[self _web_displayableString] length];
#if 0
// URL API FIXME: Convert to new URL API when available
int length = 0;
@@ -72,10 +106,130 @@
length = CFURLGetBytes((CFURLRef)self, NULL, 0);
}
else {
- length = [[self absoluteString] length];
+ length = [[self _displayableString] length];
}
return length;
#endif
}
+- (NSURL *)_webkit_canonicalize
+{
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:self];
+ Class concreteClass = [NSURLProtocol _protocolClassForRequest:request];
+ if (!concreteClass) {
+ [request release];
+ return self;
+ }
+
+ NSURL *result = nil;
+ NSURLRequest *newRequest = [concreteClass canonicalRequestForRequest:request];
+ NSURL *newURL = [newRequest URL];
+ result = [[newURL retain] autorelease];
+ [request release];
+
+ return result;
+}
+
+- (NSURL *)_webkit_URLByRemovingFragment
+{
+ // Check to see if a fragment exists before decomposing the URL.
+ CFStringRef frag = CFURLCopyFragment((CFURLRef)self, NULL);
+ if (!frag) {
+ return self;
+ }
+
+ ReleaseIfNotNULL(frag);
+
+ WebURLComponents components = [self _web_URLComponents];
+ components.fragment = nil;
+ NSURL *result = [NSURL _web_URLWithComponents:components];
+ return result ? result : self;
+}
+
+- (BOOL)_webkit_isJavaScriptURL
+{
+ return [[self absoluteString] _web_isJavaScriptURL];
+}
+
+- (NSString *)_webkit_scriptIfJavaScriptURL
+{
+ return [[self absoluteString] _web_scriptIfJavaScriptURL];
+}
+
+- (BOOL)_webkit_isFTPDirectoryURL
+{
+ return [[self absoluteString] _web_isFTPDirectoryURL];
+}
+
+- (BOOL)_webkit_shouldLoadAsEmptyDocument
+{
+ return [[self absoluteString] _web_hasCaseInsensitivePrefix:@"about:"] || [[self absoluteString] length] == 0;
+}
+
@end
+
+
+ at implementation NSString (WebNSURLExtras)
+
+static BOOL isHexDigit(char c)
+{
+ return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+}
+
+static int hexDigitValue(char c)
+{
+ if (c >= '0' && c <= '9') {
+ return c - '0';
+ }
+ if (c >= 'A' && c <= 'F') {
+ return c - 'A' + 10;
+ }
+ if (c >= 'a' && c <= 'f') {
+ return c - 'a' + 10;
+ }
+ ERROR("illegal hex digit");
+ return 0;
+}
+
+- (BOOL)_webkit_isJavaScriptURL
+{
+ return [self _web_hasCaseInsensitivePrefix:@"javascript:"];
+}
+
+- (NSString *)_webkit_stringByReplacingValidPercentEscapes
+{
+ const char *before = [self UTF8String];
+ char *after = malloc(strlen(before) + 1);
+
+ const char *p = before;
+ char *q = after;
+
+ while (*p) {
+ if (*p == '%' && isHexDigit(p[1]) && isHexDigit(p[2])) {
+ *q++ = (hexDigitValue(p[1]) << 4) | hexDigitValue(p[2]);
+ p += 3;
+ } else {
+ *q++ = *p++;
+ }
+ }
+ *q = '\0';
+
+ NSString *result = [NSString stringWithUTF8String:after];
+ free(after);
+
+ // FIXME: This returns the original string with all the % escapes intact
+ // if there are any illegal UTF-8 sequences. Instead, we should detect illegal
+ // UTF-8 sequences while decoding above and either leave them as % escapes
+ // (but decode all the others) or turn them in to ? characters.
+ return result ? result : self;
+}
+
+- (NSString *)_webkit_scriptIfJavaScriptURL
+{
+ if (![self _webkit_isJavaScriptURL]) {
+ return nil;
+ }
+ return [[self substringFromIndex:11] _webkit_stringByReplacingValidPercentEscapes];
+}
+
+ at end
\ No newline at end of file
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 44d0f1b..408dfd4 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -7,10 +7,10 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebNSImageExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLFileTypeMappings.h>
#define WebDragStartHysteresisX 5.0
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 52e23b5..d8def6c 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -12,7 +12,7 @@
#import <Foundation/NSURLCredential.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebLocalizableStrings.h>
-#import <Foundation/NSURL_NSURLExtras.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSControlExtras.h>
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 3306fa9..0998843 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -14,6 +14,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginStream.h>
#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
#import <WebKit/WebPreferences.h>
@@ -25,7 +26,6 @@
#import <Foundation/NSData_NSURLExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <AppKit/NSEvent_Private.h>
#import <Carbon/Carbon.h>
@@ -1188,7 +1188,7 @@ typedef struct {
}
NSString *URLString = (NSString *)CFStringCreateWithCString(kCFAllocatorDefault, URLCString, kCFStringEncodingWindowsLatin1);
- NSURL *URL = [NSURL _web_URLWithString:URLString relativeToURL:baseURL];
+ NSURL *URL = [NSURL _web_URLWithDataAsString:URLString relativeToURL:baseURL];
[URLString release];
if (!URL) {
@@ -1223,7 +1223,7 @@ typedef struct {
}
NSURL *URL = [request URL];
- NSString *JSString = [URL _web_scriptIfJavaScriptURL];
+ NSString *JSString = [URL _webkit_scriptIfJavaScriptURL];
if (JSString) {
[[frame _bridge] stringByEvaluatingJavaScriptFromString:JSString];
// FIXME: If the result is a string, we probably want to put that string into the frame, just
@@ -1318,7 +1318,7 @@ typedef struct {
if (!bufString) {
return NPERR_INVALID_PARAM;
}
- NSURL *fileURL = [NSURL _web_URLWithString:bufString];
+ NSURL *fileURL = [NSURL _web_URLWithDataAsString:bufString];
NSString *path;
if ([fileURL isFileURL]) {
path = [fileURL path];
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index c42f15d..320ab88 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -7,12 +7,11 @@
#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <Foundation/NSURL_NSURLExtras.h>
-
static NSImage *image = nil;
@implementation WebNullPluginView
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 05b3e9a..a6ffb29 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -45,7 +45,6 @@
#import <Foundation/NSURLRequestPrivate.h>
#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLResponse.h>
#import <Foundation/NSURLFileTypeMappings.h>
@@ -569,7 +568,7 @@
// This URL is only used for coloring visited links.
- (NSString *)requestedURLString
{
- return [[[[self dataSource] request] URL] _web_absoluteString];
+ return [[[[self dataSource] request] URL] _web_displayableString];
}
- (NSString *)incomingReferrer
@@ -672,7 +671,7 @@
if (errorCode) {
NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
- contentURLString:[URL _web_absoluteString]
+ contentURLString:[URL _web_displayableString]
pluginPageURLString:[attributes objectForKey:@"pluginspage"]
pluginName:[pluginPackage name]
MIMEType:MIMEType];
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index c49d354..3ff2d03 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -9,9 +9,9 @@
#import "WebCookieAdapter.h"
#import <WebKit/WebAssertions.h>
+#import <WebKit/WebNSURLExtras.h>
#import <Foundation/NSHTTPCookie.h>
#import <Foundation/NSHTTPCookieStorage.h>
-#import <Foundation/NSURL_NSURLExtras.h>
@implementation WebCookieAdapter
@@ -35,7 +35,7 @@
- (NSString *)cookiesForURL:(NSString *)URLString
{
- NSURL *URL = [NSURL _web_URLWithString:URLString];
+ NSURL *URL = [NSURL _web_URLWithDataAsString:URLString];
NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:URL];
NSDictionary *header = [NSHTTPCookie requestHeaderFieldsWithCookies:cookiesForURL];
return [header objectForKey:@"Cookie"];
@@ -43,9 +43,9 @@
- (void)setCookies:(NSString *)cookieString forURL:(NSString *)URLString policyBaseURL:(NSString *)policyBaseURL
{
- NSURL *URL = [NSURL _web_URLWithString:URLString];
+ NSURL *URL = [NSURL _web_URLWithDataAsString:URLString];
NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:URL];
- [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:URL mainDocumentURL:[NSURL _web_URLWithString:policyBaseURL]];
+ [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:URL mainDocumentURL:[NSURL _web_URLWithDataAsString:policyBaseURL]];
}
@end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index cd70bda..12212b6 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -2816,6 +2816,9 @@
fileRef = BE6DC39904C62C4E004D0EF6;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Private,
+ );
};
};
BE6DC39C04C62C4E004D0EF6 = {
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index a8cf68e..dcdbb8a 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -34,7 +34,6 @@
#import <Foundation/NSDictionary_NSURLExtras.h>
#import <Foundation/NSError_NSURLExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
#import <Foundation/NSURLResponse.h>
@@ -307,7 +306,7 @@
// The title doesn't get communicated to the WebView until we are committed.
if (_private->committed) {
WebHistoryItem *entry;
- NSURL *canonURL = [[[self _originalRequest] URL] _web_canonicalize];
+ NSURL *canonURL = [[[self _originalRequest] URL] _webkit_canonicalize];
entry = [[WebHistory optionalSharedHistory] itemForURL: canonURL];
[entry setTitle: _private->pageTitle];
@@ -630,7 +629,7 @@
// This is only really a feature of http or https, so don't try this with other protocols.
NSString *scheme = [[self _URL] scheme];
if([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]){
- _private->iconURL = [[[NSURL _web_URLWithString:@"/favicon.ico"
+ _private->iconURL = [[[NSURL _web_URLWithDataAsString:@"/favicon.ico"
relativeToURL:[self _URL]] absoluteURL] retain];
}
}
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 7e76c15..b2093fd 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -22,7 +22,6 @@
#import <WebKit/WebUIDelegate.h>
#import <Foundation/NSURLRequest.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 83a07f1..4f3205f 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -25,13 +25,13 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebViewPrivate.h>
#import <Foundation/NSError_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSString_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLRequest.h>
@@ -660,7 +660,7 @@ NSString *WebCorePageCacheStateKey = @"WebCorePageCacheState";
}
// Update the last visited time. Mostly interesting for URL autocompletion
// statistics.
- NSURL *URL = [[[ds _originalRequest] URL] _web_canonicalize];
+ NSURL *URL = [[[ds _originalRequest] URL] _webkit_canonicalize];
WebHistoryItem *oldItem = [[WebHistory optionalSharedHistory] itemForURL:URL];
if (oldItem) {
[oldItem _setLastVisitedTimeInterval:[NSDate timeIntervalSinceReferenceDate]];
@@ -677,7 +677,7 @@ NSString *WebCorePageCacheStateKey = @"WebCorePageCacheState";
case WebFrameLoadTypeStandard:
if (![ds _isClientRedirect]) {
// Add item to history.
- NSURL *URL = [[[ds _originalRequest] URL] _web_canonicalize];
+ NSURL *URL = [[[ds _originalRequest] URL] _webkit_canonicalize];
if ([[URL absoluteString] length] > 0 && ![WebDataProtocol _webIsDataProtocolURL:URL]) {
entry = [[WebHistory optionalSharedHistory] addItemForURL:URL];
if (ptitle)
@@ -1109,7 +1109,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (BOOL)_shouldReloadForCurrent:(NSURL *)currentURL andDestination:(NSURL *)destinationURL
{
return !(([currentURL fragment] || [destinationURL fragment]) &&
- [[currentURL _web_URLByRemovingFragment] isEqual: [destinationURL _web_URLByRemovingFragment]]);
+ [[currentURL _webkit_URLByRemovingFragment] isEqual: [destinationURL _webkit_URLByRemovingFragment]]);
}
// Walk the frame tree and ensure that the URLs match the URLs in the item.
@@ -1117,7 +1117,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
{
NSURL *currentURL = [[[self dataSource] request] URL];
- if (![[[item URL] _web_URLByRemovingFragment] isEqual:[currentURL _web_URLByRemovingFragment]])
+ if (![[[item URL] _webkit_URLByRemovingFragment] isEqual:[currentURL _webkit_URLByRemovingFragment]])
return NO;
NSArray *childItems = [item children];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index a5b3898..8caa4ec 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -25,7 +25,6 @@
#import <WebKit/WebViewPrivate.h>
#import <Foundation/NSDictionary_NSURLExtras.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLRequest.h>
enum {
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 9ec77d9..c5f50f6 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -9,7 +9,6 @@
#import <AppKit/NSResponder_Private.h>
#import <WebKit/WebAssertions.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <WebCore/WebCoreFirstResponderChanges.h>
@@ -21,6 +20,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebNSImageExtras.h>
#import <WebKit/WebNSPasteboardExtras.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebPluginController.h>
@@ -199,8 +199,8 @@ static BOOL forceRealHitTest = NO;
NSMutableDictionary *elementInfo = [elementInfoWC mutableCopy];
// Convert URL strings to NSURLs
- [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebElementLinkURLKey]] forKey:WebElementLinkURLKey];
- [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebElementImageURLKey]] forKey:WebElementImageURLKey];
+ [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithDataAsString:[elementInfoWC objectForKey:WebElementLinkURLKey]] forKey:WebElementLinkURLKey];
+ [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithDataAsString:[elementInfoWC objectForKey:WebElementImageURLKey]] forKey:WebElementImageURLKey];
WebFrameView *webFrameView = [self _web_parentWebFrameView];
ASSERT(webFrameView);
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index efc4371..5a7eb3e 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -9,7 +9,6 @@
#import <Foundation/NSError_NSURLExtras.h>
#import <Foundation/NSURLFileTypeMappings.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLDownloadPrivate.h>
@@ -28,6 +27,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -200,7 +200,7 @@
[super connection:connection didReceiveResponse:r];
if (![dataSource _isStopping]
- && ([[request URL] _web_shouldLoadAsEmptyDocument]
+ && ([[request URL] _webkit_shouldLoadAsEmptyDocument]
|| [WebView _representationExistsForURLScheme:[[request URL] scheme]])) {
[self connectionDidFinishLoading:connection];
}
@@ -319,7 +319,7 @@
r = [proxy connection:nil willSendRequest:r redirectResponse:nil];
NSURL *URL = [r URL];
- BOOL shouldLoadEmpty = [URL _web_shouldLoadAsEmptyDocument];
+ BOOL shouldLoadEmpty = [URL _webkit_shouldLoadAsEmptyDocument];
if (shouldLoadEmpty || [WebView _representationExistsForURLScheme:[URL scheme]]) {
NSString *MIMEType;
if (shouldLoadEmpty) {
@@ -345,7 +345,7 @@
- (void)setDefersCallbacks:(BOOL)defers
{
if (request
- && ![[request URL] _web_shouldLoadAsEmptyDocument]
+ && ![[request URL] _webkit_shouldLoadAsEmptyDocument]
&& ![WebView _representationExistsForURLScheme:[[request URL] scheme]]) {
[super setDefersCallbacks:defers];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index efc4371..5a7eb3e 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -9,7 +9,6 @@
#import <Foundation/NSError_NSURLExtras.h>
#import <Foundation/NSURLFileTypeMappings.h>
-#import <Foundation/NSURL_NSURLExtras.h>
#import <Foundation/NSURLConnection.h>
#import <Foundation/NSURLConnectionPrivate.h>
#import <Foundation/NSURLDownloadPrivate.h>
@@ -28,6 +27,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
#import <WebKit/WebViewPrivate.h>
@@ -200,7 +200,7 @@
[super connection:connection didReceiveResponse:r];
if (![dataSource _isStopping]
- && ([[request URL] _web_shouldLoadAsEmptyDocument]
+ && ([[request URL] _webkit_shouldLoadAsEmptyDocument]
|| [WebView _representationExistsForURLScheme:[[request URL] scheme]])) {
[self connectionDidFinishLoading:connection];
}
@@ -319,7 +319,7 @@
r = [proxy connection:nil willSendRequest:r redirectResponse:nil];
NSURL *URL = [r URL];
- BOOL shouldLoadEmpty = [URL _web_shouldLoadAsEmptyDocument];
+ BOOL shouldLoadEmpty = [URL _webkit_shouldLoadAsEmptyDocument];
if (shouldLoadEmpty || [WebView _representationExistsForURLScheme:[URL scheme]]) {
NSString *MIMEType;
if (shouldLoadEmpty) {
@@ -345,7 +345,7 @@
- (void)setDefersCallbacks:(BOOL)defers
{
if (request
- && ![[request URL] _web_shouldLoadAsEmptyDocument]
+ && ![[request URL] _webkit_shouldLoadAsEmptyDocument]
&& ![WebView _representationExistsForURLScheme:[[request URL] scheme]]) {
[super setDefersCallbacks:defers];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list