[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:47:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit de5c8c96cefe9fd54f2a12df09cffc789fe0241b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 17 17:49:06 2003 +0000
WebCore:
Reviewed by John
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::createPart): Now uses NSURL instead of NSString
(KWQKHTMLPart::redirectionTimerStartedOrStopped): Ditto
(KWQKHTMLPart::userAgent): Ditto
* kwq/KWQKHTMLPartBrowserExtension.mm:
(KHTMLPartBrowserExtension::setIconURL): Ditto
(KHTMLPartBrowserExtension::setTypedIconURL): Ditto
* kwq/KWQKJavaAppletWidget.mm:
(KJavaAppletWidget::showApplet): Ditto
* kwq/KWQLoader.mm:
(KWQServeRequest): Ditto
(KWQCheckCacheObjectStatus): Ditto
* kwq/WebCoreBridge.h: Changed quite a number of methods to use NSURL
instead of NSString
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge didNotOpenURL:]): Now uses NSURL instead of NSString
(-[WebCoreBridge scrollToAnchorWithURL:]): Ditto
(-[WebCoreBridge URL]): Ditto
WebKit:
Reviewed by John
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge startLoadingResource:withURL:]): Now uses NSURL instead of NSString
(-[WebBridge objectLoadedFromCacheWithURL:response:size:]): Ditto
(-[WebBridge reportClientRedirectToURL:delay:fireDate:lockHistory:isJavaScriptFormAction:]):
Ditto
(-[WebBridge setIconURL:]): Ditto
(-[WebBridge setIconURL:withType:]): Ditto
(-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Ditto
(-[WebBridge userAgentForURL:]): Ditto
(-[WebBridge requestedURL]): Now returns string using _web_absoluteString
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _receivedError:complete:]): Now uses NSURL instead of NSString
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _opened]): Ditto
(-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formState:]): Ditto
(-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]): Ditto
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4664 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b1badf8..a4d4b54 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,28 @@
2003-07-17 Ken Kocienda <kocienda at apple.com>
+ Reviewed by John
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::createPart): Now uses NSURL instead of NSString
+ (KWQKHTMLPart::redirectionTimerStartedOrStopped): Ditto
+ (KWQKHTMLPart::userAgent): Ditto
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ (KHTMLPartBrowserExtension::setIconURL): Ditto
+ (KHTMLPartBrowserExtension::setTypedIconURL): Ditto
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet): Ditto
+ * kwq/KWQLoader.mm:
+ (KWQServeRequest): Ditto
+ (KWQCheckCacheObjectStatus): Ditto
+ * kwq/WebCoreBridge.h: Changed quite a number of methods to use NSURL
+ instead of NSString
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge didNotOpenURL:]): Now uses NSURL instead of NSString
+ (-[WebCoreBridge scrollToAnchorWithURL:]): Ditto
+ (-[WebCoreBridge URL]): Ditto
+
+2003-07-17 Ken Kocienda <kocienda at apple.com>
+
Reviewed by Darin
* kwq/KWQKHTMLPart.h: _submittedFormURL is now a KURL, not a QString
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b1badf8..a4d4b54 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,28 @@
2003-07-17 Ken Kocienda <kocienda at apple.com>
+ Reviewed by John
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::createPart): Now uses NSURL instead of NSString
+ (KWQKHTMLPart::redirectionTimerStartedOrStopped): Ditto
+ (KWQKHTMLPart::userAgent): Ditto
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ (KHTMLPartBrowserExtension::setIconURL): Ditto
+ (KHTMLPartBrowserExtension::setTypedIconURL): Ditto
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet): Ditto
+ * kwq/KWQLoader.mm:
+ (KWQServeRequest): Ditto
+ (KWQCheckCacheObjectStatus): Ditto
+ * kwq/WebCoreBridge.h: Changed quite a number of methods to use NSURL
+ instead of NSString
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge didNotOpenURL:]): Now uses NSURL instead of NSString
+ (-[WebCoreBridge scrollToAnchorWithURL:]): Ditto
+ (-[WebCoreBridge URL]): Ditto
+
+2003-07-17 Ken Kocienda <kocienda at apple.com>
+
Reviewed by Darin
* kwq/KWQKHTMLPart.h: _submittedFormURL is now a KURL, not a QString
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5ab1e86..2b0477d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -605,9 +605,9 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
}
KWQPluginPart *newPart = new KWQPluginPart;
- newPart->setWidget(new QWidget([_bridge viewForPluginWithURLString:url.url().getNSString()
+ newPart->setWidget(new QWidget([_bridge viewForPluginWithURL:url.getNSURL()
attributes:attributesArray
- baseURLString:d->m_doc->baseURL().getNSString()
+ baseURL:KURL(d->m_doc->baseURL()).getNSURL()
MIMEType:child.m_args.serviceType.getNSString()]));
return newPart;
} else {
@@ -622,7 +622,7 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
marginHeight = o->getMarginHeight();
}
WebCoreBridge *childBridge = [_bridge createChildFrameNamed:child.m_name.getNSString()
- withURL:url.url().getNSString()
+ withURL:url.getNSURL()
renderPart:child.m_frame
allowsScrolling:allowsScrolling
marginWidth:marginWidth
@@ -724,7 +724,7 @@ void KWQKHTMLPart::redirectionTimerStartedOrStopped()
}
if (d->m_redirectionTimer.isActive()) {
- [_bridge reportClientRedirectToURL:d->m_redirectURL.getNSString()
+ [_bridge reportClientRedirectToURL:KURL(d->m_redirectURL).getNSURL()
delay:d->m_delayRedirect
fireDate:[d->m_redirectionTimer.getNSTimer() fireDate]
lockHistory:d->m_redirectLockHistory
@@ -787,7 +787,7 @@ RenderObject *KWQKHTMLPart::renderer()
QString KWQKHTMLPart::userAgent() const
{
- NSString *us = [_bridge userAgentForURL:m_url.url().getNSString()];
+ NSString *us = [_bridge userAgentForURL:m_url.getNSURL()];
if (us)
return QString::fromNSString(us);
@@ -1160,7 +1160,7 @@ void KWQKHTMLPart::setPolicyBaseURL(const DOMString &s)
QString KWQKHTMLPart::requestedURLString() const
{
- return QString::fromNSString([_bridge requestedURL]);
+ return QString::fromNSString([_bridge requestedURLString]);
}
QString KWQKHTMLPart::incomingReferrer() const
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index 5926d80..31dcfe5 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -145,10 +145,10 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
void KHTMLPartBrowserExtension::setIconURL(const KURL &url)
{
- [_part->bridge() setIconURL:url.url().getNSString()];
+ [_part->bridge() setIconURL:url.getNSURL()];
}
void KHTMLPartBrowserExtension::setTypedIconURL(const KURL &url, const QString &type)
{
- [_part->bridge() setIconURL:url.url().getNSString() withType:type.getNSString()];
+ [_part->bridge() setIconURL:url.getNSURL() withType:type.getNSString()];
}
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 907fb6d..604c7ea 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -68,7 +68,7 @@ void KJavaAppletWidget::showApplet()
setView([KWQ(_context->part())->bridge()
viewForJavaAppletWithFrame:NSMakeRect(x(), y(), width(), height())
attributes:_parameters
- baseURLString:_baseURL.getNSString()]);
+ baseURL:KURL(_baseURL).getNSURL()]);
// Add the view to the main view now so the applet starts immediately rather than until the first paint.
_context->part()->view()->addChild(this, x(), y());
}
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 1608a5d..2a085a8 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -49,7 +49,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
WebCoreBridge *bridge = static_cast<KWQKHTMLPart *>(request->m_docLoader->part())->bridge();
KWQResourceLoader *resourceLoader = [[KWQResourceLoader alloc] initWithLoader:loader job:job];
- id <WebCoreResourceHandle> handle = [bridge startLoadingResource:resourceLoader withURL:job->url().url().getNSString()];
+ id <WebCoreResourceHandle> handle = [bridge startLoadingResource:resourceLoader withURL:job->url().getNSURL()];
[resourceLoader setHandle:handle];
[resourceLoader release];
@@ -88,7 +88,7 @@ void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
// Notify the caller that we "loaded".
WebCoreBridge *bridge = static_cast<KWQKHTMLPart *>(loader->part())->bridge();
CachedImage *cachedImage = dynamic_cast<CachedImage *>(cachedObject);
- [bridge objectLoadedFromCacheWithURL:cachedObject->url().string().getNSString()
+ [bridge objectLoadedFromCacheWithURL:KURL(cachedObject->url().string()).getNSURL()
response:(id)cachedObject->response()
size:cachedImage ? cachedImage->dataSize() : cachedObject->size()];
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index a80c34f..25f649d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -119,7 +119,7 @@ enum FrameBorderStyle {
- (void)addData:(NSData *)data;
- (void)closeURL;
-- (void)didNotOpenURL:(NSString *)URL;
+- (void)didNotOpenURL:(NSURL *)URL;
- (void)saveDocumentState;
- (void)restoreDocumentState;
@@ -129,14 +129,14 @@ enum FrameBorderStyle {
- (void)end;
-- (NSString *)URL;
+- (NSURL *)URL;
- (NSString *)referrer;
- (void)installInFrame:(NSView *)view;
- (void)removeFromFrame;
- (void)scrollToAnchor:(NSString *)anchor;
-- (void)scrollToAnchorWithURL:(NSString *)URL;
+- (void)scrollToAnchorWithURL:(NSURL *)URL;
- (void)createKHTMLViewWithNSView:(NSView *)view marginWidth:(int)mw marginHeight:(int)mh;
@@ -240,15 +240,15 @@ enum FrameBorderStyle {
- (WebCoreBridge *)createWindowWithURL:(NSURL *)URL frameName:(NSString *)name;
- (void)showWindow;
-- (NSString *)userAgentForURL:(NSString *)URL;
+- (NSString *)userAgentForURL:(NSURL *)URL;
- (void)setTitle:(NSString *)title;
- (void)setStatusText:(NSString *)status;
-- (void)setIconURL:(NSString *)URL;
-- (void)setIconURL:(NSString *)URL withType:(NSString *)string;
+- (void)setIconURL:(NSURL *)URL;
+- (void)setIconURL:(NSURL *)URL withType:(NSString *)string;
-- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName withURL:(NSString *)URL
+- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName withURL:(NSURL *)URL
renderPart:(KHTMLRenderPart *)renderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height;
@@ -276,11 +276,11 @@ enum FrameBorderStyle {
- (BOOL)runJavaScriptConfirmPanelWithMessage:(NSString *)message;
- (BOOL)runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText returningText:(NSString **)result;
-- (id <WebCoreResourceHandle>)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSString *)URL;
-- (void)objectLoadedFromCacheWithURL:(NSString *)URL response:(id)response size:(unsigned)bytes;
+- (id <WebCoreResourceHandle>)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSURL *)URL;
+- (void)objectLoadedFromCacheWithURL:(NSURL *)URL response:(id)response size:(unsigned)bytes;
- (BOOL)isReloading;
-- (void)reportClientRedirectToURL:(NSString *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction;
+- (void)reportClientRedirectToURL:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction;
- (void)reportClientRedirectCancelled;
- (void)focusWindow;
@@ -297,16 +297,18 @@ enum FrameBorderStyle {
- (void)setNeedsReapplyStyles;
- (void)setNeedsLayout;
-- (NSString *)requestedURL;
+// OK to be an NSString rather than an NSURL.
+// This URL is only used for coloring visited links.
+- (NSString *)requestedURLString;
- (NSString *)incomingReferrer;
-- (NSView *)viewForPluginWithURLString:(NSString *)URLString
- attributes:(NSArray *)attributesArray
- baseURLString:(NSString *)baseURLString
- MIMEType:(NSString *)MIMEType;
+- (NSView *)viewForPluginWithURL:(NSURL *)URL
+ attributes:(NSArray *)attributesArray
+ baseURL:(NSURL *)baseURL
+ MIMEType:(NSString *)MIMEType;
- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame
attributes:(NSDictionary *)attributes
- baseURLString:(NSString *)baseURLString;
+ baseURL:(NSURL *)baseURL;
- (BOOL)saveDocumentToPageCache:(id)documentInfo;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 0683674..13f5a5a 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -214,9 +214,9 @@ static bool initializedObjectCacheSize = FALSE;
_part->closeURL();
}
-- (void)didNotOpenURL:(NSString *)URL
+- (void)didNotOpenURL:(NSURL *)URL
{
- _part->didNotOpenURL(QString::fromNSString(URL));
+ _part->didNotOpenURL(KURL(URL).url());
}
- (void)saveDocumentState
@@ -251,9 +251,9 @@ static bool initializedObjectCacheSize = FALSE;
}
}
-- (void)scrollToAnchorWithURL:(NSString *)URL
+- (void)scrollToAnchorWithURL:(NSURL *)URL
{
- _part->scrollToAnchor([URL cString]);
+ _part->scrollToAnchor(KURL(URL).url().latin1());
}
- (BOOL)saveDocumentToPageCache
@@ -896,9 +896,9 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
return _part->name().getNSString();
}
-- (NSString *)URL
+- (NSURL *)URL
{
- return _part->url().url().getNSString();
+ return _part->url().getNSURL();
}
- (NSString *)referrer
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0adffc8..e48ca67 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,26 @@
2003-07-17 Ken Kocienda <kocienda at apple.com>
+ Reviewed by John
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge startLoadingResource:withURL:]): Now uses NSURL instead of NSString
+ (-[WebBridge objectLoadedFromCacheWithURL:response:size:]): Ditto
+ (-[WebBridge reportClientRedirectToURL:delay:fireDate:lockHistory:isJavaScriptFormAction:]):
+ Ditto
+ (-[WebBridge setIconURL:]): Ditto
+ (-[WebBridge setIconURL:withType:]): Ditto
+ (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Ditto
+ (-[WebBridge userAgentForURL:]): Ditto
+ (-[WebBridge requestedURL]): Now returns string using _web_absoluteString
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _receivedError:complete:]): Now uses NSURL instead of NSString
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _opened]): Ditto
+ (-[WebFrame _continueFragmentScrollAfterNavigationPolicy:formState:]): Ditto
+ (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]): Ditto
+
+2003-07-17 Ken Kocienda <kocienda at apple.com>
+
Reviewed by me
* Misc.subproj/WebNSURLExtras.m:
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 042d0ae..05b3e9a 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -334,7 +334,7 @@
[self addData:data];
}
-- (id <WebCoreResourceHandle>)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader withURL:(NSString *)URL
+- (id <WebCoreResourceHandle>)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader withURL:(NSURL *)URL
{
// If we are no longer attached to a WebView, this must be an attempted load from an
// onUnload handler, so let's just block it.
@@ -343,17 +343,17 @@
}
return [WebSubresourceClient startLoadingResource:resourceLoader
- withURL:[NSURL _web_URLWithString:URL]
+ withURL:URL
referrer:[self referrer]
forDataSource:[self dataSource]];
}
-- (void)objectLoadedFromCacheWithURL:(NSString *)URL response: response size:(unsigned)bytes
+- (void)objectLoadedFromCacheWithURL:(NSURL *)URL response: response size:(unsigned)bytes
{
ASSERT(_frame != nil);
ASSERT(response != nil);
- NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL _web_URLWithString:URL]];
+ NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
WebView *wv = [_frame webView];
id delegate = [wv resourceLoadDelegate];
id sharedDelegate = [WebDefaultResourceLoadDelegate sharedResourceLoadDelegate];
@@ -391,9 +391,9 @@
return [[[self dataSource] request] cachePolicy] == NSURLRequestReloadIgnoringCacheData;
}
-- (void)reportClientRedirectToURL:(NSString *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction
+- (void)reportClientRedirectToURL:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction
{
- [_frame _clientRedirectedTo:[NSURL _web_URLWithString:URL] delay:seconds fireDate:date lockHistory:lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction];
+ [_frame _clientRedirectedTo:URL delay:seconds fireDate:date lockHistory:lockHistory isJavaScriptFormAction:(BOOL)isJavaScriptFormAction];
}
- (void)reportClientRedirectCancelled
@@ -418,14 +418,14 @@
}
}
-- (void)setIconURL:(NSString *)URL
+- (void)setIconURL:(NSURL *)URL
{
- [[self dataSource] _setIconURL:[NSURL _web_URLWithString:URL]];
+ [[self dataSource] _setIconURL:URL];
}
-- (void)setIconURL:(NSString *)URL withType:(NSString *)type
+- (void)setIconURL:(NSURL *)URL withType:(NSString *)type
{
- [[self dataSource] _setIconURL:[NSURL _web_URLWithString:URL] withType:type];
+ [[self dataSource] _setIconURL:URL withType:type];
}
- (void)loadURL:(NSURL *)URL referrer:(NSString *)referrer reload:(BOOL)reload target:(NSString *)target triggeringEvent:(NSEvent *)event form:(NSObject <WebDOMElement> *)form formValues:(NSDictionary *)values
@@ -463,7 +463,7 @@
return [_frame _generateFrameName];
}
-- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName withURL:(NSString *)URL
+- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName withURL:(NSURL *)URL
renderPart:(KHTMLRenderPart *)childRenderPart
allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
{
@@ -478,7 +478,7 @@
[[newFrame frameView] _setMarginWidth:width];
[[newFrame frameView] _setMarginHeight:height];
- [_frame _loadURL:[NSURL _web_URLWithString:URL] intoChild:newFrame];
+ [_frame _loadURL:URL intoChild:newFrame];
return [newFrame _bridge];
}
@@ -511,9 +511,9 @@
return true;
}
-- (NSString *)userAgentForURL:(NSString *)URL
+- (NSString *)userAgentForURL:(NSURL *)URL
{
- return [[_frame webView] userAgentForURL:[NSURL _web_URLWithString:URL]];
+ return [[_frame webView] userAgentForURL:URL];
}
- (NSView *)nextKeyViewOutsideWebFrameViews
@@ -565,9 +565,11 @@
[view setNeedsDisplay:YES];
}
-- (NSString *)requestedURL
+// OK to be an NSString rather than an NSURL.
+// This URL is only used for coloring visited links.
+- (NSString *)requestedURLString
{
- return [[[[self dataSource] request] URL] absoluteString];
+ return [[[[self dataSource] request] URL] _web_absoluteString];
}
- (NSString *)incomingReferrer
@@ -598,10 +600,10 @@
return [[pluginPackage viewFactory] pluginViewWithArguments:arguments];
}
-- (NSView *)viewForPluginWithURLString:(NSString *)URLString
- attributes:(NSArray *)attributesArray
- baseURLString:(NSString *)baseURLString
- MIMEType:(NSString *)MIMEType
+- (NSView *)viewForPluginWithURL:(NSURL *)URL
+ attributes:(NSArray *)attributesArray
+ baseURL:(NSURL *)baseURL
+ MIMEType:(NSString *)MIMEType;
{
NSRange r1, r2, r3;
uint i;
@@ -627,8 +629,6 @@
}
}
- NSURL *URL = URLString ? [NSURL _web_URLWithString:URLString] : nil;
- NSURL *baseURL = baseURLString ? [NSURL _web_URLWithString:baseURLString] : nil;
WebBasePluginPackage *pluginPackage = nil;
NSView *view = nil;
int errorCode = 0;
@@ -672,7 +672,7 @@
if (errorCode) {
NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
- contentURLString:URLString
+ contentURLString:[URL _web_absoluteString]
pluginPageURLString:[attributes objectForKey:@"pluginspage"]
pluginName:[pluginPackage name]
MIMEType:MIMEType];
@@ -691,9 +691,8 @@
- (NSView *)viewForJavaAppletWithFrame:(NSRect)theFrame
attributes:(NSDictionary *)attributes
- baseURLString:(NSString *)baseURLString
+ baseURL:(NSURL *)baseURL;
{
- NSURL *baseURL = baseURLString ? [NSURL _web_URLWithString:baseURLString] : nil;
NSString *MIMEType = @"application/x-java-applet";
WebBasePluginPackage *pluginPackage;
NSView *view = nil;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index f31fd97..a8cf68e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -591,7 +591,7 @@
- (void)_receivedError:(NSError *)error complete:(BOOL)isComplete
{
if (!_private->committed) {
- [[[self webFrame] _bridge] didNotOpenURL:[[_private->originalRequestCopy URL] absoluteString]];
+ [[[self webFrame] _bridge] didNotOpenURL:[_private->originalRequestCopy URL]];
}
[[self _webView] _mainReceivedError:error
fromDataSource:self
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 2a09d6e..83a07f1 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -887,7 +887,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
int i, count = [responses count];
for (i = 0; i < count; i++){
response = [responses objectAtIndex: i];
- [_private->bridge objectLoadedFromCacheWithURL: [[response URL] absoluteString]
+ [_private->bridge objectLoadedFromCacheWithURL:[response URL]
response: response
size: [response expectedContentLength]];
}
@@ -1598,7 +1598,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[self _addBackForwardItemClippedAtTarget:NO];
}
- [_private->bridge scrollToAnchorWithURL:[URL absoluteString]];
+ [_private->bridge scrollToAnchorWithURL:URL];
if (!isRedirect) {
// This will clear previousItem from the rest of the frame tree tree that didn't
@@ -1698,7 +1698,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
if (!isFormSubmission
&& loadType != WebFrameLoadTypeReload
&& loadType != WebFrameLoadTypeSame
- && ![self _shouldReloadForCurrent:URL andDestination:[NSURL _web_URLWithString:[_private->bridge URL]]]) {
+ && ![self _shouldReloadForCurrent:URL andDestination:[_private->bridge URL]]) {
// Just do anchor navigation within the existing content.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list