Changeset 159895 in webkit


Ignore:
Timestamp:
Nov 30, 2013 10:24:05 PM (10 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r159894 r159895  
     12013-11-30  Dan Bernstein  <mitz@apple.com>
     2
     3        Added a version of +[NSURL _web_URLWithWTFString:relativeToURL:] that doesn’t take a base URL and switched all callers to it.
     4        https://bugs.webkit.org/show_bug.cgi?id=125040
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Shared/Cocoa/WKNSURLExtras.h: Declared new method.
     9        * Shared/Cocoa/WKNSURLExtras.mm:
     10        (urlWithWTFString): Added helper function.
     11        (+[NSURL _web_URLWithWTFString:]): Added.
     12        (+[NSURL _web_URLWithWTFString:relativeToURL:]): Changed to use helper function.
     13        * UIProcess/API/Cocoa/WKBackForwardListItem.mm:
     14        (-[WKBackForwardListItem URL]): Changed to call new method.
     15        (-[WKBackForwardListItem originalURL]): Ditto.
     16        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
     17        (-[WKBrowsingContextController activeURL]): Ditto.
     18        (-[WKBrowsingContextController provisionalURL]): Ditto.
     19        (-[WKBrowsingContextController committedURL]): Ditto.
     20        (-[WKBrowsingContextController unreachableURL]): Ditto.
     21        (setUpPagePolicyClient): Ditto.
     22        * UIProcess/API/Cocoa/WKNavigationData.mm:
     23        (-[WKNavigationData destinationURL]): Ditto.
     24
    1252013-11-30  Dan Bernstein  <mitz@apple.com>
    226
  • trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h

    r159894 r159895  
    2828@interface NSURL (WKExtras)
    2929
     30+ (instancetype)_web_URLWithWTFString:(const String&)string;
    3031+ (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL;
    3132
  • trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm

    r159894 r159895  
    3535@implementation NSURL (WKExtras)
    3636
    37 + (instancetype)_web_URLWithWTFString:(const WTF::String&)string relativeToURL:(NSURL *)baseURL
     37static inline NSURL *urlWithWTFString(const String& string, NSURL *baseURL = nil)
    3838{
    3939    if (!string)
     
    4242    CString buffer = string.utf8();
    4343    return CFBridgingRelease(createCFURLFromBuffer(buffer.data(), buffer.length(), (CFURLRef)baseURL).leakRef());
     44}
     45
     46+ (instancetype)_web_URLWithWTFString:(const String&)string
     47{
     48    return urlWithWTFString(string);
     49}
     50
     51+ (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL
     52{
     53    return urlWithWTFString(string, baseURL);
    4454}
    4555
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm

    r159881 r159895  
    4646- (NSURL *)URL
    4747{
    48     return [NSURL _web_URLWithWTFString:_item->url() relativeToURL:nil];
     48    return [NSURL _web_URLWithWTFString:_item->url()];
    4949}
    5050
     
    5959- (NSURL *)originalURL
    6060{
    61     return [NSURL _web_URLWithWTFString:_item->originalURL() relativeToURL:nil];
     61    return [NSURL _web_URLWithWTFString:_item->originalURL()];
    6262}
    6363
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

    r159894 r159895  
    278278- (NSURL *)activeURL
    279279{
    280     return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL() relativeToURL:nil];
     280    return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
    281281}
    282282
    283283- (NSURL *)provisionalURL
    284284{
    285     return [NSURL _web_URLWithWTFString:_page->pageLoadState().provisionalURL() relativeToURL:nil];
     285    return [NSURL _web_URLWithWTFString:_page->pageLoadState().provisionalURL()];
    286286}
    287287
    288288- (NSURL *)committedURL
    289289{
    290     return [NSURL _web_URLWithWTFString:_page->pageLoadState().url() relativeToURL:nil];
     290    return [NSURL _web_URLWithWTFString:_page->pageLoadState().url()];
    291291}
    292292
    293293- (NSURL *)unreachableURL
    294294{
    295     return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL() relativeToURL:nil];
     295    return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL()];
    296296}
    297297
     
    507507            if (originatingFrame) {
    508508                actionDictionary = [[actionDictionary mutableCopy] autorelease];
    509                 [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url() relativeToURL:nil] forKey:WKActionOriginatingFrameURLKey];
     509                [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url()] forKey:WKActionOriginatingFrameURLKey];
    510510            }
    511511           
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm

    r159881 r159895  
    5858- (NSURL *)destinationURL
    5959{
    60     return [NSURL _web_URLWithWTFString:_data->url() relativeToURL:nil];
     60    return [NSURL _web_URLWithWTFString:_data->url()];
    6161}
    6262
Note: See TracChangeset for help on using the changeset viewer.