Changeset 159895 in webkit

Timestamp:

Nov 30, 2013, 10:24:05 PM (11 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/WKNSURLExtras.h (modified) (1 diff)
• Shared/Cocoa/WKNSURLExtras.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKBackForwardListItem.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKNavigationData.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2013-11-30  Dan Bernstein  <mitz@apple.com>
+
+        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  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h ¶

@@ -28 +28 @@
 @interface NSURL (WKExtras)
 
++ (instancetype)_web_URLWithWTFString:(const String&)string;
 + (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL;
 

trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm ¶

@@ -35 +35 @@
 @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)
@@ -42 +42 @@
     CString buffer = string.utf8();
     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);
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm ¶

@@ -46 +46 @@
 - (NSURL *)URL
 {
-    return [NSURL _web_URLWithWTFString:_item->url() relativeToURL:nil];
+    return [NSURL _web_URLWithWTFString:_item->url()];
 }
 
@@ -59 +59 @@
 - (NSURL *)originalURL
 {
-    return [NSURL _web_URLWithWTFString:_item->originalURL() relativeToURL:nil];
+    return [NSURL _web_URLWithWTFString:_item->originalURL()];
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm ¶

@@ -278 +278 @@
 - (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()];
 }
 
@@ -507 +507 @@
             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];
             }
             

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm ¶

@@ -58 +58 @@
 - (NSURL *)destinationURL
 {
-    return [NSURL _web_URLWithWTFString:_data->url() relativeToURL:nil];
+    return [NSURL _web_URLWithWTFString:_data->url()];
 }