[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:29:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6d42ee439e14e4c66612c2ad76875dd07fb49c84
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 6 19:54:14 2002 +0000
WebFoundation:
* lots of files: Changed url to URL in many places and renamed URL-related methods.
WebKit:
* lots of files: Changed url to URL in many places and renamed URL-related methods.
WebBrowser:
* lots of files: Changed url to URL in many places and renamed URL-related methods.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1752 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7f180de..76cfcdd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,9 @@
2002-08-06 Darin Adler <darin at apple.com>
+ * lots of files: Changed url to URL in many places and renamed URL-related methods.
+
+2002-08-06 Darin Adler <darin at apple.com>
+
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge dataSourceChanged]): Call setParent:.
* WebView.subproj/WebControllerPrivate.m:
(-[WebControllerPrivate init]): Initialize the text size multiplier to 1.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7f180de..76cfcdd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
2002-08-06 Darin Adler <darin at apple.com>
+ * lots of files: Changed url to URL in many places and renamed URL-related methods.
+
+2002-08-06 Darin Adler <darin at apple.com>
+
* WebCoreSupport.subproj/WebBridge.m: (-[WebBridge dataSourceChanged]): Call setParent:.
* WebView.subproj/WebControllerPrivate.m:
(-[WebControllerPrivate init]): Initialize the text size multiplier to 1.
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 2599d7f..e298613 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -52,7 +52,7 @@
- (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string;
// testing contents for visited-link mechanism
-- (BOOL)containsURL: (NSURL *)url;
+- (BOOL)containsURL: (NSURL *)URL;
// storing contents on disk
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index 07462c6..29182ef 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -111,9 +111,9 @@
#pragma mark URL MATCHING
-- (BOOL)containsURL: (NSURL *)url
+- (BOOL)containsURL: (NSURL *)URL
{
- return [_historyPrivate containsURL: url];
+ return [_historyPrivate containsURL: URL];
}
#pragma mark SAVING TO DISK
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 0e5f861..6acc007 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -7,7 +7,7 @@
@interface WebHistoryItem : NSObject
{
- NSURL *_url;
+ NSURL *_URL;
NSString *_target;
NSString *_parent;
NSString *_title;
@@ -18,17 +18,17 @@
NSString *anchor;
}
-+(WebHistoryItem *)entryWithURL:(NSURL *)url;
++(WebHistoryItem *)entryWithURL:(NSURL *)URL;
- (id)init;
-- (id)initWithURL:(NSURL *)url title:(NSString *)title;
-- (id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
-- (id)initWithURL:(NSURL *)url target: (NSString *)target parent: (NSString *)parent title:(NSString *)title image:(NSImage *)image;
+- (id)initWithURL:(NSURL *)URL title:(NSString *)title;
+- (id)initWithURL:(NSURL *)URL title:(NSString *)title image:(NSImage *)image;
+- (id)initWithURL:(NSURL *)URL target: (NSString *)target parent: (NSString *)parent title:(NSString *)title image:(NSImage *)image;
- (NSDictionary *)dictionaryRepresentation;
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
-- (NSURL *)url;
+- (NSURL *)URL;
- (NSString *)target;
- (NSString *)parent;
- (NSString *)title;
@@ -36,7 +36,7 @@
- (NSImage *)image;
- (NSCalendarDate *)lastVisitedDate;
-- (void)setURL:(NSURL *)url;
+- (void)setURL:(NSURL *)URL;
- (void)setTarget:(NSString *)target;
- (void)setParent:(NSString *)parent;
- (void)setTitle:(NSString *)title;
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 7fd99c2..0d1e8ce 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -11,9 +11,9 @@
@implementation WebHistoryItem
-+(WebHistoryItem *)entryWithURL:(NSURL *)url
++(WebHistoryItem *)entryWithURL:(NSURL *)URL
{
- return [[[self alloc] initWithURL:url title:nil] autorelease];
+ return [[[self alloc] initWithURL:URL title:nil] autorelease];
}
-(id)init
@@ -21,24 +21,24 @@
return [self initWithURL:nil title:nil image:nil];
}
--(id)initWithURL:(NSURL *)url title:(NSString *)title
+-(id)initWithURL:(NSURL *)URL title:(NSString *)title
{
- return [self initWithURL:url target: nil parent: nil title:title image:nil];
+ return [self initWithURL:URL target: nil parent: nil title:title image:nil];
}
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image
+-(id)initWithURL:(NSURL *)URL title:(NSString *)title image:(NSImage *)image
{
- return [self initWithURL:url target: nil parent: nil title:title image:image];
+ return [self initWithURL:URL target: nil parent: nil title:title image:image];
}
--(id)initWithURL:(NSURL *)url target: (NSString *)target parent: (NSString *)parent title:(NSString *)title image:(NSImage *)image
+-(id)initWithURL:(NSURL *)URL target: (NSString *)target parent: (NSString *)parent title:(NSString *)title image:(NSImage *)image
{
if (self != [super init])
{
return nil;
}
- _url = [url retain];
+ _URL = [URL retain];
_target = [target retain];
_parent = [parent retain];
_title = [title retain];
@@ -50,7 +50,7 @@
- (void)dealloc
{
- [_url release];
+ [_URL release];
[_target release];
[_parent release];
[_title release];
@@ -61,9 +61,9 @@
[super dealloc];
}
--(NSURL *)url
+-(NSURL *)URL
{
- return _url;
+ return _URL;
}
-(NSString *)target
@@ -100,11 +100,11 @@
return _lastVisitedDate;
}
--(void)setURL:(NSURL *)url
+-(void)setURL:(NSURL *)URL
{
- if (url != _url) {
- [_url release];
- _url = [url retain];
+ if (URL != _URL) {
+ [_URL release];
+ _URL = [URL retain];
}
}
@@ -168,7 +168,7 @@
-(unsigned)hash
{
- return [_url hash];
+ return [_URL hash];
}
- (NSString *)anchor
@@ -191,7 +191,7 @@
result = NO;
if ([anObject isMemberOfClass:[WebHistoryItem class]]) {
- result = [_url isEqual:[anObject url]];
+ result = [_URL isEqual:[anObject URL]];
}
return result;
@@ -199,7 +199,7 @@
-(NSString *)description
{
- return [NSString stringWithFormat:@"WebHistoryItem %@", _url];
+ return [NSString stringWithFormat:@"WebHistoryItem %@", _URL];
}
@@ -208,8 +208,8 @@
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity: 6];
// FIXME: doesn't save/restore images yet
- if (_url != nil) {
- [dict setObject: [_url absoluteString] forKey: @"url"];
+ if (_URL != nil) {
+ [dict setObject: [_URL absoluteString] forKey: @""];
}
if (_title != nil) {
[dict setObject: _title forKey: @"title"];
@@ -232,9 +232,9 @@
[super init];
// FIXME: doesn't save/restore images yet
- storedURLString = [dict objectForKey: @"url"];
+ storedURLString = [dict objectForKey: @""];
if (storedURLString != nil) {
- _url = [[NSURL _web_URLWithString:storedURLString] retain];
+ _URL = [[NSURL _web_URLWithString:storedURLString] retain];
}
_title = [[dict objectForKey: @"title"] copy];
_displayTitle = [[dict objectForKey: @"displayTitle"] copy];
diff --git a/WebKit/History.subproj/WebHistoryList.h b/WebKit/History.subproj/WebHistoryList.h
index 05f2ffa..0ac5ebb 100644
--- a/WebKit/History.subproj/WebHistoryList.h
+++ b/WebKit/History.subproj/WebHistoryList.h
@@ -27,12 +27,12 @@ typedef struct WebHistoryListNode WebHistoryListNode;
-(int)maximumSize;
-(void)setMaximumSize:(int)size;
--(WebHistoryItem *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(WebHistoryItem *)addURL:(NSURL *)URL withTitle:(NSString *)title;
-(void)addEntry:(WebHistoryItem *)entry;
--(WebHistoryItem *)removeURL:(NSURL *)url;
+-(WebHistoryItem *)removeURL:(NSURL *)URL;
-(BOOL)removeEntry:(WebHistoryItem *)entry;
--(WebHistoryItem *)entryForURL:(NSURL *)url;
+-(WebHistoryItem *)entryForURL:(NSURL *)URL;
-(WebHistoryItem *)entryAtIndex:(int)index;
-(WebHistoryItem *)removeEntryAtIndex:(int)index;
-(void)removeEntriesToIndex:(int)index;
diff --git a/WebKit/History.subproj/WebHistoryList.m b/WebKit/History.subproj/WebHistoryList.m
index e1c6eca..83d4a28 100644
--- a/WebKit/History.subproj/WebHistoryList.m
+++ b/WebKit/History.subproj/WebHistoryList.m
@@ -102,11 +102,11 @@ static void freeNode(WebHistoryListNode *node)
--(WebHistoryItem *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(WebHistoryItem *)addURL:(NSURL *)URL withTitle:(NSString *)title;
{
WebHistoryItem *result;
- result = [[WebHistoryItem alloc] initWithURL:url title:title];
+ result = [[WebHistoryItem alloc] initWithURL:URL title:title];
[self addEntry:result];
return result;
@@ -120,7 +120,7 @@ static void freeNode(WebHistoryListNode *node)
if (!_allowsDuplicates) {
// search the list first and remove any entry with the same URL
// having the same title does not count
- // use the hash codes of the urls to speed up the linear search
+ // use the hash codes of the URLs to speed up the linear search
hash = [entry hash];
for (node = _head; node != nil; node = node->next) {
if (hash == node->hash && [entry isEqual:node->entry]) {
@@ -166,17 +166,17 @@ static void freeNode(WebHistoryListNode *node)
}
}
--(WebHistoryItem *)removeURL:(NSURL *)url
+-(WebHistoryItem *)removeURL:(NSURL *)URL
{
WebHistoryItem *removedEntry;
WebHistoryListNode *node;
unsigned hash;
removedEntry = nil;
- hash = [url hash];
+ hash = [URL hash];
for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [url isEqual:[node->entry url]]) {
+ if (hash == node->hash && [URL isEqual:[node->entry URL]]) {
_count--;
removedEntry = node->entry;
if (node == _head) {
@@ -240,17 +240,17 @@ static void freeNode(WebHistoryListNode *node)
return removed;
}
--(WebHistoryItem *)entryForURL:(NSURL *)url
+-(WebHistoryItem *)entryForURL:(NSURL *)URL
{
WebHistoryItem *foundEntry;
WebHistoryListNode *node;
unsigned hash;
foundEntry = nil;
- hash = [url hash];
+ hash = [URL hash];
for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [url isEqual:[node->entry url]]) {
+ if (hash == node->hash && [URL isEqual:[node->entry URL]]) {
foundEntry = node->entry;
break;
}
diff --git a/WebKit/History.subproj/WebHistoryPrivate.h b/WebKit/History.subproj/WebHistoryPrivate.h
index 8e08f52..09bc834 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.h
+++ b/WebKit/History.subproj/WebHistoryPrivate.h
@@ -12,7 +12,7 @@
@interface WebHistoryPrivate : NSObject {
@private
- NSMutableDictionary *_urlDictionary;
+ NSMutableDictionary *_entriesByURL;
NSMutableArray *_datesWithEntries;
NSMutableArray *_entriesByDate;
NSString *_file;
@@ -34,7 +34,7 @@
- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)calendarDate;
- (NSArray *)entriesWithAddressContainingString: (NSString *)string;
- (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string;
-- (BOOL)containsURL: (NSURL *)url;
+- (BOOL)containsURL: (NSURL *)URL;
- (NSString *)file;
- (BOOL)loadHistory;
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index c724242..daa27a9 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -14,7 +14,7 @@
#import "WebHistoryItem.h"
@interface WebHistoryPrivate (Private)
--(WebHistoryItem *)_entryForURLString:(NSString *)urlString;
+-(WebHistoryItem *)_entryForURLString:(NSString *)URLString;
@end
@implementation WebHistoryPrivate
@@ -36,7 +36,7 @@
return nil;
}
- _urlDictionary = [[NSMutableDictionary alloc] init];
+ _entriesByURL = [[NSMutableDictionary alloc] init];
_datesWithEntries = [[NSMutableArray alloc] init];
_entriesByDate = [[NSMutableArray alloc] init];
_file = [file retain];
@@ -49,7 +49,7 @@
- (void)dealloc
{
- [_urlDictionary release];
+ [_entriesByURL release];
[_datesWithEntries release];
[_entriesByDate release];
[_file release];
@@ -104,19 +104,19 @@
[entriesForDate insertObject: entry atIndex: index];
}
-- (BOOL)removeEntryForURLString: (NSString *)urlString
+- (BOOL)removeEntryForURLString: (NSString *)URLString
{
NSMutableArray *entriesForDate;
WebHistoryItem *entry;
int dateIndex;
BOOL foundDate;
- entry = [_urlDictionary objectForKey: urlString];
+ entry = [_entriesByURL objectForKey: URLString];
if (entry == nil) {
return NO;
}
- [_urlDictionary removeObjectForKey: urlString];
+ [_entriesByURL removeObjectForKey: URLString];
foundDate = [self findIndex: &dateIndex forDay: [entry lastVisitedDate]];
@@ -138,12 +138,12 @@
- (void)addEntry: (WebHistoryItem *)entry
{
int dateIndex;
- NSString *urlString;
+ NSString *URLString;
WEBKIT_ASSERT_VALID_ARG (entry, [entry lastVisitedDate] != nil);
- urlString = [[entry url] absoluteString];
- [self removeEntryForURLString: urlString];
+ URLString = [[entry URL] absoluteString];
+ [self removeEntryForURLString: URLString];
if ([self findIndex: &dateIndex forDay: [entry lastVisitedDate]]) {
// other entries already exist for this date
@@ -154,25 +154,25 @@
[_entriesByDate insertObject: [NSMutableArray arrayWithObject:entry] atIndex: dateIndex];
}
- [_urlDictionary setObject: entry forKey: urlString];
+ [_entriesByURL setObject: entry forKey: URLString];
}
- (BOOL)removeEntry: (WebHistoryItem *)entry
{
WebHistoryItem *matchingEntry;
- NSString *urlString;
+ NSString *URLString;
- urlString = [[entry url] absoluteString];
+ URLString = [[entry URL] absoluteString];
// If this exact object isn't stored, then make no change.
// FIXME: Is this the right behavior if this entry isn't present, but another entry for the same URL is?
// Maybe need to change the API to make something like removeEntryForURLString public instead.
- matchingEntry = [_urlDictionary objectForKey: urlString];
+ matchingEntry = [_entriesByURL objectForKey: URLString];
if (matchingEntry != entry) {
return NO;
}
- [self removeEntryForURLString: urlString];
+ [self removeEntryForURLString: URLString];
return YES;
}
@@ -195,13 +195,13 @@
- (BOOL)removeAllEntries
{
- if ([_urlDictionary count] == 0) {
+ if ([_entriesByURL count] == 0) {
return NO;
}
[_entriesByDate removeAllObjects];
[_datesWithEntries removeAllObjects];
- [_urlDictionary removeAllObjects];
+ [_entriesByURL removeAllObjects];
return YES;
}
@@ -285,14 +285,14 @@
#pragma mark URL MATCHING
--(WebHistoryItem *)_entryForURLString:(NSString *)urlString
+-(WebHistoryItem *)_entryForURLString:(NSString *)URLString
{
- return [_urlDictionary objectForKey: urlString];
+ return [_entriesByURL objectForKey: URLString];
}
-- (BOOL)containsURL: (NSURL *)url
+- (BOOL)containsURL: (NSURL *)URL
{
- return [self _entryForURLString:[url absoluteString]] != nil;
+ return [self _entryForURLString:[URL absoluteString]] != nil;
}
#pragma mark ARCHIVING/UNARCHIVING
@@ -397,8 +397,8 @@
entry = [[[WebHistoryItem alloc] initFromDictionaryRepresentation: dictionary] autorelease];
- if ([entry url] == nil) {
- // entry without url is useless; data on disk must have been bad; ignore this one
+ if ([entry URL] == nil) {
+ // entry without URL is useless; data on disk must have been bad; ignore this one
continue;
}
diff --git a/WebKit/Misc.subproj/WebDownloadHandler.m b/WebKit/Misc.subproj/WebDownloadHandler.m
index 4b64e3d..d8a15da 100644
--- a/WebKit/Misc.subproj/WebDownloadHandler.m
+++ b/WebKit/Misc.subproj/WebDownloadHandler.m
@@ -18,7 +18,7 @@
[super init];
dataSource = [dSource retain];
- WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download started for: %s", [[[dSource inputURL] absoluteString] cString]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download started for: %s", [[[dSource originalURL] absoluteString] cString]);
return self;
}
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 3176443..9f02a4f 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -16,7 +16,7 @@
@public
WebResourceHandle *resourceHandle;
id delegate;
- NSURL *url;
+ NSURL *URL;
}
@end;
@@ -25,7 +25,7 @@
- (void)dealloc
{
- [url release];
+ [URL release];
[resourceHandle release];
[super dealloc];
}
@@ -57,7 +57,7 @@
{
[super init];
_private = [[WebIconLoaderPrivate alloc] init];
- _private->url = [iconURL retain];
+ _private->URL = [iconURL retain];
return self;
}
@@ -74,7 +74,7 @@
- (void)startLoading
{
- _private->resourceHandle = [[WebResourceHandle alloc] initWithURL:_private->url];
+ _private->resourceHandle = [[WebResourceHandle alloc] initWithURL:_private->URL];
[_private->resourceHandle addClient:self];
[_private->resourceHandle loadInBackground];
}
@@ -108,20 +108,16 @@
}
}
-
- (void)WebResourceHandle:(WebResourceHandle *)sender dataDidBecomeAvailable:(NSData *)data
{
-
}
- (void)WebResourceHandle:(WebResourceHandle *)sender didFailLoadingWithResult:(WebError *)result
{
-
}
-- (void)WebResourceHandle:(WebResourceHandle *)sender didRedirectToURL:(NSURL *)url
+- (void)WebResourceHandle:(WebResourceHandle *)sender didRedirectToURL:(NSURL *)URL
{
-
}
@end
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 3867a52..aa0a9c2 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -82,7 +82,7 @@
// failure count (if the user tried and failed, the dialog should
// explain possible reasons)
// FIXME Radar 2876446: need to automatically adjust height of main label
- [mainLabel setStringValue:[NSString stringWithFormat:@"To view this page, you need to log in to area \"%@\" on %@.", [req realm], [[req url] host]]];
+ [mainLabel setStringValue:[NSString stringWithFormat:@"To view this page, you need to log in to area \"%@\" on %@.", [req realm], [[req URL] host]]];
if ([req willPasswordBeSentInClear]) {
[smallLabel setStringValue:@"Your password will be sent in the clear."];
} else {
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 4d16d38..7013ee9 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -34,7 +34,7 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
// WebAuthenticationHandler methods
-(BOOL)readyToStartAuthentication:(WebAuthenticationRequest *)request
{
- id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
if (window == nil) {
window = WebModalDialogPretendWindow;
@@ -45,7 +45,7 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
-(void)startAuthentication:(WebAuthenticationRequest *)request
{
- id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
if (window == nil) {
window = WebModalDialogPretendWindow;
diff --git a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
index e09effc..dfee2d7 100644
--- a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
+++ b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
@@ -34,7 +34,7 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
// WebCookieAcceptHandler methods
-(BOOL)readyToStartCookieAcceptCheck:(WebCookieAcceptRequest *)request
{
- id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
if (window == nil) {
window = WebModalDialogPretendWindow;
@@ -45,7 +45,7 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
-(void)startCookieAcceptCheck:(WebCookieAcceptRequest *)request
{
- id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
if (window == nil) {
window = WebModalDialogPretendWindow;
@@ -63,12 +63,12 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
panel = NSGetAlertPanel(@"Accept cookie?",
@"Server \"%@\" has sent 1 cookie.",
@"Accept", @"Reject", nil,
- [[request url] host]);
+ [[request URL] host]);
} else {
panel = NSGetAlertPanel(@"Accept cookies?",
@"Server \"%@\" has sent %d cookies.",
@"Accept", @"Reject", nil,
- [[request url] host], [[request cookies] count]);
+ [[request URL] host], [[request cookies] count]);
}
[requestToWindow _web_setObject:window forUncopiedKey:request];
@@ -78,9 +78,9 @@ static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
[self doneWithCheck:panel returnCode:[NSApp runModalForWindow:panel] contextInfo:request];
} else {
if ([[request cookies] count] == 1) {
- NSBeginAlertSheet(@"Accept cookie?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent 1 cookie.", [[request url] host]);
+ NSBeginAlertSheet(@"Accept cookie?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent 1 cookie.", [[request URL] host]);
} else {
- NSBeginAlertSheet(@"Accept cookies?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent %d cookies.", [[request url] host], [[request cookies] count]);
+ NSBeginAlertSheet(@"Accept cookies?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent %d cookies.", [[request URL] host], [[request cookies] count]);
}
panel = [window attachedSheet];
[requestToWindow _web_setObject:window forUncopiedKey:request];
diff --git a/WebKit/Panels.subproj/WebStandardPanels.h b/WebKit/Panels.subproj/WebStandardPanels.h
index 08dcf68..b9fe603 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.h
+++ b/WebKit/Panels.subproj/WebStandardPanels.h
@@ -21,9 +21,9 @@
-(void)setUseStandardCookieAcceptPanel:(BOOL)use;
-(BOOL)useStandardCookieAcceptPanel;
--(void)didStartLoadingURL:(NSURL *)url inWindow:(NSWindow *)window;
--(void)didStopLoadingURL:(NSURL *)url inWindow:(NSWindow *)window;
+-(void)didStartLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window;
+-(void)didStopLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window;
--(NSWindow *)frontmostWindowLoadingURL:(NSURL *)url;
+-(NSWindow *)frontmostWindowLoadingURL:(NSURL *)URL;
@end
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index 3d392db..d65b9fc 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -20,7 +20,7 @@
@public
WebPanelAuthenticationHandler *panelAuthenticationHandler;
WebPanelCookieAcceptHandler *panelCookieAcceptHandler;
- NSMutableDictionary *urlContainers;
+ NSMutableDictionary *URLContainers;
}
@end
@@ -30,14 +30,14 @@
{
self = [super init];
if (self != nil) {
- urlContainers = [[NSMutableDictionary alloc] init];
+ URLContainers = [[NSMutableDictionary alloc] init];
}
return self;
}
-(void)dealloc
{
- [urlContainers release];
+ [URLContainers release];
[panelAuthenticationHandler release];
[super dealloc];
}
@@ -125,21 +125,21 @@ static void initSharedStandardPanels(void)
return _privatePanels->panelCookieAcceptHandler != nil;
}
--(void)didStartLoadingURL:(NSURL *)url inWindow:(NSWindow *)window
+-(void)didStartLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window
{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
+ NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
set = [NSCountedSet set];
- [_privatePanels->urlContainers setObject:set forKey:url];
+ [_privatePanels->URLContainers setObject:set forKey:URL];
}
[set addObject:window];
}
--(void)didStopLoadingURL:(NSURL *)url inWindow:(NSWindow *)window
+-(void)didStopLoadingURL:(NSURL *)URL inWindow:(NSWindow *)window
{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
+ NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
return;
@@ -148,25 +148,25 @@ static void initSharedStandardPanels(void)
[set removeObject:window];
if ([set count] == 0) {
- [_privatePanels->urlContainers removeObjectForKey:url];
+ [_privatePanels->URLContainers removeObjectForKey:URL];
}
}
--(void)_didStartLoadingURL:(NSURL *)url inController:(WebController *)controller
+-(void)_didStartLoadingURL:(NSURL *)URL inController:(WebController *)controller
{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
+ NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
set = [NSCountedSet set];
- [_privatePanels->urlContainers setObject:set forKey:url];
+ [_privatePanels->URLContainers setObject:set forKey:URL];
}
[set addObject:controller];
}
--(void)_didStopLoadingURL:(NSURL *)url inController:(WebController *)controller
+-(void)_didStopLoadingURL:(NSURL *)URL inController:(WebController *)controller
{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
+ NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
return;
@@ -175,7 +175,7 @@ static void initSharedStandardPanels(void)
[set removeObject:controller];
if ([set count] == 0) {
- [_privatePanels->urlContainers removeObjectForKey:url];
+ [_privatePanels->URLContainers removeObjectForKey:URL];
}
}
@@ -193,9 +193,9 @@ static BOOL WindowInFront(NSWindow *a, NSWindow *b)
// void NSWindowListForContext(int context, int size, int list[])
}
--(NSWindow *)frontmostWindowLoadingURL:(NSURL *)url
+-(NSWindow *)frontmostWindowLoadingURL:(NSURL *)URL
{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
+ NSCountedSet *set = [_privatePanels->URLContainers objectForKey:URL];
if (set == nil) {
return nil;
diff --git a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
index cf2a27b..003e3ff 100644
--- a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
+++ b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
@@ -9,7 +9,7 @@
@interface WebStandardPanels (Private)
--(void)_didStartLoadingURL:(NSURL *)url inController:(WebController *)controller;
--(void)_didStopLoadingURL:(NSURL *)url inController:(WebController *)controller;
+-(void)_didStartLoadingURL:(NSURL *)URL inController:(WebController *)controller;
+-(void)_didStopLoadingURL:(NSURL *)URL inController:(WebController *)controller;
@end
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 43676e0..7c6656f 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -83,7 +83,7 @@ static NSString *getCarbonPath(NSString *posixPath);
[fileManager removeFileAtPath:path handler:nil];
[path release];
}
- free((void *)npStream.url);
+ free((void *)npStream.URL);
[URL release];
[attributes release];
[super dealloc];
@@ -117,12 +117,12 @@ static NSString *getCarbonPath(NSString *posixPath);
- (void)setUpGlobalsWithHandle:(WebResourceHandle *)handle
{
- NSString *URLString = [[handle url] absoluteString];
+ NSString *URLString = [[handle URL] absoluteString];
char *cURL = (char *)malloc([URLString cStringLength]+1);
[URLString getCString:cURL];
npStream.ndata = self;
- npStream.url = cURL;
+ npStream.URL = cURL;
npStream.end = 0;
npStream.lastmodified = 0;
npStream.notifyData = notifyData;
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 7e191aa..68adfb0 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -53,7 +53,7 @@
NPP_SetValueProcPtr NPP_SetValue;
}
-- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
+- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin URL:(NSURL *)URL baseURL:(NSURL *)baseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
-(void)stop;
- (WebDataSource *)webDataSource;
- (WebController *)webController;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 92cfee8..b0e7ac1 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -337,7 +337,7 @@
#pragma mark WEB_PLUGIN_VIEW
-- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
+- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin URL:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
{
[super initWithFrame:r];
@@ -745,11 +745,11 @@
WebFrameState frameState;
NSValue *notifyDataValue;
void *notifyData;
- NSURL *url;
+ NSURL *URL;
frame = [notification object];
- url = [[frame dataSource] inputURL];
- notifyDataValue = [notificationData objectForKey:url];
+ URL = [[frame dataSource] originalURL];
+ notifyDataValue = [notificationData objectForKey:URL];
if(!notifyDataValue)
return;
@@ -757,7 +757,7 @@
notifyData = [notifyDataValue pointerValue];
frameState = [[[notification userInfo] objectForKey:WebCurrentFrameState] intValue];
if (frameState == WebFrameStateComplete) {
- NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
+ NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
}
//FIXME: Need to send other NPReasons
}
@@ -769,18 +769,18 @@
WebPluginStream *stream;
WebDataSource *dataSource;
WebFrame *frame;
- NSURL *url;
+ NSURL *URL;
if([URLString _web_looksLikeAbsoluteURL])
- url = [NSURL _web_URLWithString:URLString];
+ URL = [NSURL _web_URLWithString:URLString];
else
- url = [NSURL _web_URLWithString:URLString relativeToURL:baseURL];
+ URL = [NSURL _web_URLWithString:URLString relativeToURL:baseURL];
- if(!url)
+ if(!URL)
return NPERR_INVALID_URL;
if(!target){
- stream = [[WebPluginStream alloc] initWithURL:url pluginPointer:instance notifyData:notifyData attributes:attributes];
+ stream = [[WebPluginStream alloc] initWithURL:URL pluginPointer:instance notifyData:notifyData attributes:attributes];
if(stream){
[stream startLoad];
[streams addObject:stream];
@@ -791,17 +791,17 @@
}else{
frame = [webFrame frameNamed:target];
if(!frame){
- [[webController windowContext] openNewWindowWithURL:url];
+ [[webController windowContext] openNewWindowWithURL:URL];
// FIXME: Need to send NPP_URLNotify at the right time.
// FIXME: Need to name new frame
if(notifyData)
- NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
+ NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
}else{
if(notifyData){
if(![target isEqualToString:@"_self"] && ![target isEqualToString:@"_current"] &&
![target isEqualToString:@"_parent"] && ![target isEqualToString:@"_top"]){
- [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
+ [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:URL];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(frameStateChanged:) name:WebFrameStateChangedNotification object:frame];
}
@@ -809,7 +809,7 @@
// but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
// so we have to allow this as well. Needed for iTools.
}
- dataSource = [[WebDataSource alloc] initWithURL:url attributes:attributes];
+ dataSource = [[WebDataSource alloc] initWithURL:URL attributes:attributes];
if ([frame setProvisionalDataSource:dataSource]) {
[frame startLoading];
}
@@ -819,46 +819,46 @@
return NPERR_NO_ERROR;
}
--(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData
+-(NPError)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData
{
NSString *theTarget = nil;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURLNotify: %s target: %s\n", url, target);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURLNotify: %s target: %s\n", URL, target);
- if(!url)
+ if(!URL)
return NPERR_INVALID_URL;
if(target)
theTarget = [NSString stringWithCString:target];
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:notifyData andHandleAttributes:nil];
+ return [self loadURL:[NSString stringWithCString:URL] inTarget:theTarget withNotifyData:notifyData andHandleAttributes:nil];
}
--(NPError)getURL:(const char *)url target:(const char *)target
+-(NPError)getURL:(const char *)URL target:(const char *)target
{
NSString *theTarget = nil;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURL: %s target: %s\n", url, target);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURL: %s target: %s\n", URL, target);
- if(!url)
+ if(!URL)
return NPERR_INVALID_URL;
if(target)
theTarget = [NSString stringWithCString:target];
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:NULL andHandleAttributes:nil];
+ return [self loadURL:[NSString stringWithCString:URL] inTarget:theTarget withNotifyData:NULL andHandleAttributes:nil];
}
--(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
+-(NPError)postURLNotify:(const char *)URL target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
{
NSDictionary *attributes=nil;
NSData *postData;
NSURL *tempURL;
NSString *path, *theTarget = nil;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURLNotify: %s\n", url);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURLNotify: %s\n", URL);
- if(!url)
+ if(!URL)
return NPERR_INVALID_URL;
if(target)
@@ -866,7 +866,7 @@
if(file){
if([[NSString stringWithCString:buf] _web_looksLikeAbsoluteURL]){
- tempURL = [NSURL fileURLWithPath:[NSString stringWithCString:url]];
+ tempURL = [NSURL fileURLWithPath:[NSString stringWithCString:URL]];
path = [tempURL path];
}else{
path = [NSString stringWithCString:buf];
@@ -880,23 +880,23 @@
postData, WebHTTPResourceHandleRequestData,
@"POST", WebHTTPResourceHandleRequestMethod, nil];
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget
+ return [self loadURL:[NSString stringWithCString:URL] inTarget:theTarget
withNotifyData:notifyData andHandleAttributes:attributes];
}
--(NPError)postURL:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file
+-(NPError)postURL:(const char *)URL target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file
{
NSString *theTarget = nil;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURL: %s\n", url);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURL: %s\n", URL);
- if(!url)
+ if(!URL)
return NPERR_INVALID_URL;
if(target)
theTarget = [NSString stringWithCString:target];
- return [self postURLNotify:url target:target len:len buf:buf file:file notifyData:NULL];
+ return [self postURLNotify:URL target:target len:len buf:buf file:file notifyData:NULL];
}
-(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
diff --git a/WebKit/Plugins.subproj/npapi.h b/WebKit/Plugins.subproj/npapi.h
index 50cdcaa..c26a3d1 100644
--- a/WebKit/Plugins.subproj/npapi.h
+++ b/WebKit/Plugins.subproj/npapi.h
@@ -88,7 +88,7 @@ typedef struct _NPStream
{
void* pdata; /* plug-in private data */
void* ndata; /* netscape private data */
- const char* url;
+ const char* URL;
uint32 end;
uint32 lastmodified;
void* notifyData;
@@ -201,8 +201,8 @@ typedef struct _NPPrint
} NPPrint;
-typedef NPError (*NPN_GetURLNotifyProcPtr)(NPP instance, const char* url, const char* window, void* notifyData);
-typedef NPError (*NPN_PostURLNotifyProcPtr)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData);
+typedef NPError (*NPN_GetURLNotifyProcPtr)(NPP instance, const char* URL, const char* window, void* notifyData);
+typedef NPError (*NPN_PostURLNotifyProcPtr)(NPP instance, const char* URL, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData);
typedef NPError (*NPN_RequestReadProcPtr)(NPStream* stream, NPByteRange* rangeList);
typedef NPError (*NPN_NewStreamProcPtr)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
typedef int32 (*NPN_WriteProcPtr)(NPP instance, NPStream* stream, int32 len, void* buffer);
@@ -218,8 +218,8 @@ typedef NPError (*NPN_SetValueProcPtr)(NPP instance, NPPVariable variable, void
typedef void (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect);
typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
typedef void (*NPN_ForceRedrawProcPtr)(NPP instance);
-typedef NPError (*NPN_GetURLProcPtr)(NPP instance, const char* url, const char* window);
-typedef NPError (*NPN_PostURLProcPtr)(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file);
+typedef NPError (*NPN_GetURLProcPtr)(NPP instance, const char* URL, const char* window);
+typedef NPError (*NPN_PostURLProcPtr)(NPP instance, const char* URL, const char* window, uint32 len, const char* buf, NPBool file);
typedef void* (*NPN_GetJavaEnvProcPtr)(void);
typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance);
@@ -233,7 +233,7 @@ typedef int16 (*NPP_WriteReadyProcPtr)(NPP instance, NPStream* stream);
typedef int16 (*NPP_WriteProcPtr)(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
typedef void (*NPP_PrintProcPtr)(NPP instance, NPPrint* platformPrint);
typedef int16 (*NPP_HandleEventProcPtr)(NPP instance, void* event);
-typedef void (*NPP_URLNotifyProcPtr)(NPP instance, const char* url, NPReason reason, void* notifyData);
+typedef void (*NPP_URLNotifyProcPtr)(NPP instance, const char* URL, NPReason reason, void* notifyData);
typedef NPError (*NPP_GetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_alue);
typedef NPError (*NPP_SetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_alue);
typedef void (*NPP_ShutdownProcPtr)(void);
@@ -346,10 +346,10 @@ typedef NPError (* getEntryPointsFuncPtr)(NPPluginFuncs*);
*/
void NPN_Version(int* plugin_major, int* plugin_minor, int* netscape_major, int* netscape_minor);
-NPError NPN_GetURLNotify(NPP instance, const char* url, const char* target, void* notifyData);
-NPError NPN_GetURL(NPP instance, const char* url, const char* target);
-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData);
-NPError NPN_PostURL(NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file);
+NPError NPN_GetURLNotify(NPP instance, const char* URL, const char* target, void* notifyData);
+NPError NPN_GetURL(NPP instance, const char* URL, const char* target);
+NPError NPN_PostURLNotify(NPP instance, const char* URL, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData);
+NPError NPN_PostURL(NPP instance, const char* URL, const char* target, uint32 len, const char* buf, NPBool file);
NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList);
NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* target, NPStream** stream);
int32 NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer);
@@ -387,7 +387,7 @@ int32 NPP_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void*
void NPP_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
void NPP_Print(NPP instance, NPPrint* platformPrint);
int16 NPP_HandleEvent(NPP instance, void* event);
-void NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData);
+void NPP_URLNotify(NPP instance, const char* URL, NPReason reason, void* notifyData);
NPError NPP_GetValue(void *instance, NPPVariable variable, void *value);
NPError NPP_SetValue(void *instance, NPNVariable variable, void *value);
*/
diff --git a/WebKit/Plugins.subproj/npapi.m b/WebKit/Plugins.subproj/npapi.m
index 6136a9b..623899e 100644
--- a/WebKit/Plugins.subproj/npapi.m
+++ b/WebKit/Plugins.subproj/npapi.m
@@ -27,10 +27,10 @@
#import "WebKitDebug.h"
@interface WebPluginView : NSObject
--(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData;
--(NPError)getURL:(const char *)url target:(const char *)target;
--(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData;
--(NPError)postURL:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file;
+-(NPError)getURLNotify:(const char *)URL target:(const char *)target notifyData:(void *)notifyData;
+-(NPError)getURL:(const char *)URL target:(const char *)target;
+-(NPError)postURLNotify:(const char *)URL target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData;
+-(NPError)postURL:(const char *)URL target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file;
-(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream;
-(NPError)write:(NPStream*)stream len:(SInt32)len buffer:(void *)buffer;
-(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason;
@@ -84,28 +84,28 @@ NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
// instance-specific functions
-NPError NPN_GetURLNotify(NPP instance, const char* url, const char* target, void* notifyData)
+NPError NPN_GetURLNotify(NPP instance, const char* URL, const char* target, void* notifyData)
{
WebPluginView *plugin = (WebPluginView *)instance->ndata;
- return [plugin getURLNotify:url target:target notifyData:notifyData];
+ return [plugin getURLNotify:URL target:target notifyData:notifyData];
}
-NPError NPN_GetURL(NPP instance, const char* url, const char* target)
+NPError NPN_GetURL(NPP instance, const char* URL, const char* target)
{
WebPluginView *plugin = (WebPluginView *)instance->ndata;
- return [plugin getURL:url target:target];
+ return [plugin getURL:URL target:target];
}
-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* target, UInt32 len, const char* buf, NPBool file, void* notifyData)
+NPError NPN_PostURLNotify(NPP instance, const char* URL, const char* target, UInt32 len, const char* buf, NPBool file, void* notifyData)
{
WebPluginView *plugin = (WebPluginView *)instance->ndata;
- return [plugin postURLNotify:url target:target len:len buf:buf file:file notifyData:notifyData];
+ return [plugin postURLNotify:URL target:target len:len buf:buf file:file notifyData:notifyData];
}
-NPError NPN_PostURL(NPP instance, const char* url, const char* target, UInt32 len, const char* buf, NPBool file)
+NPError NPN_PostURL(NPP instance, const char* URL, const char* target, UInt32 len, const char* buf, NPBool file)
{
WebPluginView *plugin = (WebPluginView *)instance->ndata;
- return [plugin postURL:url target:target len:len buf:buf file:file];
+ return [plugin postURL:URL target:target len:len buf:buf file:file];
}
NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* target, NPStream** stream)
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 584ebaa..eb7cb42 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -85,11 +85,11 @@
return YES;
}
-- (WebCoreBridge *)openNewWindowWithURL:(NSURL *)url
+- (WebCoreBridge *)openNewWindowWithURL:(NSURL *)URL
{
WEBKIT_ASSERT(frame != nil);
- WebController *newController = [[[frame controller] windowContext] openNewWindowWithURL:url];
+ WebController *newController = [[[frame controller] windowContext] openNewWindowWithURL:URL];
WebFrame *newFrame = [newController mainFrame];
return [newFrame _bridge];
@@ -256,14 +256,14 @@
return [WebHTMLView _modifierTrackingEnabled];
}
-- (void)setIconURL:(NSURL *)url
+- (void)setIconURL:(NSURL *)URL
{
- [[self dataSource] _setIconURL:url];
+ [[self dataSource] _setIconURL:URL];
}
-- (void)setIconURL:(NSURL *)url withType:(NSString *)type
+- (void)setIconURL:(NSURL *)URL withType:(NSString *)type
{
- [[self dataSource] _setIconURL:url withType:type];
+ [[self dataSource] _setIconURL:URL withType:type];
}
- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent
@@ -303,12 +303,12 @@
fromDataSource:[self dataSource]];
}
-- (void)addBackForwardItemWithURL:(NSURL *)url anchor:(NSString *)anchor;
+- (void)addBackForwardItemWithURL:(NSURL *)URL anchor:(NSString *)anchor;
{
WebHistoryItem *backForwardItem;
WebFrame *parentFrame = [[frame controller] frameForDataSource:[[frame dataSource] parent]];
- backForwardItem = [[WebHistoryItem alloc] initWithURL:url target:[frame name] parent:[parentFrame name] title:[[frame dataSource] pageTitle] image:nil];
+ backForwardItem = [[WebHistoryItem alloc] initWithURL:URL target:[frame name] parent:[parentFrame name] title:[[frame dataSource] pageTitle] image:nil];
[backForwardItem setAnchor:anchor];
[[[frame controller] backForwardList] addEntry:backForwardItem];
[backForwardItem release];
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h
index 8ad49ad..31fab66 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h
@@ -16,8 +16,8 @@
+ (void)createSharedAdapter;
- (BOOL)cookiesEnabled;
-- (NSString *)cookiesForURL:(NSURL *)url;
-- (void)setCookies:(NSString *)cookies forURL:(NSURL *)url;
+- (NSString *)cookiesForURL:(NSURL *)URL;
+- (void)setCookies:(NSString *)cookies forURL:(NSURL *)URL;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index 2eba569..3e68bfb 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -41,14 +41,14 @@
return result;
}
-- (NSString *)cookiesForURL:(NSURL *)url
+- (NSString *)cookiesForURL:(NSURL *)URL
{
- return [[[WebCookieManager sharedCookieManager] cookieRequestHeadersForURL:url] objectForKey:@"Cookie"];
+ return [[[WebCookieManager sharedCookieManager] cookieRequestHeadersForURL:URL] objectForKey:@"Cookie"];
}
-- (void)setCookies:(NSString *)cookies forURL:(NSURL *)url
+- (void)setCookies:(NSString *)cookies forURL:(NSURL *)URL
{
- [[WebCookieManager sharedCookieManager] setCookiesFromResponseHeaders:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"] forURL:url];
+ [[WebCookieManager sharedCookieManager] setCookiesFromResponseHeaders:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"] forURL:URL];
}
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 727c75a..a73a854 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -99,13 +99,13 @@
- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
- [self didStartLoadingWithURL:[handle url]];
+ [self didStartLoadingWithURL:[handle URL]];
[self receivedProgressWithHandle:handle complete: NO];
}
- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)data
{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
[self receivedProgressWithHandle:handle complete: NO];
[loader addData:data];
@@ -120,7 +120,7 @@
[dataSource _removeResourceHandle:handle];
error = [[WebError alloc] initWithErrorCode:WebResultCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource inputURL] absoluteString]];
+ inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error forHandle:handle];
[error release];
@@ -129,7 +129,7 @@
- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data:(NSData *)data
{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
@@ -149,7 +149,7 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)error
{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
[loader cancel];
@@ -163,7 +163,7 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
WEBKIT_ASSERT(currentURL != nil);
- WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
+ WEBKIT_ASSERT([URL isEqual:[handle URL]]);
// FIXME: We do want to tell the client about redirects.
// But the current API doesn't give any way to tell redirects on
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 727c75a..a73a854 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -99,13 +99,13 @@
- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
- [self didStartLoadingWithURL:[handle url]];
+ [self didStartLoadingWithURL:[handle URL]];
[self receivedProgressWithHandle:handle complete: NO];
}
- (void)WebResourceHandle:(WebResourceHandle *)handle dataDidBecomeAvailable:(NSData *)data
{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
[self receivedProgressWithHandle:handle complete: NO];
[loader addData:data];
@@ -120,7 +120,7 @@
[dataSource _removeResourceHandle:handle];
error = [[WebError alloc] initWithErrorCode:WebResultCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource inputURL] absoluteString]];
+ inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error forHandle:handle];
[error release];
@@ -129,7 +129,7 @@
- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data:(NSData *)data
{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
@@ -149,7 +149,7 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)error
{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
[loader cancel];
@@ -163,7 +163,7 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
WEBKIT_ASSERT(currentURL != nil);
- WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
+ WEBKIT_ASSERT([URL isEqual:[handle URL]]);
// FIXME: We do want to tell the client about redirects.
// But the current API doesn't give any way to tell redirects on
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index 1815f5a..a84be95 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -58,7 +58,7 @@
if (plugin == nil) {
return [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
}
- return [[[WebPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
+ return [[[WebPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin URL:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
}
- (NSArray *)pluginsInfo
@@ -75,7 +75,7 @@
return nil;
}
- return [[[WebPluginView alloc] initWithFrame:frame plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
+ return [[[WebPluginView alloc] initWithFrame:frame plugin:plugin URL:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index c7bc4db..f59234f 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -58,7 +58,7 @@
/*
A new chunk of data has been received. This could be a partial load
- of a url. It may be useful to do incremental layout, although
+ of a URL. It may be useful to do incremental layout, although
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
@@ -158,7 +158,7 @@
- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
- (id<WebControllerPolicyHandler>)policyHandler;
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)url;
++ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
// FIXME: Should this method be private?
// Called when a data source needs to create a frame. This method encapsulates the
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index ed67eb3..3b47f38 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -247,9 +247,9 @@
}
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)url
++ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL
{
- if([WebResourceHandle canInitWithURL:url]){
+ if([WebResourceHandle canInitWithURL:URL]){
return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyUseContentPolicy];
}else{
return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyOpenExternally];
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 6b4ef14..e9dbd9f 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -86,7 +86,7 @@ typedef enum {
// before it is clicked or loaded via a URL bar. Clients can choose to handle the
// URL normally, hand the URL off to launch services, or
// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (WebURLPolicy *)URLPolicyForURL: (NSURL *)url;
+- (WebURLPolicy *)URLPolicyForURL: (NSURL *)URL;
// Sent after locationChangeStarted.
// Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
@@ -101,7 +101,7 @@ typedef enum {
// We may have different errors that cause the the policy to be un-implementable, i.e.
// launch services failure, etc.
-- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)url;
+- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)URL;
// Called when a WebFileURLPolicy could not be completed. This is usually caused by files not
// existing or not readable.
@@ -113,6 +113,6 @@ typedef enum {
- (void)unableToImplementContentPolicy: (WebPolicy *)policy error: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Called when a plug-in for a certain mime type is not installed
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL;
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.h b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
index 6b4ef14..e9dbd9f 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
@@ -86,7 +86,7 @@ typedef enum {
// before it is clicked or loaded via a URL bar. Clients can choose to handle the
// URL normally, hand the URL off to launch services, or
// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (WebURLPolicy *)URLPolicyForURL: (NSURL *)url;
+- (WebURLPolicy *)URLPolicyForURL: (NSURL *)URL;
// Sent after locationChangeStarted.
// Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
@@ -101,7 +101,7 @@ typedef enum {
// We may have different errors that cause the the policy to be un-implementable, i.e.
// launch services failure, etc.
-- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)url;
+- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)URL;
// Called when a WebFileURLPolicy could not be completed. This is usually caused by files not
// existing or not readable.
@@ -113,6 +113,6 @@ typedef enum {
- (void)unableToImplementContentPolicy: (WebPolicy *)policy error: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Called when a plug-in for a certain mime type is not installed
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL;
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 8fd8ac9..ae8fd46 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -33,8 +33,8 @@
- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
-- (void)_didStartLoading: (NSURL *)url;
-- (void)_didStopLoading: (NSURL *)url;
+- (void)_didStartLoading: (NSURL *)URL;
+- (void)_didStopLoading: (NSURL *)URL;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
- (BOOL)_openedByScript;
- (void)_setOpenedByScript:(BOOL)openedByScript;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index b684a9c..df6c057 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -132,8 +132,7 @@
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
- [dataSource _addError: error forResource:
- (resourceHandle != nil ? [[resourceHandle url] absoluteString] : [[resourceHandle url] absoluteString])];
+ [dataSource _addError: error forResource:[[resourceHandle originalURL] absoluteString]];
[frame _checkLoadComplete];
}
@@ -151,14 +150,14 @@
[frame _checkLoadComplete];
}
-- (void)_didStartLoading: (NSURL *)url
+- (void)_didStartLoading: (NSURL *)URL
{
- [[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:URL inController:self];
}
-- (void)_didStopLoading: (NSURL *)url
+- (void)_didStopLoading: (NSURL *)URL
{
- [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:URL inController:self];
}
+ (NSString *)_MIMETypeForFile: (NSString *)path
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index ccb1851..88183d7 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -20,10 +20,6 @@
@class WebResourceHandle;
@class WebController;
-#ifdef TENTATIVE_API
- at class WebLoader;
-#endif
-
@class WebDataSourcePrivate;
@protocol WebDocumentRepresentation;
@@ -40,7 +36,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
-- initNSURL _web_URLWithString: (NSString *)string;
+- initWithString: (NSString *)string;
- initWithLoader: (WebLoader *)loader;
#endif
@@ -95,7 +91,10 @@
// To monitor change in the URL, override the <WebLocationChangeHandler>
// serverRedirectTo:forDataSource: method.
- (NSURL *)URL;
-- (NSURL *)inputURL; // deprecated
+
+// The original passed in at initialization time.
+// Starts out same as URL, but doesn't change if a redirect occurs.
+- (NSURL *)originalURL;
// Start actually getting (if initialized with a URL) and parsing data. If the data source
// is still performing a previous load it will be stopped.
@@ -129,7 +128,7 @@
- (NSString *)encoding;
// Style sheet
-- (void)setUserStyleSheetFromURL: (NSURL *)url;
+- (void)setUserStyleSheetFromURL: (NSURL *)URL;
- (void)setUserStyleSheetFromString: (NSString *)sheet;
// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index c53a1cd..07f8d39 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -146,7 +146,7 @@
}
-- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName
+- (void)openURL: (NSURL *)URL inFrameNamed: (NSString *)frameName
{
[NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::openURL:inFrameNamed: is not implemented"];
}
@@ -171,7 +171,7 @@
// May return nil if not initialized with a URL.
-- (NSURL *)inputURL
+- (NSURL *)originalURL
{
return _private->inputURL;
}
@@ -213,7 +213,7 @@
if (!_private->primaryLoadComplete && _private->loading) {
return YES;
}
- if ([_private->urlHandles count]) {
+ if ([_private->resourceHandles count]) {
return YES;
}
@@ -266,7 +266,7 @@
}
// Style sheet
-- (void)setUserStyleSheetFromURL:(NSURL *)url
+- (void)setUserStyleSheetFromURL:(NSURL *)URL
{
[NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::setUserStyleSheetFromURL: is not implemented"];
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index f8da943..9953ba3 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -43,7 +43,7 @@
// Active WebResourceHandles for resources associated with the
// datasource.
- NSMutableArray *urlHandles;
+ NSMutableArray *resourceHandles;
// The time when the data source was told to start loading.
double loadingStartedTime;
@@ -92,7 +92,7 @@
- (void)_setPrimaryLoadComplete: (BOOL)flag;
- (double)_loadingStartedTime;
- (void)_setTitle: (NSString *)title;
-- (void)_setFinalURL: (NSURL *)url;
+- (void)_setURL: (NSURL *)URL;
- (void)_setContentPolicy:(WebContentPolicy *)policy;
- (void)_setContentType:(NSString *)type;
- (void)_setEncoding:(NSString *)encoding;
@@ -103,8 +103,8 @@
+ (NSMutableDictionary *)_repTypes;
+ (BOOL)_canShowMIMEType:(NSString *)MIMEType;
- (void)_loadIcon;
-- (void)_setIconURL:(NSURL *)url;
-- (void)_setIconURL:(NSURL *)url withType:(NSString *)iconType;
+- (void)_setIconURL:(NSURL *)URL;
+- (void)_setIconURL:(NSURL *)URL withType:(NSString *)iconType;
- (WebResourceHandle*)_mainHandle;
// Convenience interface for getting here from an WebDataSource.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 1e56824..3ee77d7 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -66,7 +66,7 @@
[frames release];
[mainHandle release];
[mainResourceHandleClient release];
- [urlHandles release];
+ [resourceHandles release];
[pageTitle release];
[encoding release];
[contentType release];
@@ -120,7 +120,7 @@
- (void)_updateLoading
{
- [self _setLoading: _private->mainHandle || [_private->urlHandles count]];
+ [self _setLoading: _private->mainHandle || [_private->resourceHandles count]];
}
- (void)_setController: (WebController *)controller
@@ -183,15 +183,15 @@
- (void)_addResourceHandle: (WebResourceHandle *)handle
{
- if (_private->urlHandles == nil)
- _private->urlHandles = [[NSMutableArray alloc] init];
- [_private->urlHandles addObject: handle];
+ if (_private->resourceHandles == nil)
+ _private->resourceHandles = [[NSMutableArray alloc] init];
+ [_private->resourceHandles addObject: handle];
[self _setLoading:YES];
}
- (void)_removeResourceHandle: (WebResourceHandle *)handle
{
- [_private->urlHandles removeObject: handle];
+ [_private->resourceHandles removeObject: handle];
[self _updateLoading];
}
@@ -216,7 +216,7 @@
[_private->mainHandle cancelLoadInBackground];
- handles = [_private->urlHandles copy];
+ handles = [_private->resourceHandles copy];
[handles makeObjectsPerformSelector:@selector(cancelLoadInBackground)];
[handles release];
@@ -264,7 +264,7 @@
[[_private->controller locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
}
-- (void)_setFinalURL:(NSURL *)URL
+- (void)_setURL:(NSURL *)URL
{
// We should never be getting a redirect callback after the data
// source is committed. It would be a WebFoundation bug if it sent
@@ -376,7 +376,7 @@
-(void)_commitIfReady
{
if ([[self contentPolicy] policyAction] == WebContentPolicyShow && _private->gotFirstByte && !_private->committed) {
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committed resource = %s\n", [[[self inputURL] absoluteString] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committed resource = %s\n", [[[self originalURL] absoluteString] cString]);
_private->committed = TRUE;
[self _makeRepresentation];
[[self webFrame] _transitionToCommitted];
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index a568c9e..6ac6bcb 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -18,9 +18,9 @@
return self;
}
-- (WebURLPolicy *)URLPolicyForURL: (NSURL *)url
+- (WebURLPolicy *)URLPolicyForURL: (NSURL *)URL
{
- return [WebController defaultURLPolicyForURL: url];
+ return [WebController defaultURLPolicyForURL: URL];
}
- (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource isDirectory:(BOOL)isDirectory
@@ -47,9 +47,9 @@
}
}
-- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)url
+- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)URL
{
- NSLog (@"unableToImplementURLPolicyForURL:error: - URL %@, error %@\n", url, error);
+ NSLog (@"unableToImplementURLPolicyForURL:error: - URL %@, error %@\n", URL, error);
}
@@ -58,9 +58,9 @@
NSLog (@"unableToImplementContentPolicy:forDataSource: - error %@\n", error);
}
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL
{
- NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL \n", mime, url);
+ NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL \n", mime, URL);
}
- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyHandler.m b/WebKit/WebView.subproj/WebDefaultPolicyHandler.m
index a568c9e..6ac6bcb 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyHandler.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyHandler.m
@@ -18,9 +18,9 @@
return self;
}
-- (WebURLPolicy *)URLPolicyForURL: (NSURL *)url
+- (WebURLPolicy *)URLPolicyForURL: (NSURL *)URL
{
- return [WebController defaultURLPolicyForURL: url];
+ return [WebController defaultURLPolicyForURL: URL];
}
- (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource isDirectory:(BOOL)isDirectory
@@ -47,9 +47,9 @@
}
}
-- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)url
+- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)URL
{
- NSLog (@"unableToImplementURLPolicyForURL:error: - URL %@, error %@\n", url, error);
+ NSLog (@"unableToImplementURLPolicyForURL:error: - URL %@, error %@\n", URL, error);
}
@@ -58,9 +58,9 @@
NSLog (@"unableToImplementContentPolicy:forDataSource: - error %@\n", error);
}
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL
{
- NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL \n", mime, url);
+ NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL \n", mime, URL);
}
- (WebClickPolicy *)clickPolicyForElement: (NSDictionary *)elementInformation button: (NSEventType)eventType modifierMask: (unsigned int)eventMask
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 5f28364..4eb3dee 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -132,7 +132,7 @@
WebHistoryItem *entry;
entry = (WebHistoryItem *)[[[self controller] backForwardList] currentEntry];
- if ([[[entry url] _web_URLWithoutFragment] isEqual: [[[self dataSource] inputURL] _web_URLWithoutFragment]]){
+ if ([[[entry URL] _web_URLWithoutFragment] isEqual: [[[self dataSource] originalURL] _web_URLWithoutFragment]]) {
NSPoint point = [[[[self webView] documentView] superview] bounds].origin;
[entry setScrollPoint: point];
}
@@ -178,7 +178,7 @@
- (void)startLoading
{
if (self == [[self controller] mainFrame])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] inputURL] absoluteString] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] originalURL] absoluteString] cString]);
// Force refresh is irrelevant, as this will always be the first load.
// The controller will transition the provisional data source to the
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index cb8d9d0..dca44d3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -286,7 +286,7 @@ static const char * const stateNames[] = {
case WebFrameLoadTypeStandard:
parentFrame = [[self controller] frameForDataSource: [[self dataSource] parent]];
- backForwardItem = [[WebHistoryItem alloc] initWithURL:[[self dataSource] inputURL] target: [self name] parent: [parentFrame name] title:[[self dataSource] pageTitle] image: nil];
+ backForwardItem = [[WebHistoryItem alloc] initWithURL:[[self dataSource] originalURL] target: [self name] parent: [parentFrame name] title:[[self dataSource] pageTitle] image: nil];
[[[self controller] backForwardList] addEntry: backForwardItem];
[backForwardItem release];
// Scroll to top.
@@ -335,7 +335,7 @@ static const char * const stateNames[] = {
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
if (newState == WebFrameStateComplete && self == [[self controller] mainFrame]){
- WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] originalURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -558,17 +558,17 @@ static const char * const stateNames[] = {
id <WebControllerPolicyHandler> policyHandler = [[self controller] policyHandler];
NSFileManager *fileManager = [NSFileManager defaultManager];
NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
- NSURL *url = [dataSource inputURL];
+ NSURL *URL = [dataSource originalURL];
WebFileURLPolicy *fileURLPolicy;
- NSString *path = [url path], *urlString = [url absoluteString];
+ NSString *path = [URL path], *URLString = [URL absoluteString];
BOOL isDirectory, fileExists;
WebError *error;
- WebURLPolicy *urlPolicy = [policyHandler URLPolicyForURL:url];
+ WebURLPolicy *URLPolicy = [policyHandler URLPolicyForURL:URL];
- if([urlPolicy policyAction] == WebURLPolicyUseContentPolicy){
+ if([URLPolicy policyAction] == WebURLPolicyUseContentPolicy){
- if([url isFileURL]){
+ if([URL isFileURL]){
fileExists = [fileManager fileExistsAtPath:path isDirectory:&isDirectory];
@@ -584,26 +584,26 @@ static const char * const stateNames[] = {
return NO;
if(!fileExists){
- error = [WebError errorWithCode:WebErrorFileDoesNotExist inDomain:WebErrorDomainWebKit failingURL:urlString];
+ error = [WebError errorWithCode:WebErrorFileDoesNotExist inDomain:WebErrorDomainWebKit failingURL:URLString];
[policyHandler unableToImplementFileURLPolicy: fileURLPolicy error: error forDataSource: dataSource];
return NO;
}
if(![fileManager isReadableFileAtPath:path]){
- error = [WebError errorWithCode:WebErrorFileNotReadable inDomain:WebErrorDomainWebKit failingURL:urlString];
+ error = [WebError errorWithCode:WebErrorFileNotReadable inDomain:WebErrorDomainWebKit failingURL:URLString];
[policyHandler unableToImplementFileURLPolicy: fileURLPolicy error: error forDataSource: dataSource];
return NO;
}
if([fileURLPolicy policyAction] == WebFileURLPolicyUseContentPolicy){
if(isDirectory){
- error = [WebError errorWithCode:WebErrorCannotShowDirectory inDomain:WebErrorDomainWebKit failingURL:urlString];
+ error = [WebError errorWithCode:WebErrorCannotShowDirectory inDomain:WebErrorDomainWebKit failingURL:URLString];
[policyHandler unableToImplementFileURLPolicy: fileURLPolicy error: error forDataSource: dataSource];
return NO;
}
else if(![WebController canShowMIMEType: type]){
- error = [WebError errorWithCode:WebErrorCannotShowMIMEType inDomain:WebErrorDomainWebKit failingURL:urlString];
+ error = [WebError errorWithCode:WebErrorCannotShowMIMEType inDomain:WebErrorDomainWebKit failingURL:URLString];
[policyHandler unableToImplementFileURLPolicy: fileURLPolicy error: error forDataSource: dataSource];
return NO;
}else{
@@ -612,13 +612,13 @@ static const char * const stateNames[] = {
}
}else if([fileURLPolicy policyAction] == WebFileURLPolicyOpenExternally){
if(![workspace openFile:path]){
- error = [WebError errorWithCode:WebErrorCouldNotFindApplicationForFile inDomain:WebErrorDomainWebKit failingURL:urlString];
+ error = [WebError errorWithCode:WebErrorCouldNotFindApplicationForFile inDomain:WebErrorDomainWebKit failingURL:URLString];
[policyHandler unableToImplementFileURLPolicy: fileURLPolicy error: error forDataSource: dataSource];
}
return NO;
}else if([fileURLPolicy policyAction] == WebFileURLPolicyRevealInFinder){
if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
- error = [WebError errorWithCode:WebErrorFinderCouldNotOpenDirectory inDomain:WebErrorDomainWebKit failingURL:urlString];
+ error = [WebError errorWithCode:WebErrorFinderCouldNotOpenDirectory inDomain:WebErrorDomainWebKit failingURL:URLString];
[policyHandler unableToImplementFileURLPolicy: fileURLPolicy error: error forDataSource: dataSource];
}
return NO;
@@ -628,23 +628,23 @@ static const char * const stateNames[] = {
return NO;
}
}else{
- if(![WebResourceHandle canInitWithURL:url]){
- error = [WebError errorWithCode:WebErrorCannotShowURL inDomain:WebErrorDomainWebKit failingURL:urlString];
- [policyHandler unableToImplementURLPolicy: urlPolicy error: error forURL: url];
+ if(![WebResourceHandle canInitWithURL:URL]){
+ error = [WebError errorWithCode:WebErrorCannotShowURL inDomain:WebErrorDomainWebKit failingURL:URLString];
+ [policyHandler unableToImplementURLPolicy: URLPolicy error: error forURL: URL];
return NO;
}
// we can handle this URL
return YES;
}
}
- else if([urlPolicy policyAction] == WebURLPolicyOpenExternally){
- if(![workspace openURL:url]){
- error = [WebError errorWithCode:WebErrorCouldNotFindApplicationForURL inDomain:WebErrorDomainWebKit failingURL:urlString];
- [policyHandler unableToImplementURLPolicy: urlPolicy error: error forURL: url];
+ else if([URLPolicy policyAction] == WebURLPolicyOpenExternally){
+ if(![workspace openURL:URL]){
+ error = [WebError errorWithCode:WebErrorCouldNotFindApplicationForURL inDomain:WebErrorDomainWebKit failingURL:URLString];
+ [policyHandler unableToImplementURLPolicy: URLPolicy error: error forURL: URL];
}
return NO;
}
- else if([urlPolicy policyAction] == WebURLPolicyIgnore){
+ else if([URLPolicy policyAction] == WebURLPolicyIgnore){
return NO;
}
else{
@@ -661,11 +661,11 @@ static const char * const stateNames[] = {
- (void)_goToItem: (WebHistoryItem *)item withFrameLoadType: (WebFrameLoadType)type
{
- NSURL *itemURL = [item url];
+ NSURL *itemURL = [item URL];
WebDataSource *dataSource;
- NSURL *inputURL = [[self dataSource] inputURL];
+ NSURL *originalURL = [[self dataSource] originalURL];
- if ([item anchor] && [[itemURL _web_URLWithoutFragment] isEqual: [inputURL _web_URLWithoutFragment]]){
+ if ([item anchor] && [[itemURL _web_URLWithoutFragment] isEqual: [originalURL _web_URLWithoutFragment]]){
WebBackForwardList *backForwardList = [[self controller] backForwardList];
if (type == WebFrameLoadTypeForward)
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 31b5a8f..598ca8c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -375,7 +375,7 @@
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().URL().latin1(), thisTime);
#endif
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index e55c16e..a3e1926 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -103,20 +103,20 @@
- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
- [self didStartLoadingWithURL:[handle url]];
+ [self didStartLoadingWithURL:[handle URL]];
}
- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
WebError *error;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
error = [[WebError alloc] initWithErrorCode:WebResultCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource inputURL] absoluteString]];
+ inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error forHandle:handle];
[error release];
@@ -128,9 +128,9 @@
- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data: (NSData *)data
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
@@ -168,9 +168,9 @@
WebFrame *frame = [dataSource webFrame];
WebContentPolicy *contentPolicy;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", DEBUG_OBJECT([handle url]), data, [data length]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s, data = %p, length %d\n", DEBUG_OBJECT([handle URL]), data, [data length]);
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
// Check the mime type and ask the client for the content policy.
if(isFirstChunk){
@@ -228,9 +228,9 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)result
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s, result = %s\n", DEBUG_OBJECT([handle URL]), DEBUG_OBJECT([result errorDescription]));
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
[self receivedError:result forHandle:handle];
@@ -244,12 +244,12 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "url = %s\n", DEBUG_OBJECT(URL));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "URL = %s\n", DEBUG_OBJECT(URL));
WEBKIT_ASSERT(currentURL != nil);
- WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
+ WEBKIT_ASSERT([URL isEqual:[handle URL]]);
- [dataSource _setFinalURL:URL];
+ [dataSource _setURL:URL];
[self didStopLoading];
[self didStartLoadingWithURL:URL];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index e55c16e..a3e1926 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -103,20 +103,20 @@
- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
- [self didStartLoadingWithURL:[handle url]];
+ [self didStartLoadingWithURL:[handle URL]];
}
- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
WebError *error;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
error = [[WebError alloc] initWithErrorCode:WebResultCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource inputURL] absoluteString]];
+ inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
[self receivedError:error forHandle:handle];
[error release];
@@ -128,9 +128,9 @@
- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data: (NSData *)data
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
@@ -168,9 +168,9 @@
WebFrame *frame = [dataSource webFrame];
WebContentPolicy *contentPolicy;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", DEBUG_OBJECT([handle url]), data, [data length]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s, data = %p, length %d\n", DEBUG_OBJECT([handle URL]), data, [data length]);
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
// Check the mime type and ask the client for the content policy.
if(isFirstChunk){
@@ -228,9 +228,9 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didFailLoadingWithResult:(WebError *)result
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s, result = %s\n", DEBUG_OBJECT([handle URL]), DEBUG_OBJECT([result errorDescription]));
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
+ WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
[self receivedError:result forHandle:handle];
@@ -244,12 +244,12 @@
- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "url = %s\n", DEBUG_OBJECT(URL));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "URL = %s\n", DEBUG_OBJECT(URL));
WEBKIT_ASSERT(currentURL != nil);
- WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
+ WEBKIT_ASSERT([URL isEqual:[handle URL]]);
- [dataSource _setFinalURL:URL];
+ [dataSource _setURL:URL];
[self didStopLoading];
[self didStartLoadingWithURL:URL];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 6b4ef14..e9dbd9f 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -86,7 +86,7 @@ typedef enum {
// before it is clicked or loaded via a URL bar. Clients can choose to handle the
// URL normally, hand the URL off to launch services, or
// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (WebURLPolicy *)URLPolicyForURL: (NSURL *)url;
+- (WebURLPolicy *)URLPolicyForURL: (NSURL *)URL;
// Sent after locationChangeStarted.
// Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
@@ -101,7 +101,7 @@ typedef enum {
// We may have different errors that cause the the policy to be un-implementable, i.e.
// launch services failure, etc.
-- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)url;
+- (void)unableToImplementURLPolicy: (WebPolicy *)policy error: (WebError *)error forURL: (NSURL *)URL;
// Called when a WebFileURLPolicy could not be completed. This is usually caused by files not
// existing or not readable.
@@ -113,6 +113,6 @@ typedef enum {
- (void)unableToImplementContentPolicy: (WebPolicy *)policy error: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Called when a plug-in for a certain mime type is not installed
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
+- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL;
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 75faee5..e3510d1 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -67,7 +67,7 @@
Someday we might have preferences on a per-URL basis.
*/
-+ getPreferencesForURL: (NSURL *)url;
++ getPreferencesForURL: (NSURL *);
// Encoding that will be used in none specified on page? or in header?
+ setEncoding: (NSString *)encoding;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index c7bc4db..f59234f 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -58,7 +58,7 @@
/*
A new chunk of data has been received. This could be a partial load
- of a url. It may be useful to do incremental layout, although
+ of a URL. It may be useful to do incremental layout, although
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
@@ -158,7 +158,7 @@
- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
- (id<WebControllerPolicyHandler>)policyHandler;
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)url;
++ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
// FIXME: Should this method be private?
// Called when a data source needs to create a frame. This method encapsulates the
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index ed67eb3..3b47f38 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -247,9 +247,9 @@
}
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)url
++ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL
{
- if([WebResourceHandle canInitWithURL:url]){
+ if([WebResourceHandle canInitWithURL:URL]){
return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyUseContentPolicy];
}else{
return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyOpenExternally];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 8fd8ac9..ae8fd46 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -33,8 +33,8 @@
- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
-- (void)_didStartLoading: (NSURL *)url;
-- (void)_didStopLoading: (NSURL *)url;
+- (void)_didStartLoading: (NSURL *)URL;
+- (void)_didStopLoading: (NSURL *)URL;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
- (BOOL)_openedByScript;
- (void)_setOpenedByScript:(BOOL)openedByScript;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index b684a9c..df6c057 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -132,8 +132,7 @@
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
- [dataSource _addError: error forResource:
- (resourceHandle != nil ? [[resourceHandle url] absoluteString] : [[resourceHandle url] absoluteString])];
+ [dataSource _addError: error forResource:[[resourceHandle originalURL] absoluteString]];
[frame _checkLoadComplete];
}
@@ -151,14 +150,14 @@
[frame _checkLoadComplete];
}
-- (void)_didStartLoading: (NSURL *)url
+- (void)_didStartLoading: (NSURL *)URL
{
- [[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:URL inController:self];
}
-- (void)_didStopLoading: (NSURL *)url
+- (void)_didStopLoading: (NSURL *)URL
{
- [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:URL inController:self];
}
+ (NSString *)_MIMETypeForFile: (NSString *)path
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list