Changeset 164568 in webkit


Ignore:
Timestamp:
Feb 23, 2014 5:23:57 PM (10 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

Change a url parameter type with URL in NavigatorContentUtils
​https://bugs.webkit.org/show_bug.cgi?id=129202

Reviewed by Sam Weinig.

It would be good if we use *URL* for url parameters instead of using String.

Merge from blink. ​https://src.chromium.org/viewvc/blink?view=rev&revision=165458.

Source/WebCore:

  • Modules/navigatorcontentutils/NavigatorContentUtils.cpp:

(WebCore::verifyCustomHandlerURL):
(WebCore::NavigatorContentUtils::registerProtocolHandler):
(WebCore::NavigatorContentUtils::isProtocolHandlerRegistered):
(WebCore::NavigatorContentUtils::unregisterProtocolHandler):

  • Modules/navigatorcontentutils/NavigatorContentUtilsClient.h:

Source/WebKit/efl:

  • WebCoreSupport/NavigatorContentUtilsClientEfl.cpp:

(WebCore::NavigatorContentUtilsClientEfl::registerProtocolHandler):
(WebCore::NavigatorContentUtilsClientEfl::isProtocolHandlerRegistered):
(WebCore::NavigatorContentUtilsClientEfl::unregisterProtocolHandler):

  • WebCoreSupport/NavigatorContentUtilsClientEfl.h:

Source/WebKit/gtk:

  • WebCoreSupport/NavigatorContentUtilsClientGtk.cpp:

(WebKit::NavigatorContentUtilsClient::registerProtocolHandler):

  • WebCoreSupport/NavigatorContentUtilsClientGtk.h:

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebNavigatorContentUtilsClient.h:

(WebKit::WebNavigatorContentUtilsClient::isProtocolHandlerRegistered):
(WebKit::WebNavigatorContentUtilsClient::unregisterProtocolHandler):

Location:
trunk/Source
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r164565 r164568  
     12014-02-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Change a url parameter type with URL in NavigatorContentUtils
     4        https://bugs.webkit.org/show_bug.cgi?id=129202
     5
     6        Reviewed by Sam Weinig.
     7
     8        It would be good if we use *URL* for url parameters instead of using String.
     9
     10        Merge from blink. https://src.chromium.org/viewvc/blink?view=rev&revision=165458.
     11
     12        * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
     13        (WebCore::verifyCustomHandlerURL):
     14        (WebCore::NavigatorContentUtils::registerProtocolHandler):
     15        (WebCore::NavigatorContentUtils::isProtocolHandlerRegistered):
     16        (WebCore::NavigatorContentUtils::unregisterProtocolHandler):
     17        * Modules/navigatorcontentutils/NavigatorContentUtilsClient.h:
     18
    1192014-02-23  Dean Jackson  <dino@apple.com>
    220

  • trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp

    r161661 r164568  
    6969}
    7070
    71 static bool verifyCustomHandlerURL(const String& baseURL, const String& url, ExceptionCode& ec)
     71static bool verifyCustomHandlerURL(const URL& baseURL, const String& url, ExceptionCode& ec)
    7272{
    7373    // The specification requires that it is a SYNTAX_ERR if the "%s" token is
    … …  
    8585    newURL.remove(index, WTF_ARRAY_LENGTH(token) - 1);
    8686
    87     URL base(ParsedURLString, baseURL);
    88     URL kurl(base, newURL);
     87    URL kurl(baseURL, newURL);
    8988
    9089    if (kurl.isEmpty() || !kurl.isValid()) {
    … …  
    142141        return;
    143142
    144     String baseURL = document->baseURL().baseAsString();
     143    URL baseURL = document->baseURL();
    145144
    146145    if (!verifyCustomHandlerURL(baseURL, url, ec))
    … …  
    150149        return;
    151150
    152     NavigatorContentUtils::from(navigator->frame()->page())->client()->registerProtocolHandler(scheme, baseURL, url, navigator->frame()->displayStringModifiedByEncoding(title));
     151    NavigatorContentUtils::from(navigator->frame()->page())->client()->registerProtocolHandler(scheme, baseURL, URL(ParsedURLString, url), navigator->frame()->displayStringModifiedByEncoding(title));
    153152}
    154153
    … …  
    181180
    182181    Document* document = navigator->frame()->document();
    183     String baseURL = document->baseURL().baseAsString();
     182    if (!document)
     183        return declined;
     184
     185    URL baseURL = document->baseURL();
    184186
    185187    if (!verifyCustomHandlerURL(baseURL, url, ec))
    … …  
    189191        return declined;
    190192
    191     return customHandlersStateString(NavigatorContentUtils::from(navigator->frame()->page())->client()->isProtocolHandlerRegistered(scheme, baseURL, url));
     193    return customHandlersStateString(NavigatorContentUtils::from(navigator->frame()->page())->client()->isProtocolHandlerRegistered(scheme, baseURL, URL(ParsedURLString, url)));
    192194}
    193195
    … …  
    198200
    199201    Document* document = navigator->frame()->document();
    200     String baseURL = document->baseURL().baseAsString();
     202    if (!document)
     203        return;
     204   
     205    URL baseURL = document->baseURL();
    201206
    202207    if (!verifyCustomHandlerURL(baseURL, url, ec))
    … …  
    206211        return;
    207212
    208     NavigatorContentUtils::from(navigator->frame()->page())->client()->unregisterProtocolHandler(scheme, baseURL, url);
     213    NavigatorContentUtils::from(navigator->frame()->page())->client()->unregisterProtocolHandler(scheme, baseURL, URL(ParsedURLString, url));
    209214}
    210215#endif

  • trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h

    r126735 r164568  
    2929#if ENABLE(NAVIGATOR_CONTENT_UTILS)
    3030
     31#include "URL.h"
    3132#include <wtf/text/WTFString.h>
    3233
    … …  
    3839public:
    3940    virtual ~NavigatorContentUtilsClient() { }
    40     virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) = 0;
     41    virtual void registerProtocolHandler(const String& scheme, const URL& baseURL, const URL&, const String& title) = 0;
    4142
    4243#if ENABLE(CUSTOM_SCHEME_HANDLER)
    … …  
    4748    };
    4849
    49     virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url) = 0;
    50     virtual void unregisterProtocolHandler(const String& scheme, const String& baseURL, const String& url) = 0;
     50    virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const URL& baseURL, const URL&) = 0;
     51    virtual void unregisterProtocolHandler(const String& scheme, const URL& baseURL, const URL&) = 0;
    5152#endif
    5253};

  • trunk/Source/WebKit/efl/ChangeLog

    r164245 r164568  
     12014-02-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Change a url parameter type with URL in NavigatorContentUtils
     4        https://bugs.webkit.org/show_bug.cgi?id=129202
     5
     6        Reviewed by Sam Weinig.
     7
     8        It would be good if we use *URL* for url parameters instead of using String.
     9
     10        Merge from blink. https://src.chromium.org/viewvc/blink?view=rev&revision=165458.
     11
     12        * WebCoreSupport/NavigatorContentUtilsClientEfl.cpp:
     13        (WebCore::NavigatorContentUtilsClientEfl::registerProtocolHandler):
     14        (WebCore::NavigatorContentUtilsClientEfl::isProtocolHandlerRegistered):
     15        (WebCore::NavigatorContentUtilsClientEfl::unregisterProtocolHandler):
     16        * WebCoreSupport/NavigatorContentUtilsClientEfl.h:
     17
    1182014-02-17  Sergio Correia  <sergio.correia@openbossa.org>
    219

  • trunk/Source/WebKit/efl/WebCoreSupport/NavigatorContentUtilsClientEfl.cpp

    r126735 r164568  
    6464}
    6565
    66 void NavigatorContentUtilsClientEfl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
     66void NavigatorContentUtilsClientEfl::registerProtocolHandler(const String& scheme, const URL& baseURL, const URL& url, const String& title)
    6767{
    68     Ewk_Custom_Handler_Data* data = customHandlerDataCreate(m_view, scheme.utf8().data(), baseURL.utf8().data(), url.utf8().data());
     68    Ewk_Custom_Handler_Data* data = customHandlerDataCreate(m_view, scheme.utf8().data(), baseURL.string().utf8().data(), url.string().utf8().data());
    6969    data->title = eina_stringshare_add(title.utf8().data());
    7070    ewk_custom_handler_register_protocol_handler(data);
    … …  
    7474
    7575#if ENABLE(CUSTOM_SCHEME_HANDLER)
    76 NavigatorContentUtilsClient::CustomHandlersState NavigatorContentUtilsClientEfl::isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url)
     76NavigatorContentUtilsClient::CustomHandlersState NavigatorContentUtilsClientEfl::isProtocolHandlerRegistered(const String& scheme, const URL& baseURL, const URL& url)
    7777{
    78     Ewk_Custom_Handler_Data* data = customHandlerDataCreate(m_view, scheme.utf8().data(), baseURL.utf8().data(), url.utf8().data());
     78    Ewk_Custom_Handler_Data* data = customHandlerDataCreate(m_view, scheme.utf8().data(), baseURL.string().utf8().data(), url.string().utf8().data());
    7979    NavigatorContentUtilsClient::CustomHandlersState result = static_cast<CustomHandlersState>(ewk_custom_handler_register_protocol_handler(data));
    8080    customHandlerDataDelete(data);
    … …  
    8383}
    8484
    85 void NavigatorContentUtilsClientEfl::unregisterProtocolHandler(const String& scheme, const String& baseURL, const String& url)
     85void NavigatorContentUtilsClientEfl::unregisterProtocolHandler(const String& scheme, const URL& baseURL, const URL& url)
    8686{
    87     Ewk_Custom_Handler_Data* data = customHandlerDataCreate(m_view, scheme.utf8().data(), baseURL.utf8().data(), url.utf8().data());
     87    Ewk_Custom_Handler_Data* data = customHandlerDataCreate(m_view, scheme.utf8().data(), baseURL.string().utf8().data(), url.string().utf8().data());
    8888    ewk_custom_handler_register_protocol_handler(data);
    8989    customHandlerDataDelete(data);

  • trunk/Source/WebKit/efl/WebCoreSupport/NavigatorContentUtilsClientEfl.h

    r126735 r164568  
    4040
    4141    ~NavigatorContentUtilsClientEfl() { }
    42     virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title);
     42    virtual void registerProtocolHandler(const String& scheme, const URL& baseURL, const URL&, const String& title);
    4343
    4444#if ENABLE(CUSTOM_SCHEME_HANDLER)
    45     virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url);
    46     virtual void unregisterProtocolHandler(const String& scheme, const String& baseURL, const String& url);
     45    virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const URL& baseURL, const URL&);
     46    virtual void unregisterProtocolHandler(const String& scheme, const URL& baseURL, const URL&);
    4747#endif
    4848

  • trunk/Source/WebKit/gtk/ChangeLog

    r164438 r164568  
     12014-02-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Change a url parameter type with URL in NavigatorContentUtils
     4        https://bugs.webkit.org/show_bug.cgi?id=129202
     5
     6        Reviewed by Sam Weinig.
     7
     8        It would be good if we use *URL* for url parameters instead of using String.
     9
     10        Merge from blink. https://src.chromium.org/viewvc/blink?view=rev&revision=165458.
     11
     12        * WebCoreSupport/NavigatorContentUtilsClientGtk.cpp:
     13        (WebKit::NavigatorContentUtilsClient::registerProtocolHandler):
     14        * WebCoreSupport/NavigatorContentUtilsClientGtk.h:
     15
    1162014-02-20  Enrique Ocaña González  <eocanha@igalia.com>
    217

  • trunk/Source/WebKit/gtk/WebCoreSupport/NavigatorContentUtilsClientGtk.cpp

    r126735 r164568  
    3636}
    3737
    38 void NavigatorContentUtilsClient::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
    39 { 
    40     notImplemented(); 
     38void NavigatorContentUtilsClient::registerProtocolHandler(const String& scheme, const URL& baseURL, const URL& url, const String& title)
     39{
     40    notImplemented();
    4141}
    4242

  • trunk/Source/WebKit/gtk/WebCoreSupport/NavigatorContentUtilsClientGtk.h

    r126735 r164568  
    3333    ~NavigatorContentUtilsClient() { }
    3434
    35     virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title);
     35    virtual void registerProtocolHandler(const String& scheme, const URL& baseURL, const URL&, const String& title);
    3636
    3737private:

  • trunk/Source/WebKit2/ChangeLog

    r164563 r164568  
     12014-02-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Change a url parameter type with URL in NavigatorContentUtils
     4        https://bugs.webkit.org/show_bug.cgi?id=129202
     5
     6        Reviewed by Sam Weinig.
     7
     8        It would be good if we use *URL* for url parameters instead of using String.
     9
     10        Merge from blink. https://src.chromium.org/viewvc/blink?view=rev&revision=165458.
     11
     12        * WebProcess/WebCoreSupport/WebNavigatorContentUtilsClient.h:
     13        (WebKit::WebNavigatorContentUtilsClient::isProtocolHandlerRegistered):
     14        (WebKit::WebNavigatorContentUtilsClient::unregisterProtocolHandler):
     15
    1162014-02-23  Sam Weinig  <sam@webkit.org>
    217

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebNavigatorContentUtilsClient.h

    r162139 r164568  
    3939
    4040private:
    41     virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) override { }
     41    virtual void registerProtocolHandler(const String& scheme, const URL& baseURL, const URL& url, const String& title) override { }
    4242
    4343#if ENABLE(CUSTOM_SCHEME_HANDLER)
    44     virtual CustomHandlersState isProtocolHandlerRegistered(const String&, const String&, const String&) { return CustomHandlersDeclined; }
    45     virtual void unregisterProtocolHandler(const String&, const String&, const String&) { }
     44    virtual CustomHandlersState isProtocolHandlerRegistered(const String&, const URL&, const URL&) { return CustomHandlersDeclined; }
     45    virtual void unregisterProtocolHandler(const String&, const URL&, const URL&) { }
    4646#endif
    4747};
Note: See TracChangeset for help on using the changeset viewer.