[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 06:20:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bf48b5673a53dbddb0f1dc1607989f4fd48bcdcf
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 20 20:27:35 2002 +0000
2002-06-20 Kenneth Kocienda <kocienda at apple.com>
A more complete fix for this bug:
Radar 2942728 (Link to Yahoo! Finance stocks page fails, says URL is "not a valid location")
I added a new +(NSURL)_IF_URLWithString: method to IFNSURLExtensions.
This is now the suggested way to create a URL from a string.
WebBrowser:
* AppController.m:
(-[AppController handleGURLEvent:withReplyEvent:])
* BookmarksController.m:
(-[BookmarksController outlineView:writeItems:toPasteboard:])
* BrowserDocument.m:
(-[BrowserDocument goHome:])
* BrowserDocumentController.m:
(-[BrowserDocumentController URLFromShortcutFile:])
* BrowserWindow.m:
(-[BrowserWindow goToToolbarLocation:])
* Debug/DebugUtilities.m:
(-[DebugUtilities addDebugBookmarkToMenu:forURL:keyEquivalent:])
(-[IFWebHistory populateHistoryWithTestData:])
* GoogleSearchChannel.m:
(-[GoogleSearchChannel URLWithSearchCriteria:])
* IFBookmarkAdditions.m:
(-[IFBookmark goTo])
* LocationFieldEditor.m:
(-[LocationFieldEditor concludeDragOperation:])
(-[LocationFieldEditor paste:])
* ResourceProgressEntry.m:
(-[ResourceProgressEntry URL])
* Scripting.subproj/Scripting.m:
(-[GetURLCommand performDefaultImplementation])
(-[OpenURLCommand performDefaultImplementation])
* Test/PageLoadTestRunner.m:
(-[PageLoadTestRunner setSingleTestURL:])
(-[PageLoadTestRunner loadTestSuiteFile:])
* WebBrowser.pbproj/project.pbxproj:
WebKit:
* History.subproj/IFURIEntry.m:
(-[IFURIEntry initFromDictionaryRepresentation:])
* History.subproj/IFURLsWithTitles.m:
(+[IFURLsWithTitles URLsFromPasteboard:])
* History.subproj/IFWebHistoryPrivate.m:
(-[IFWebHistoryPrivate updateURL:title:displayTitle:forURL:])
* Plugins.subproj/IFNullPluginView.mm:
(-[IFNullPluginView initWithFrame:mimeType:arguments:])
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView initWithFrame:plugin:url:mime:arguments:])
(-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:])
* WebCoreSupport.subproj/IFWebCoreViewFactory.m:
(-[IFWebCoreViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:])
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/IFWebDataSource.h:
* WebView.subproj/IFWebDataSourcePrivate.mm:
(-[IFWebDataSource _startLoading:])
* WebView.subproj/IFWebView.mm:
(-[IFWebView performDragOperation:])
WebFoundation:
* AuthenticationManager.subproj/IFAuthenticationManager.m:
(IFNSURLGetParent):
* CacheLoader.subproj/IFFileURLProtocolHandler.m:
(+[IFFileURLProtocolHandler canonicalizeURL:]):
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
(+[IFHTTPURLProtocolHandler canonicalizeURL:]):
(-[IFHTTPURLProtocolHandler URLFromLocationHeader]):
(-[IFHTTPURLProtocolHandler requestURL]):
* CacheLoader.subproj/IFURLLoadManager.m:
(-[IFURLLoadManager canonicalizeCacheURL:]):
* CookieManager.subproj/IFCookie.m:
(setDefaultsFromOriginURL):
* Misc.subproj/IFNSStringExtensions.h:
* Misc.subproj/IFNSStringExtensions.m:
* Misc.subproj/IFNSURLExtensions.h:
* Misc.subproj/IFNSURLExtensions.m:
(CreateURLStringByAddingPercentEscapes):
(+[NSURL _IF_URLWithString:]):
(+[NSURL _IF_URLWithString:relativeToURL:]):
(+[NSURL _IF_URLWithScheme:user:password:host:port:path:parameter:query:fragment:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8bcf2f4..a3e1dd5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,32 @@
+2002-06-20 Kenneth Kocienda <kocienda at apple.com>
+
+ A more complete fix for this bug:
+
+ Radar 2942728 (Link to Yahoo! Finance stocks page fails, says URL is "not a valid location")
+
+ I added a new +(NSURL)_IF_URLWithString: method to IFNSURLExtensions.
+ This is now the suggested way to create a URL from a string.
+
+ * History.subproj/IFURIEntry.m:
+ (-[IFURIEntry initFromDictionaryRepresentation:])
+ * History.subproj/IFURLsWithTitles.m:
+ (+[IFURLsWithTitles URLsFromPasteboard:])
+ * History.subproj/IFWebHistoryPrivate.m:
+ (-[IFWebHistoryPrivate updateURL:title:displayTitle:forURL:])
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView initWithFrame:mimeType:arguments:])
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView initWithFrame:plugin:url:mime:arguments:])
+ (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:])
+ * WebCoreSupport.subproj/IFWebCoreViewFactory.m:
+ (-[IFWebCoreViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:])
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _startLoading:])
+ * WebView.subproj/IFWebView.mm:
+ (-[IFWebView performDragOperation:])
+
=== Alexander-9 ===
2002-06-19 Richard Williamson (local) <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8bcf2f4..a3e1dd5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,32 @@
+2002-06-20 Kenneth Kocienda <kocienda at apple.com>
+
+ A more complete fix for this bug:
+
+ Radar 2942728 (Link to Yahoo! Finance stocks page fails, says URL is "not a valid location")
+
+ I added a new +(NSURL)_IF_URLWithString: method to IFNSURLExtensions.
+ This is now the suggested way to create a URL from a string.
+
+ * History.subproj/IFURIEntry.m:
+ (-[IFURIEntry initFromDictionaryRepresentation:])
+ * History.subproj/IFURLsWithTitles.m:
+ (+[IFURLsWithTitles URLsFromPasteboard:])
+ * History.subproj/IFWebHistoryPrivate.m:
+ (-[IFWebHistoryPrivate updateURL:title:displayTitle:forURL:])
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView initWithFrame:mimeType:arguments:])
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView initWithFrame:plugin:url:mime:arguments:])
+ (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:])
+ * WebCoreSupport.subproj/IFWebCoreViewFactory.m:
+ (-[IFWebCoreViewFactory viewForPluginWithURL:serviceType:arguments:baseURL:])
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _startLoading:])
+ * WebView.subproj/IFWebView.mm:
+ (-[IFWebView performDragOperation:])
+
=== Alexander-9 ===
2002-06-19 Richard Williamson (local) <rjw at apple.com>
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index 42231a0..c2a8bb5 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -9,6 +9,8 @@
#import "IFURIEntry.h"
#import "WebKitReallyPrivate.h"
+#import <WebFoundation/IFNSURLExtensions.h>
+
@implementation IFURIEntry
-(id)init
@@ -184,7 +186,7 @@
// FIXME: doesn't save/restore images yet
storedURLString = [dict objectForKey: @"url"];
if (storedURLString != nil) {
- _url = [[NSURL URLWithString:storedURLString] retain];
+ _url = [[NSURL _IF_URLWithString:storedURLString] retain];
}
_title = [[dict objectForKey: @"title"] retain];
_displayTitle = [[dict objectForKey: @"displayTitle"] retain];
diff --git a/WebKit/History.subproj/IFURLsWithTitles.m b/WebKit/History.subproj/IFURLsWithTitles.m
index ee487c3..0047a78 100644
--- a/WebKit/History.subproj/IFURLsWithTitles.m
+++ b/WebKit/History.subproj/IFURLsWithTitles.m
@@ -9,6 +9,8 @@
#import "IFURLsWithTitles.h"
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFNSURLExtensions.h>
+
@implementation IFURLsWithTitles
+ (NSArray *)arrayWithIFURLsWithTitlesPboardType
@@ -76,7 +78,7 @@
count = [URLStrings count];
URLs = [NSMutableArray arrayWithCapacity:count];
for (index = 0; index < count; ++index) {
- [URLs addObject:[NSURL URLWithString:[URLStrings objectAtIndex:index]]];
+ [URLs addObject:[NSURL _IF_URLWithString:[URLStrings objectAtIndex:index]]];
}
return URLs;
diff --git a/WebKit/History.subproj/IFWebHistoryPrivate.m b/WebKit/History.subproj/IFWebHistoryPrivate.m
index 1498e14..c909dcf 100644
--- a/WebKit/History.subproj/IFWebHistoryPrivate.m
+++ b/WebKit/History.subproj/IFWebHistoryPrivate.m
@@ -9,6 +9,7 @@
#import "IFWebHistoryPrivate.h"
#import <WebFoundation/IFNSCalendarDateExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
#import <WebKit/WebKitDebug.h>
#import "IFURIEntry.h"
@@ -236,7 +237,7 @@
}
if (newURLString != nil) {
- [entry setURL:[NSURL URLWithString:newURLString]];
+ [entry setURL:[NSURL _IF_URLWithString:newURLString]];
}
if (newTitle != nil) {
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 42231a0..c2a8bb5 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -9,6 +9,8 @@
#import "IFURIEntry.h"
#import "WebKitReallyPrivate.h"
+#import <WebFoundation/IFNSURLExtensions.h>
+
@implementation IFURIEntry
-(id)init
@@ -184,7 +186,7 @@
// FIXME: doesn't save/restore images yet
storedURLString = [dict objectForKey: @"url"];
if (storedURLString != nil) {
- _url = [[NSURL URLWithString:storedURLString] retain];
+ _url = [[NSURL _IF_URLWithString:storedURLString] retain];
}
_title = [[dict objectForKey: @"title"] retain];
_displayTitle = [[dict objectForKey: @"displayTitle"] retain];
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index 1498e14..c909dcf 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -9,6 +9,7 @@
#import "IFWebHistoryPrivate.h"
#import <WebFoundation/IFNSCalendarDateExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
#import <WebKit/WebKitDebug.h>
#import "IFURIEntry.h"
@@ -236,7 +237,7 @@
}
if (newURLString != nil) {
- [entry setURL:[NSURL URLWithString:newURLString]];
+ [entry setURL:[NSURL _IF_URLWithString:newURLString]];
}
if (newTitle != nil) {
diff --git a/WebKit/History.subproj/WebURLsWithTitles.m b/WebKit/History.subproj/WebURLsWithTitles.m
index ee487c3..0047a78 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.m
+++ b/WebKit/History.subproj/WebURLsWithTitles.m
@@ -9,6 +9,8 @@
#import "IFURLsWithTitles.h"
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFNSURLExtensions.h>
+
@implementation IFURLsWithTitles
+ (NSArray *)arrayWithIFURLsWithTitlesPboardType
@@ -76,7 +78,7 @@
count = [URLStrings count];
URLs = [NSMutableArray arrayWithCapacity:count];
for (index = 0; index < count; ++index) {
- [URLs addObject:[NSURL URLWithString:[URLStrings objectAtIndex:index]]];
+ [URLs addObject:[NSURL _IF_URLWithString:[URLStrings objectAtIndex:index]]];
}
return URLs;
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index 0768420..86c63de 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -9,6 +9,8 @@
#import <WebKit/IFWebController.h>
#import <WebKit/IFNSViewExtras.h>
+#import <WebFoundation/IFNSURLExtensions.h>
+
static NSImage *image = nil;
@implementation IFNullPluginView
@@ -30,7 +32,7 @@ static NSImage *image = nil;
pluginPageString = [arguments objectForKey:@"pluginspage"];
if(pluginPageString)
- pluginPage = [[NSURL URLWithString:pluginPageString] retain];
+ pluginPage = [[NSURL _IF_URLWithString:pluginPageString] retain];
if(mime)
mimeType = [mime retain];
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 40efb5d..a7c7e13 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -21,6 +21,7 @@
#import <WebFoundation/IFError.h>
#import <WebFoundation/IFNSStringExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
#import <AppKit/NSWindow_Private.h>
#import <Carbon/Carbon.h>
@@ -295,7 +296,7 @@ static char *newCString(NSString *string)
// get base URL which was added in the args in the part
baseURLString = [arguments objectForKey:@"WebKitBaseURL"];
if (baseURLString)
- baseURL = [[NSURL URLWithString:baseURLString] retain];
+ baseURL = [[NSURL _IF_URLWithString:baseURLString] retain];
isHidden = [arguments objectForKey:@"hidden"] != nil;
@@ -649,9 +650,9 @@ static char *newCString(NSString *string)
NSURL *url;
if([URLString _IF_looksLikeAbsoluteURL])
- url = [NSURL URLWithString:URLString];
+ url = [NSURL _IF_URLWithString:URLString];
else
- url = [NSURL URLWithString:URLString relativeToURL:baseURL];
+ url = [NSURL _IF_URLWithString:URLString relativeToURL:baseURL];
if(!url)
return NPERR_INVALID_URL;
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 0768420..86c63de 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -9,6 +9,8 @@
#import <WebKit/IFWebController.h>
#import <WebKit/IFNSViewExtras.h>
+#import <WebFoundation/IFNSURLExtensions.h>
+
static NSImage *image = nil;
@implementation IFNullPluginView
@@ -30,7 +32,7 @@ static NSImage *image = nil;
pluginPageString = [arguments objectForKey:@"pluginspage"];
if(pluginPageString)
- pluginPage = [[NSURL URLWithString:pluginPageString] retain];
+ pluginPage = [[NSURL _IF_URLWithString:pluginPageString] retain];
if(mime)
mimeType = [mime retain];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 40efb5d..a7c7e13 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -21,6 +21,7 @@
#import <WebFoundation/IFError.h>
#import <WebFoundation/IFNSStringExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
#import <AppKit/NSWindow_Private.h>
#import <Carbon/Carbon.h>
@@ -295,7 +296,7 @@ static char *newCString(NSString *string)
// get base URL which was added in the args in the part
baseURLString = [arguments objectForKey:@"WebKitBaseURL"];
if (baseURLString)
- baseURL = [[NSURL URLWithString:baseURLString] retain];
+ baseURL = [[NSURL _IF_URLWithString:baseURLString] retain];
isHidden = [arguments objectForKey:@"hidden"] != nil;
@@ -649,9 +650,9 @@ static char *newCString(NSString *string)
NSURL *url;
if([URLString _IF_looksLikeAbsoluteURL])
- url = [NSURL URLWithString:URLString];
+ url = [NSURL _IF_URLWithString:URLString];
else
- url = [NSURL URLWithString:URLString relativeToURL:baseURL];
+ url = [NSURL _IF_URLWithString:URLString relativeToURL:baseURL];
if(!url)
return NPERR_INVALID_URL;
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
index 76559aa..053d53d 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
@@ -14,6 +14,8 @@
#import <WebKit/IFWebCoreViewFactory.h>
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFNSURLExtensions.h>
+
@implementation IFWebCoreViewFactory
+ (void)createSharedFactory;
@@ -59,7 +61,7 @@
if (plugin == nil) {
return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
}
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:[NSURL URLWithString:pluginURL] mime:mimeType arguments:arguments] autorelease];
+ return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:[NSURL _IF_URLWithString:pluginURL] mime:mimeType arguments:arguments] autorelease];
}
- (NSArray *)pluginsInfo
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index 76559aa..053d53d 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -14,6 +14,8 @@
#import <WebKit/IFWebCoreViewFactory.h>
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFNSURLExtensions.h>
+
@implementation IFWebCoreViewFactory
+ (void)createSharedFactory;
@@ -59,7 +61,7 @@
if (plugin == nil) {
return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
}
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:[NSURL URLWithString:pluginURL] mime:mimeType arguments:arguments] autorelease];
+ return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:[NSURL _IF_URLWithString:pluginURL] mime:mimeType arguments:arguments] autorelease];
}
- (NSArray *)pluginsInfo
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 78fbc02..f051845 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -258,6 +258,7 @@
F5A7B11B02BC8413018635CA,
);
isa = PBXHeadersBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
};
0867D69EFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -274,6 +275,7 @@
F8CA15C0029A39FC01000122,
);
isa = PBXResourcesBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
};
0867D69FFE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -336,6 +338,7 @@
F5A7B11C02BC8413018635CA,
);
isa = PBXSourcesBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
};
0867D6A0FE84028FC02AAC07 = {
buildActionMask = 2147483647;
@@ -348,12 +351,14 @@
F82162D9029F4FB501000131,
);
isa = PBXFrameworksBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
};
0867D6A2FE84028FC02AAC07 = {
buildActionMask = 2147483647;
files = (
);
isa = PBXRezBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
};
089C1665FE841158C02AAC07 = {
children = (
@@ -433,6 +438,7 @@
isa = PBXShellScriptBuildPhase;
neededFileNames = (
);
+ runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "make embed";
};
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 43cb9ba..919bcc0 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -40,7 +40,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
-- initWithString: (NSString *)string;
+- initNSURL _IF_URLWithString: (NSString *)string;
- initWithLoader: (IFLoader *)loader;
#endif
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 6ff2409..b3611ec 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -21,6 +21,7 @@
#import <WebFoundation/IFError.h>
#import <WebFoundation/IFNSStringExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
#import <WebFoundation/IFURLHandle.h>
#import <kurl.h>
@@ -163,7 +164,7 @@ static NSMutableDictionary *_repTypes=nil;
if ([urlString hasSuffix:@"/"]) {
urlString = [urlString substringToIndex:([urlString length] - 1)];
}
- theURL = [NSURL URLWithString:urlString];
+ theURL = [NSURL _IF_URLWithString:urlString];
_private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self];
[_private->mainHandle addClient: _private->mainURLHandleClient];
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 93f68a3..c3873ff 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -15,6 +15,7 @@
#import <WebKit/IFImageRendererFactory.h>
#import <WebFoundation/IFNSStringExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
@implementation IFWebView
@@ -131,9 +132,9 @@
URL = [NSURL fileURLWithPath:file];
}else if([dragType isEqualToString:@"NSURLPboardType"]){
// FIXME: Is this the right way to get the URL? How to test?
- URL = [NSURL URLWithString:[[sender draggingPasteboard] stringForType:@"NSURLPboardType"]];
+ URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSURLPboardType"]];
}else if([dragType isEqualToString:@"NSStringPboardType"]){
- URL = [NSURL URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
+ URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
}
if(!URL)
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 43cb9ba..919bcc0 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -40,7 +40,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
-- initWithString: (NSString *)string;
+- initNSURL _IF_URLWithString: (NSString *)string;
- initWithLoader: (IFLoader *)loader;
#endif
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 6ff2409..b3611ec 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -21,6 +21,7 @@
#import <WebFoundation/IFError.h>
#import <WebFoundation/IFNSStringExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
#import <WebFoundation/IFURLHandle.h>
#import <kurl.h>
@@ -163,7 +164,7 @@ static NSMutableDictionary *_repTypes=nil;
if ([urlString hasSuffix:@"/"]) {
urlString = [urlString substringToIndex:([urlString length] - 1)];
}
- theURL = [NSURL URLWithString:urlString];
+ theURL = [NSURL _IF_URLWithString:urlString];
_private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self];
[_private->mainHandle addClient: _private->mainURLHandleClient];
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 93f68a3..c3873ff 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -15,6 +15,7 @@
#import <WebKit/IFImageRendererFactory.h>
#import <WebFoundation/IFNSStringExtensions.h>
+#import <WebFoundation/IFNSURLExtensions.h>
@implementation IFWebView
@@ -131,9 +132,9 @@
URL = [NSURL fileURLWithPath:file];
}else if([dragType isEqualToString:@"NSURLPboardType"]){
// FIXME: Is this the right way to get the URL? How to test?
- URL = [NSURL URLWithString:[[sender draggingPasteboard] stringForType:@"NSURLPboardType"]];
+ URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSURLPboardType"]];
}else if([dragType isEqualToString:@"NSStringPboardType"]){
- URL = [NSURL URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
+ URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
}
if(!URL)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list