Title: [159895] trunk/Source/WebKit2
- Revision
- 159895
- Author
- [email protected]
- Date
- 2013-11-30 22:24:05 -0800 (Sat, 30 Nov 2013)
Log Message
Added a version of +[NSURL _web_URLWithWTFString:relativeToURL:] that doesn’t take a base URL and switched all callers to it.
https://bugs.webkit.org/show_bug.cgi?id=125040
Reviewed by Sam Weinig.
* Shared/Cocoa/WKNSURLExtras.h: Declared new method.
* Shared/Cocoa/WKNSURLExtras.mm:
(urlWithWTFString): Added helper function.
(+[NSURL _web_URLWithWTFString:]): Added.
(+[NSURL _web_URLWithWTFString:relativeToURL:]): Changed to use helper function.
* UIProcess/API/Cocoa/WKBackForwardListItem.mm:
(-[WKBackForwardListItem URL]): Changed to call new method.
(-[WKBackForwardListItem originalURL]): Ditto.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController activeURL]): Ditto.
(-[WKBrowsingContextController provisionalURL]): Ditto.
(-[WKBrowsingContextController committedURL]): Ditto.
(-[WKBrowsingContextController unreachableURL]): Ditto.
(setUpPagePolicyClient): Ditto.
* UIProcess/API/Cocoa/WKNavigationData.mm:
(-[WKNavigationData destinationURL]): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159894 => 159895)
--- trunk/Source/WebKit2/ChangeLog 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-01 06:24:05 UTC (rev 159895)
@@ -1,5 +1,29 @@
2013-11-30 Dan Bernstein <[email protected]>
+ Added a version of +[NSURL _web_URLWithWTFString:relativeToURL:] that doesn’t take a base URL and switched all callers to it.
+ https://bugs.webkit.org/show_bug.cgi?id=125040
+
+ Reviewed by Sam Weinig.
+
+ * Shared/Cocoa/WKNSURLExtras.h: Declared new method.
+ * Shared/Cocoa/WKNSURLExtras.mm:
+ (urlWithWTFString): Added helper function.
+ (+[NSURL _web_URLWithWTFString:]): Added.
+ (+[NSURL _web_URLWithWTFString:relativeToURL:]): Changed to use helper function.
+ * UIProcess/API/Cocoa/WKBackForwardListItem.mm:
+ (-[WKBackForwardListItem URL]): Changed to call new method.
+ (-[WKBackForwardListItem originalURL]): Ditto.
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController activeURL]): Ditto.
+ (-[WKBrowsingContextController provisionalURL]): Ditto.
+ (-[WKBrowsingContextController committedURL]): Ditto.
+ (-[WKBrowsingContextController unreachableURL]): Ditto.
+ (setUpPagePolicyClient): Ditto.
+ * UIProcess/API/Cocoa/WKNavigationData.mm:
+ (-[WKNavigationData destinationURL]): Ditto.
+
+2013-11-30 Dan Bernstein <[email protected]>
+
[Cocoa] Stop using the WKPageRef API in WKBrowsingContextController
https://bugs.webkit.org/show_bug.cgi?id=125036
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h (159894 => 159895)
--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h 2013-12-01 06:24:05 UTC (rev 159895)
@@ -27,6 +27,7 @@
@interface NSURL (WKExtras)
++ (instancetype)_web_URLWithWTFString:(const String&)string;
+ (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL;
- (String)_web_originalDataAsWTFString;
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm (159894 => 159895)
--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm 2013-12-01 06:24:05 UTC (rev 159895)
@@ -34,7 +34,7 @@
@implementation NSURL (WKExtras)
-+ (instancetype)_web_URLWithWTFString:(const WTF::String&)string relativeToURL:(NSURL *)baseURL
+static inline NSURL *urlWithWTFString(const String& string, NSURL *baseURL = nil)
{
if (!string)
return nil;
@@ -43,6 +43,16 @@
return CFBridgingRelease(createCFURLFromBuffer(buffer.data(), buffer.length(), (CFURLRef)baseURL).leakRef());
}
++ (instancetype)_web_URLWithWTFString:(const String&)string
+{
+ return urlWithWTFString(string);
+}
+
++ (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL
+{
+ return urlWithWTFString(string, baseURL);
+}
+
- (String)_web_originalDataAsWTFString
{
CString originalData;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm (159894 => 159895)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm 2013-12-01 06:24:05 UTC (rev 159895)
@@ -45,7 +45,7 @@
- (NSURL *)URL
{
- return [NSURL _web_URLWithWTFString:_item->url() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_item->url()];
}
- (NSString *)title
@@ -58,7 +58,7 @@
- (NSURL *)originalURL
{
- return [NSURL _web_URLWithWTFString:_item->originalURL() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_item->originalURL()];
}
#pragma mark WKObject protocol implementation
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (159894 => 159895)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-01 06:24:05 UTC (rev 159895)
@@ -277,22 +277,22 @@
- (NSURL *)activeURL
{
- return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
}
- (NSURL *)provisionalURL
{
- return [NSURL _web_URLWithWTFString:_page->pageLoadState().provisionalURL() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().provisionalURL()];
}
- (NSURL *)committedURL
{
- return [NSURL _web_URLWithWTFString:_page->pageLoadState().url() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().url()];
}
- (NSURL *)unreachableURL
{
- return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL()];
}
- (double)estimatedProgress
@@ -506,7 +506,7 @@
if (originatingFrame) {
actionDictionary = [[actionDictionary mutableCopy] autorelease];
- [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url() relativeToURL:nil] forKey:WKActionOriginatingFrameURLKey];
+ [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url()] forKey:WKActionOriginatingFrameURLKey];
}
[browsingContext.policyDelegate browsingContextController:browsingContext decidePolicyForNavigationAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm (159894 => 159895)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm 2013-12-01 06:24:05 UTC (rev 159895)
@@ -57,7 +57,7 @@
- (NSURL *)destinationURL
{
- return [NSURL _web_URLWithWTFString:_data->url() relativeToURL:nil];
+ return [NSURL _web_URLWithWTFString:_data->url()];
}
- (NSURLResponse *)response
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
