⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 194419 in webkit


Ignore:
Timestamp:
Dec 25, 2015, 4:22:16 AM (11 years ago)
Author:
ddkilzer@apple.com
Message:

ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
<​http://webkit.org/b/146391>

Reviewed by Antti Koivisto.

Source/WebCore:

  • loader/DocumentThreadableLoader.cpp:

(WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
(WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
(WebCore::DocumentThreadableLoader::didReceiveResponse):
(WebCore::DocumentThreadableLoader::preflightFailure):

  • loader/DocumentThreadableLoader.h:

(WebCore::DocumentThreadableLoader::preflightFailure):

  • Switch type of 'url' argument of preflightFailure() from String to URL.
  • Update for type change of 'failingURL' argument to ResourceError().
  • loader/EmptyClients.h:
  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadResourceSynchronously):

  • loader/MediaResourceLoader.cpp:

(WebCore::MediaResourceLoader::responseReceived):

  • loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::loadDataURL):

  • loader/WorkerThreadableLoader.cpp:

(WebCore::WorkerThreadableLoader::MainThreadBridge::cancel):

  • loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):

  • Update for type change of 'failingURL' argument to ResourceError().
  • page/EventSource.cpp:

(WebCore::EventSource::didFailAccessControlCheck):

  • Convert failingURL() to String explicitly.
  • platform/efl/ErrorsEfl.cpp:

(WebCore::cancelledError):
(WebCore::blockedError):
(WebCore::blockedByContentBlockerError):
(WebCore::cannotShowURLError):
(WebCore::interruptedForPolicyChangeError):
(WebCore::cannotShowMIMETypeError):
(WebCore::fileDoesNotExistError):
(WebCore::pluginWillHandleLoadError):
(WebCore::downloadCancelledByUserError):
(WebCore::downloadDestinationError):

  • platform/gtk/ErrorsGtk.cpp:

(WebCore::cancelledError):
(WebCore::blockedError):
(WebCore::blockedByContentBlockerError):
(WebCore::cannotShowURLError):
(WebCore::interruptedForPolicyChangeError):
(WebCore::cannotShowMIMETypeError):
(WebCore::fileDoesNotExistError):
(WebCore::pluginWillHandleLoadError):
(WebCore::downloadCancelledByUserError):
(WebCore::downloadDestinationError):

  • Update for type change of 'failingURL' argument to ResourceError().
  • platform/network/ResourceErrorBase.h:

(WebCore::ResourceErrorBase::failingURL):

  • Change return type from String to URL.

(WebCore::ResourceErrorBase::ResourceErrorBase):

  • platform/network/cf/ResourceError.h:

(WebCore::ResourceError::ResourceError):

  • Change type of 'failingURL' from String to URL.
  • platform/network/cf/ResourceErrorCF.cpp:

(WebCore::ResourceError::ResourceError):

  • Change type of 'failingURL' from String to URL.

(WebCore::ResourceError::platformLazyInit):

  • Clean up code and address FIXME by parsing CFURLRef using URL() constructor.

(WebCore::ResourceError::cfError):

  • Clean up code and address FIXME after switching type of m_failingURL.
  • platform/network/curl/ResourceError.h:

(WebCore::ResourceError::ResourceError):

  • Change type of 'failingURL' from String to URL.
  • platform/network/mac/ResourceErrorMac.mm:

(WebCore::createNSErrorFromResourceErrorBase):
(WebCore::ResourceError::platformLazyInit):

  • Clean up code and address FIXME after switching type of m_failingURL.
  • platform/network/soup/ResourceError.h:

(WebCore::ResourceError::ResourceError):
(WebCore::ResourceError::timeoutError):

  • platform/network/soup/ResourceErrorSoup.cpp:

(WebCore::failingURI):
(WebCore::ResourceError::timeoutError):

  • platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::ResourceHandle::timeoutFired):

  • Change type of 'failingURL' from String to URL.
  • xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::didFail):

  • Convert failingURL() to String explicitly.
  • Also switch to using makeString().

Source/WebKit/win:

  • WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::cancelledError):
(WebFrameLoaderClient::blockedError):
(WebFrameLoaderClient::cannotShowURLError):
(WebFrameLoaderClient::interruptedForPolicyChangeError):
(WebFrameLoaderClient::cannotShowMIMETypeError):
(WebFrameLoaderClient::fileDoesNotExistError):
(WebFrameLoaderClient::pluginWillHandleLoadError):
(WebFrameLoaderClient::dispatchDidFailToStartPlugin):
(WebFrameLoaderClient::createJavaAppletWidget):

  • WebDownloadCFNet.cpp:

(WebDownload::cancelAuthenticationChallenge):

  • WebError.cpp:

(WebError::init):

  • Update for type change of 'failingURL' argument to ResourceError().

Source/WebKit2:

  • NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp:

(WebKit::platformDownloadNetworkError):

  • NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp:

(WebKit::platformDownloadNetworkError):

  • NetworkProcess/Downloads/soup/DownloadSoup.cpp:

(WebKit::DownloadClient::didReceiveResponse):

  • NetworkProcess/Downloads/soup/DownloadSoupErrors.h:
  • Shared/soup/WebCoreArgumentCodersSoup.cpp:

(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):

  • UIProcess/API/gtk/WebKitLoaderClient.cpp:

(LoaderClient::didFailProvisionalLoadWithErrorForFrame):
(LoaderClient::didFailLoadWithErrorForFrame):

  • UIProcess/API/gtk/WebKitURISchemeRequest.cpp:

(webkit_uri_scheme_request_finish_error):

  • WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:

(WebKit::internalError):

  • WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:

(WebKit::internalError):

  • Update for type change of 'failingURL' argument to ResourceError().
Location:
trunk/Source
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r194418 r194419  
     12015-12-25  David Kilzer  <ddkilzer@apple.com>
     2
     3        ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
     4        <http://webkit.org/b/146391>
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * loader/DocumentThreadableLoader.cpp:
     9        (WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
     10        (WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
     11        (WebCore::DocumentThreadableLoader::didReceiveResponse):
     12        (WebCore::DocumentThreadableLoader::preflightFailure):
     13        * loader/DocumentThreadableLoader.h:
     14        (WebCore::DocumentThreadableLoader::preflightFailure):
     15        - Switch type of 'url' argument of preflightFailure() from
     16          String to URL.
     17        - Update for type change of 'failingURL' argument to
     18          ResourceError().
     19
     20        * loader/EmptyClients.h:
     21        * loader/FrameLoader.cpp:
     22        (WebCore::FrameLoader::loadResourceSynchronously):
     23        * loader/MediaResourceLoader.cpp:
     24        (WebCore::MediaResourceLoader::responseReceived):
     25        * loader/ResourceLoader.cpp:
     26        (WebCore::ResourceLoader::loadDataURL):
     27        * loader/WorkerThreadableLoader.cpp:
     28        (WebCore::WorkerThreadableLoader::MainThreadBridge::cancel):
     29        * loader/cache/CachedResourceLoader.cpp:
     30        (WebCore::CachedResourceLoader::requestResource):
     31        - Update for type change of 'failingURL' argument to
     32          ResourceError().
     33
     34        * page/EventSource.cpp:
     35        (WebCore::EventSource::didFailAccessControlCheck):
     36        - Convert failingURL() to String explicitly.
     37
     38        * platform/efl/ErrorsEfl.cpp:
     39        (WebCore::cancelledError):
     40        (WebCore::blockedError):
     41        (WebCore::blockedByContentBlockerError):
     42        (WebCore::cannotShowURLError):
     43        (WebCore::interruptedForPolicyChangeError):
     44        (WebCore::cannotShowMIMETypeError):
     45        (WebCore::fileDoesNotExistError):
     46        (WebCore::pluginWillHandleLoadError):
     47        (WebCore::downloadCancelledByUserError):
     48        (WebCore::downloadDestinationError):
     49        * platform/gtk/ErrorsGtk.cpp:
     50        (WebCore::cancelledError):
     51        (WebCore::blockedError):
     52        (WebCore::blockedByContentBlockerError):
     53        (WebCore::cannotShowURLError):
     54        (WebCore::interruptedForPolicyChangeError):
     55        (WebCore::cannotShowMIMETypeError):
     56        (WebCore::fileDoesNotExistError):
     57        (WebCore::pluginWillHandleLoadError):
     58        (WebCore::downloadCancelledByUserError):
     59        (WebCore::downloadDestinationError):
     60        - Update for type change of 'failingURL' argument to
     61          ResourceError().
     62
     63        * platform/network/ResourceErrorBase.h:
     64        (WebCore::ResourceErrorBase::failingURL):
     65        - Change return type from String to URL.
     66        (WebCore::ResourceErrorBase::ResourceErrorBase):
     67        * platform/network/cf/ResourceError.h:
     68        (WebCore::ResourceError::ResourceError):
     69        - Change type of 'failingURL' from String to URL.
     70
     71        * platform/network/cf/ResourceErrorCF.cpp:
     72        (WebCore::ResourceError::ResourceError):
     73        - Change type of 'failingURL' from String to URL.
     74        (WebCore::ResourceError::platformLazyInit):
     75        - Clean up code and address FIXME by parsing CFURLRef using
     76          URL() constructor.
     77        (WebCore::ResourceError::cfError):
     78        - Clean up code and address FIXME after switching type of
     79          m_failingURL.
     80
     81        * platform/network/curl/ResourceError.h:
     82        (WebCore::ResourceError::ResourceError):
     83        - Change type of 'failingURL' from String to URL.
     84
     85        * platform/network/mac/ResourceErrorMac.mm:
     86        (WebCore::createNSErrorFromResourceErrorBase):
     87        (WebCore::ResourceError::platformLazyInit):
     88        - Clean up code and address FIXME after switching type of
     89          m_failingURL.
     90
     91        * platform/network/soup/ResourceError.h:
     92        (WebCore::ResourceError::ResourceError):
     93        (WebCore::ResourceError::timeoutError):
     94        * platform/network/soup/ResourceErrorSoup.cpp:
     95        (WebCore::failingURI):
     96        (WebCore::ResourceError::timeoutError):
     97        * platform/network/soup/ResourceHandleSoup.cpp:
     98        (WebCore::ResourceHandle::timeoutFired):
     99        - Change type of 'failingURL' from String to URL.
     100
     101        * xml/XMLHttpRequest.cpp:
     102        (WebCore::XMLHttpRequest::didFail):
     103        - Convert failingURL() to String explicitly.
     104        - Also switch to using makeString().
     105
    11062015-12-24  Zalan Bujtas  <zalan@apple.com>
    2107

  • trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

    r191369 r194419  
    8686
    8787    if (m_options.crossOriginRequestPolicy == DenyCrossOriginRequests) {
    88         m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, request.url().string(), "Cross origin requests are not supported."));
     88        m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, request.url(), "Cross origin requests are not supported."));
    8989        return;
    9090    }
    … …  
    120120    // Cross-origin requests are only allowed for HTTP and registered schemes. We would catch this when checking response headers later, but there is no reason to send a request that's guaranteed to be denied.
    121121    if (!SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(request.url().protocol())) {
    122         m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, request.url().string(), "Cross origin requests are only supported for HTTP."));
     122        m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, request.url(), "Cross origin requests are only supported for HTTP."));
    123123        return;
    124124    }
    … …  
    262262        if (!m_sameOriginRequest && m_options.crossOriginRequestPolicy == UseAccessControl) {
    263263            if (!passesAccessControlCheck(response, m_options.allowCredentials(), securityOrigin(), accessControlErrorDescription)) {
    264                 m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, response.url().string(), accessControlErrorDescription));
     264                m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, response.url(), accessControlErrorDescription));
    265265                return;
    266266            }
    … …  
    334334}
    335335
    336 void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const String& url, const String& errorDescription)
     336void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const URL& url, const String& errorDescription)
    337337{
    338338    ResourceError error(errorDomainWebKitInternal, 0, url, errorDescription);

  • trunk/Source/WebCore/loader/DocumentThreadableLoader.h

    r184069 r194419  
    9292        void makeCrossOriginAccessRequestWithPreflight(const ResourceRequest& request);
    9393        void preflightSuccess();
    94         void preflightFailure(unsigned long identifier, const String& url, const String& errorDescription);
     94        void preflightFailure(unsigned long identifier, const URL&, const String& errorDescription);
    9595
    9696        void loadRequest(const ResourceRequest&, SecurityCheckPolicy);

  • trunk/Source/WebCore/loader/EmptyClients.h

    r193645 r194419  
    321321    virtual void finishedLoading(DocumentLoader*) override { }
    322322
    323     virtual ResourceError cancelledError(const ResourceRequest&) override { ResourceError error("", 0, "", ""); error.setIsCancellation(true); return error; }
    324     virtual ResourceError blockedError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
    325     virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
    326     virtual ResourceError cannotShowURLError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
    327     virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
    328 
    329     virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) override { return ResourceError("", 0, "", ""); }
    330     virtual ResourceError fileDoesNotExistError(const ResourceResponse&) override { return ResourceError("", 0, "", ""); }
    331     virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&) override { return ResourceError("", 0, "", ""); }
     323    virtual ResourceError cancelledError(const ResourceRequest&) override { ResourceError error("", 0, URL(), ""); error.setIsCancellation(true); return error; }
     324    virtual ResourceError blockedError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
     325    virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
     326    virtual ResourceError cannotShowURLError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
     327    virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
     328
     329    virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) override { return ResourceError("", 0, URL(), ""); }
     330    virtual ResourceError fileDoesNotExistError(const ResourceResponse&) override { return ResourceError("", 0, URL(), ""); }
     331    virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&) override { return ResourceError("", 0, URL(), ""); }
    332332
    333333    virtual bool shouldFallBack(const ResourceError&) override { return false; }

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r192848 r194419  
    26872687                if (m_documentLoader && controller->processContentExtensionRulesForLoad(newRequest, ResourceType::Raw, *m_documentLoader) == ContentExtensions::BlockedStatus::Blocked) {
    26882688                    newRequest = { };
    2689                     error = ResourceError(errorDomainWebKitInternal, 0, initialRequest.url().string(), emptyString());
     2689                    error = ResourceError(errorDomainWebKitInternal, 0, initialRequest.url(), emptyString());
    26902690                    response = { };
    26912691                    data = nullptr;

  • trunk/Source/WebCore/loader/MediaResourceLoader.cpp

    r189432 r194419  
    101101        m_document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());
    102102        m_didPassAccessControlCheck = false;
    103         m_client->accessControlCheckFailed(ResourceError(errorDomainWebKitInternal, 0, response.url().string(), consoleMessage.get()));
     103        m_client->accessControlCheckFailed(ResourceError(errorDomainWebKitInternal, 0, response.url(), consoleMessage.get()));
    104104        stop();
    105105        return;

  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r192995 r194419  
    258258            return;
    259259        if (!decodeResult) {
    260             loader->didFail(ResourceError(errorDomainWebKitInternal, 0, url.string(), "Data URL decoding failed"));
     260            loader->didFail(ResourceError(errorDomainWebKitInternal, 0, url, "Data URL decoding failed"));
    261261            return;
    262262        }

  • trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp

    r183169 r194419  
    140140        // If the client hasn't reached a termination state, then transition it by sending a cancellation error.
    141141        // Note: no more client callbacks will be done after this method -- the clearClientWrapper() call ensures that.
    142         ResourceError error(String(), 0, String(), String());
     142        ResourceError error(String(), 0, URL(), String());
    143143        error.setIsCancellation(true);
    144144        clientWrapper->didFail(error);

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r194386 r194419  
    545545                ASSERT(resource);
    546546                resource->error(CachedResource::Status::LoadError);
    547                 resource->setResourceError(ResourceError(ContentExtensions::WebKitContentBlockerDomain, 0, request.resourceRequest().url().string(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description")));
     547                resource->setResourceError(ResourceError(ContentExtensions::WebKitContentBlockerDomain, 0, request.resourceRequest().url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description")));
    548548                return resource;
    549549            }

  • trunk/Source/WebCore/page/EventSource.cpp

    r192848 r194419  
    274274void EventSource::didFailAccessControlCheck(const ResourceError& error)
    275275{
    276     String message = makeString("EventSource cannot load ", error.failingURL(), ". ", error.localizedDescription());
     276    String message = makeString("EventSource cannot load ", error.failingURL().string(), ". ", error.localizedDescription());
    277277    scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message);
    278278

  • trunk/Source/WebCore/platform/efl/ErrorsEfl.cpp

    r190611 r194419  
    3535ResourceError cancelledError(const ResourceRequest& request)
    3636{
    37     return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url().string(), ASCIILiteral("Load request cancelled"));
     37    return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url(), ASCIILiteral("Load request cancelled"));
    3838}
    3939
    4040ResourceError blockedError(const ResourceRequest& request)
    4141{
    42     return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url().string(), ASCIILiteral("Not allowed to use restricted network port"));
     42    return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url(), ASCIILiteral("Not allowed to use restricted network port"));
    4343}
    4444
    4545ResourceError blockedByContentBlockerError(const ResourceRequest& request)
    4646{
    47     return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url().string(), ASCIILiteral("Blocked by content blocker"));
     47    return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url(), ASCIILiteral("Blocked by content blocker"));
    4848}
    4949
    5050ResourceError cannotShowURLError(const ResourceRequest& request)
    5151{
    52     return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url().string(), ASCIILiteral("URL cannot be shown"));
     52    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url(), ASCIILiteral("URL cannot be shown"));
    5353}
    5454
    5555ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    5656{
    57     return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url().string(), ASCIILiteral("Frame load was interrupted"));
     57    return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url(), ASCIILiteral("Frame load was interrupted"));
    5858}
    5959
    6060ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
    6161{
    62     return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url().string(), ASCIILiteral("Content with the specified MIME type cannot be shown"));
     62    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url(), ASCIILiteral("Content with the specified MIME type cannot be shown"));
    6363}
    6464
    6565ResourceError fileDoesNotExistError(const ResourceResponse& response)
    6666{
    67     return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url().string(), ASCIILiteral("File does not exist"));
     67    return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url(), ASCIILiteral("File does not exist"));
    6868}
    6969
    7070ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    7171{
    72     return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url().string(), ASCIILiteral("Plugin will handle load"));
     72    return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url(), ASCIILiteral("Plugin will handle load"));
    7373}
    7474
    … …  
    8080ResourceError downloadCancelledByUserError(const ResourceResponse& response)
    8181{
    82     return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url().string(), ASCIILiteral("User cancelled the download"));
     82    return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url(), ASCIILiteral("User cancelled the download"));
    8383}
    8484
    8585ResourceError downloadDestinationError(const ResourceResponse& response, const String& errorMessage)
    8686{
    87     return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url().string(), errorMessage);
     87    return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url(), errorMessage);
    8888}
    8989

  • trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp

    r190611 r194419  
    3030ResourceError cancelledError(const ResourceRequest& request)
    3131{
    32     return ResourceError(errorDomainNetwork, NetworkErrorCancelled,
    33                          request.url().string(), _("Load request cancelled"));
     32    return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url(), _("Load request cancelled"));
    3433}
    3534
    3635ResourceError blockedError(const ResourceRequest& request)
    3736{
    38     return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort,
    39                          request.url().string(), _("Not allowed to use restricted network port"));
     37    return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url(), _("Not allowed to use restricted network port"));
    4038}
    4139
    4240ResourceError blockedByContentBlockerError(const ResourceRequest& request)
    4341{
    44     return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url().string(), _("Blocked by content blocker"));
     42    return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url(), _("Blocked by content blocker"));
    4543}
    4644
    4745ResourceError cannotShowURLError(const ResourceRequest& request)
    4846{
    49     return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL,
    50                          request.url().string(), _("URL cannot be shown"));
     47    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url(), _("URL cannot be shown"));
    5148}
    5249
    5350ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    5451{
    55     return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange,
    56                          request.url().string(), _("Frame load was interrupted"));
     52    return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url(), _("Frame load was interrupted"));
    5753}
    5854
    5955ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
    6056{
    61     return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType,
    62                          response.url().string(), _("Content with the specified MIME type cannot be shown"));
     57    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url(), _("Content with the specified MIME type cannot be shown"));
    6358}
    6459
    6560ResourceError fileDoesNotExistError(const ResourceResponse& response)
    6661{
    67     return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist,
    68                          response.url().string(), _("File does not exist"));
     62    return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url(), _("File does not exist"));
    6963}
    7064
    7165ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    7266{
    73     return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad,
    74                          response.url().string(), _("Plugin will handle load"));
     67    return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url(), _("Plugin will handle load"));
    7568}
    7669
    7770ResourceError downloadNetworkError(const ResourceError& networkError)
    7871{
    79     return ResourceError(errorDomainDownload, DownloadErrorNetwork,
    80                          networkError.failingURL(), networkError.localizedDescription());
     72    return ResourceError(errorDomainDownload, DownloadErrorNetwork, networkError.failingURL(), networkError.localizedDescription());
    8173}
    8274
    8375ResourceError downloadCancelledByUserError(const ResourceResponse& response)
    8476{
    85     return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser,
    86                          response.url().string(), _("User cancelled the download"));
     77    return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url(), _("User cancelled the download"));
    8778}
    8879
    8980ResourceError downloadDestinationError(const ResourceResponse& response, const String& errorMessage)
    9081{
    91     return ResourceError(errorDomainDownload, DownloadErrorDestination,
    92                          response.url().string(), errorMessage);
     82    return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url(), errorMessage);
    9383}
    9484

  • trunk/Source/WebCore/platform/network/ResourceErrorBase.h

    r172849 r194419  
    2727#define ResourceErrorBase_h
    2828
     29#include "URL.h"
    2930#include <wtf/text/WTFString.h>
    3031
    … …  
    4445    const String& domain() const { lazyInit(); return m_domain; }
    4546    int errorCode() const { lazyInit(); return m_errorCode; }
    46     const String& failingURL() const { lazyInit(); return m_failingURL; }
     47    const URL& failingURL() const { lazyInit(); return m_failingURL; }
    4748    const String& localizedDescription() const { lazyInit(); return m_localizedDescription; }
    4849
    … …  
    6465    }
    6566
    66     ResourceErrorBase(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
     67    ResourceErrorBase(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
    6768        : m_domain(domain)
    6869        , m_failingURL(failingURL)
    … …  
    8788
    8889    String m_domain;
    89     String m_failingURL;
     90    URL m_failingURL;
    9091    String m_localizedDescription;
    9192    int m_errorCode;

  • trunk/Source/WebCore/platform/network/cf/ResourceError.h

    r172849 r194419  
    5151    }
    5252
    53     ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
     53    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
    5454        : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
    5555        , m_dataIsUpToDate(true)
    … …  
    6464#if USE(CFNETWORK)
    6565#if PLATFORM(WIN)
    66     ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription, CFDataRef certificate);
     66    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate);
    6767    PCCERT_CONTEXT certificate() const;
    6868    void setCertificate(CFDataRef);

  • trunk/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp

    r186036 r194419  
    5050
    5151#if PLATFORM(WIN)
    52 ResourceError::ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription, CFDataRef certificate)
     52ResourceError::ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate)
    5353    : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
    5454    , m_dataIsUpToDate(true)
    … …  
    102102        CFStringRef failingURLString = (CFStringRef) CFDictionaryGetValue(userInfo.get(), failingURLStringKey);
    103103        if (failingURLString)
    104             m_failingURL = String(failingURLString);
     104            m_failingURL = URL(URL(), failingURLString);
    105105        else {
    106106            CFURLRef failingURL = (CFURLRef) CFDictionaryGetValue(userInfo.get(), failingURLKey);
    107107            if (failingURL) {
    108                 RetainPtr<CFURLRef> absoluteURLRef = adoptCF(CFURLCopyAbsoluteURL(failingURL));
    109                 if (absoluteURLRef.get()) {
    110                     // FIXME: CFURLGetString returns a normalized URL which is different from what is actually used by CFNetwork.
    111                     // We should use CFURLGetBytes instead.
    112                     failingURLString = CFURLGetString(absoluteURLRef.get());
    113                     m_failingURL = String(failingURLString);
    114                 }
     108                if (RetainPtr<CFURLRef> absoluteURLRef = adoptCF(CFURLCopyAbsoluteURL(failingURL)))
     109                    m_failingURL = URL(absoluteURLRef.get());
    115110            }
    116111        }
    … …  
    153148
    154149        if (!m_failingURL.isEmpty()) {
    155             RetainPtr<CFStringRef> failingURLString = m_failingURL.createCFString();
     150            RetainPtr<CFStringRef> failingURLString = m_failingURL.string().createCFString();
    156151            CFDictionarySetValue(userInfo.get(), failingURLStringKey, failingURLString.get());
    157             // FIXEME: We normally create a CFURL from a string by using URL::createCFURL, which handles
    158             // cases correctly that CFURLCreateWithString handles incorrectly.
    159             RetainPtr<CFURLRef> url = adoptCF(CFURLCreateWithString(0, failingURLString.get(), 0));
    160             if (url)
     152            if (RetainPtr<CFURLRef> url = m_failingURL.createCFURL())
    161153                CFDictionarySetValue(userInfo.get(), failingURLKey, url.get());
    162154        }

  • trunk/Source/WebCore/platform/network/curl/ResourceError.h

    r165676 r194419  
    4545    }
    4646
    47     ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
     47    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
    4848        : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription), m_sslErrors(0)
    4949    {

  • trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm

    r186036 r194419  
    183183
    184184    if (!resourceError.failingURL().isEmpty()) {
    185         // FIXEME: We normally create an NSURL from a string by using URL::createNSURL, which handles
    186         // cases correctly that initWithString: handles incorrectly.
    187         RetainPtr<NSURL> cocoaURL = adoptNS([[NSURL alloc] initWithString:resourceError.failingURL()]);
    188         [userInfo.get() setValue:resourceError.failingURL() forKey:@"NSErrorFailingURLStringKey"];
    189         if (cocoaURL)
    190             [userInfo.get() setValue:cocoaURL.get() forKey:@"NSErrorFailingURLKey"];
     185        [userInfo.get() setValue:(NSString *)resourceError.failingURL().string() forKey:@"NSErrorFailingURLStringKey"];
     186        if (NSURL *cocoaURL = (NSURL *)resourceError.failingURL())
     187            [userInfo.get() setValue:cocoaURL forKey:@"NSErrorFailingURLKey"];
    191188    }
    192189
    … …  
    267264    m_errorCode = [m_platformError.get() code];
    268265
    269     NSString* failingURLString = [[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLStringKey"];
    270     if (!failingURLString)
    271         failingURLString = [[[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLKey"] absoluteString];
    272     m_failingURL = failingURLString;
     266    if (NSString* failingURLString = [[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLStringKey"])
     267        m_failingURL = URL(URL(), failingURLString);
     268    else
     269        m_failingURL = URL((NSURL *)[[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLKey"]);
    273270    // Workaround for <rdar://problem/6554067>
    274271    m_localizedDescription = m_failingURL;

  • trunk/Source/WebCore/platform/network/soup/ResourceError.h

    r185502 r194419  
    4242{
    4343public:
    44     ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
     44    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
    4545        : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
    4646        , m_tlsErrors(0)
    … …  
    5757    static ResourceError genericGError(GError*, SoupRequest*);
    5858    static ResourceError tlsError(SoupRequest*, unsigned tlsErrors, GTlsCertificate*);
    59     static ResourceError timeoutError(const String& failingURL);
     59    static ResourceError timeoutError(const URL& failingURL);
    6060    static ResourceError authenticationError(SoupMessage*);
    6161

  • trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp

    r185502 r194419  
    3636namespace WebCore {
    3737
    38 static String failingURI(SoupURI* soupURI)
     38static URL failingURI(SoupURI* soupURI)
    3939{
    4040    ASSERT(soupURI);
    41     GUniquePtr<char> uri(soup_uri_to_string(soupURI, FALSE));
    42     return uri.get();
     41    return URL(soupURI);
    4342}
    4443
    45 static String failingURI(SoupRequest* request)
     44static URL failingURI(SoupRequest* request)
    4645{
    4746    ASSERT(request);
    … …  
    8685}
    8786
    88 ResourceError ResourceError::timeoutError(const String& failingURL)
     87ResourceError ResourceError::timeoutError(const URL& failingURL)
    8988{
    9089    // FIXME: This should probably either be integrated into Errors(Gtk/EFL).h or the

  • trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

    r191787 r194419  
    10521052void ResourceHandle::timeoutFired()
    10531053{
    1054     client()->didFail(this, ResourceError::timeoutError(firstRequest().url().string()));
     1054    client()->didFail(this, ResourceError::timeoutError(firstRequest().url()));
    10551055    cancel();
    10561056}

  • trunk/Source/WebCore/xml/XMLHttpRequest.cpp

    r192848 r194419  
    10781078
    10791079    // Network failures are already reported to Web Inspector by ResourceLoader.
    1080     if (error.domain() == errorDomainWebKitInternal)
    1081         logConsoleError(scriptExecutionContext(), "XMLHttpRequest cannot load " + error.failingURL() + ". " + error.localizedDescription());
     1080    if (error.domain() == errorDomainWebKitInternal) {
     1081        String message = makeString("XMLHttpRequest cannot load ", error.failingURL().string(), ". ", error.localizedDescription());
     1082        logConsoleError(scriptExecutionContext(), message);
     1083    }
    10821084
    10831085    m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;

  • trunk/Source/WebKit/win/ChangeLog

    r194398 r194419  
     12015-12-25  David Kilzer  <ddkilzer@apple.com>
     2
     3        ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
     4        <http://webkit.org/b/146391>
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * WebCoreSupport/WebFrameLoaderClient.cpp:
     9        (WebFrameLoaderClient::cancelledError):
     10        (WebFrameLoaderClient::blockedError):
     11        (WebFrameLoaderClient::cannotShowURLError):
     12        (WebFrameLoaderClient::interruptedForPolicyChangeError):
     13        (WebFrameLoaderClient::cannotShowMIMETypeError):
     14        (WebFrameLoaderClient::fileDoesNotExistError):
     15        (WebFrameLoaderClient::pluginWillHandleLoadError):
     16        (WebFrameLoaderClient::dispatchDidFailToStartPlugin):
     17        (WebFrameLoaderClient::createJavaAppletWidget):
     18        * WebDownloadCFNet.cpp:
     19        (WebDownload::cancelAuthenticationChallenge):
     20        * WebError.cpp:
     21        (WebError::init):
     22        - Update for type change of 'failingURL' argument to
     23          ResourceError().
     24
    1252015-12-23  Brent Fulgham  <bfulgham@apple.com>
    226

  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r192623 r194419  
    852852    // FIXME: Need ChickenCat to include CFNetwork/CFURLError.h to get these values
    853853    // Alternatively, we could create our own error domain/codes.
    854     return ResourceError(String(WebURLErrorDomain), -999, request.url().string(), String("Cancelled"));
     854    return ResourceError(String(WebURLErrorDomain), -999, request.url(), String("Cancelled"));
    855855}
    856856
    857857ResourceError WebFrameLoaderClient::blockedError(const ResourceRequest& request)
    858858{
    859     return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().string(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
     859    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
    860860}
    861861
    … …  
    867867ResourceError WebFrameLoaderClient::cannotShowURLError(const ResourceRequest& request)
    868868{
    869     return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url().string(), WEB_UI_STRING("The URL can\xE2\x80\x99t be shown", "WebKitErrorCannotShowURL description"));
     869    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url(), WEB_UI_STRING("The URL can\xE2\x80\x99t be shown", "WebKitErrorCannotShowURL description"));
    870870}
    871871
    872872ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
    873873{
    874     return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
     874    return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
    875875}
    876876
    877877ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
    878878{
    879     return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url().string(), WEB_UI_STRING("Content with specified MIME type can\xE2\x80\x99t be shown", "WebKitErrorCannotShowMIMEType description"));
     879    return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can\xE2\x80\x99t be shown", "WebKitErrorCannotShowMIMEType description"));
    880880}
    881881
    882882ResourceError WebFrameLoaderClient::fileDoesNotExistError(const ResourceResponse& response)
    883883{
    884     return ResourceError(String(WebURLErrorDomain), -1100, response.url().string(), String("File does not exist."));
     884    return ResourceError(String(WebURLErrorDomain), -1100, response.url(), String("File does not exist."));
    885885}
    886886
    887887ResourceError WebFrameLoaderClient::pluginWillHandleLoadError(const ResourceResponse& response)
    888888{
    889     return ResourceError(String(WebKitErrorDomain), WebKitErrorPlugInWillHandleLoad, response.url().string(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
     889    return ResourceError(String(WebKitErrorDomain), WebKitErrorPlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
    890890}
    891891
    … …  
    11671167    }
    11681168
    1169     ResourceError resourceError(String(WebKitErrorDomain), errorCode, pluginView->url().string(), String());
     1169    ResourceError resourceError(String(WebKitErrorDomain), errorCode, pluginView->url(), String());
    11701170    COMPtr<IWebError> error(AdoptCOM, WebError::createInstance(resourceError, userInfoBag.get()));
    11711171     
    … …  
    12451245    COMPtr<CFDictionaryPropertyBag> userInfoBag = CFDictionaryPropertyBag::createInstance();
    12461246
    1247     ResourceError resourceError(String(WebKitErrorDomain), WebKitErrorJavaUnavailable, String(), WEB_UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description"));
     1247    ResourceError resourceError(String(WebKitErrorDomain), WebKitErrorJavaUnavailable, URL(), WEB_UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description"));
    12481248    COMPtr<IWebError> error(AdoptCOM, WebError::createInstance(resourceError, userInfoBag.get()));
    12491249

  • trunk/Source/WebKit/win/WebDownloadCFNet.cpp

    r188662 r194419  
    308308
    309309    // FIXME: Do we need a URL or description for this error code?
    310     ResourceError error(String(WebURLErrorDomain), WebURLErrorUserCancelledAuthentication, "", "");
     310    ResourceError error(String(WebURLErrorDomain), WebURLErrorUserCancelledAuthentication, URL(), "");
    311311    COMPtr<WebError> webError(AdoptCOM, WebError::createInstance(error));
    312312    m_delegate->didFailWithError(this, webError.get());

  • trunk/Source/WebKit/win/WebError.cpp

    r188703 r194419  
    108108HRESULT WebError::init(_In_ BSTR domain, int code, _In_ BSTR url)
    109109{
    110     m_error = ResourceError(String(domain, SysStringLen(domain)), code, String(url, SysStringLen(url)), String());
     110    m_error = ResourceError(String(domain, SysStringLen(domain)), code, URL(URL(), String(url, SysStringLen(url))), String());
    111111    return S_OK;
    112112}

  • trunk/Source/WebKit2/ChangeLog

    r194410 r194419  
     12015-12-25  David Kilzer  <ddkilzer@apple.com>
     2
     3        ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
     4        <http://webkit.org/b/146391>
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp:
     9        (WebKit::platformDownloadNetworkError):
     10        * NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp:
     11        (WebKit::platformDownloadNetworkError):
     12        * NetworkProcess/Downloads/soup/DownloadSoup.cpp:
     13        (WebKit::DownloadClient::didReceiveResponse):
     14        * NetworkProcess/Downloads/soup/DownloadSoupErrors.h:
     15        * Shared/soup/WebCoreArgumentCodersSoup.cpp:
     16        (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
     17        (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
     18        * UIProcess/API/gtk/WebKitLoaderClient.cpp:
     19        (LoaderClient::didFailProvisionalLoadWithErrorForFrame):
     20        (LoaderClient::didFailLoadWithErrorForFrame):
     21        * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
     22        (webkit_uri_scheme_request_finish_error):
     23        * WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
     24        (WebKit::internalError):
     25        * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
     26        (WebKit::internalError):
     27        - Update for type change of 'failingURL' argument to
     28          ResourceError().
     29
    1302015-12-23  Simon Fraser  <simon.fraser@apple.com>
    231

  • trunk/Source/WebKit2/NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp

    r140752 r194419  
    3434namespace WebKit {
    3535
    36 ResourceError platformDownloadNetworkError(int errorCode, const String& failingURL, const String& localizedDescription)
     36ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription)
    3737{
    3838    return downloadNetworkError(ResourceError(errorDomainDownload, errorCode, failingURL, localizedDescription));

  • trunk/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp

    r140752 r194419  
    3434namespace WebKit {
    3535
    36 ResourceError platformDownloadNetworkError(int errorCode, const String& failingURL, const String& localizedDescription)
     36ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription)
    3737{
    3838    return downloadNetworkError(ResourceError(errorDomainDownload, errorCode, failingURL, localizedDescription));

  • trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp

    r191787 r194419  
    8383
    8484        if (response.httpStatusCode() >= 400) {
    85             downloadFailed(platformDownloadNetworkError(response.httpStatusCode(), response.url().string(), response.httpStatusText()));
     85            downloadFailed(platformDownloadNetworkError(response.httpStatusCode(), response.url(), response.httpStatusText()));
    8686            return;
    8787        }

  • trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoupErrors.h

    r140752 r194419  
    2828
    2929#include <WebCore/ResourceHandle.h>
     30#include <WebCore/URL.h>
    3031#include <wtf/text/WTFString.h>
    3132
    3233namespace WebKit {
    3334
    34 WebCore::ResourceError platformDownloadNetworkError(int errorCode, const String& failingURL, const String& localizedDescription);
     35WebCore::ResourceError platformDownloadNetworkError(int errorCode, const WebCore::URL& failingURL, const String& localizedDescription);
    3536WebCore::ResourceError platformDownloadDestinationError(const WebCore::ResourceResponse&, const String& message);
    3637

  • trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp

    r183546 r194419  
    194194    encoder << resourceError.domain();
    195195    encoder << resourceError.errorCode();
    196     encoder << resourceError.failingURL();
     196    encoder << resourceError.failingURL().string();
    197197    encoder << resourceError.localizedDescription();
    198198    encoder << resourceError.isCancellation();
    … …  
    236236        return false;
    237237
    238     resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
     238    resourceError = ResourceError(domain, errorCode, URL(URL(), failingURL), localizedDescription);
    239239    resourceError.setIsCancellation(isCancellation);
    240240    resourceError.setIsTimeout(isTimeout);

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp

    r185502 r194419  
    6363            toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
    6464        if (resourceError.tlsErrors()) {
    65             webkitWebViewLoadFailedWithTLSErrors(m_webView, resourceError.failingURL().utf8().data(), error.get(),
     65            webkitWebViewLoadFailedWithTLSErrors(m_webView, resourceError.failingURL().string().utf8().data(), error.get(),
    6666                static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()), resourceError.certificate());
    6767        } else
    68             webkitWebViewLoadFailed(m_webView, WEBKIT_LOAD_STARTED, resourceError.failingURL().utf8().data(), error.get());
     68            webkitWebViewLoadFailed(m_webView, WEBKIT_LOAD_STARTED, resourceError.failingURL().string().utf8().data(), error.get());
    6969    }
    7070
    … …  
    8989        GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
    9090            toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
    91         webkitWebViewLoadFailed(m_webView, WEBKIT_LOAD_COMMITTED, resourceError.failingURL().utf8().data(), error.get());
     91        webkitWebViewLoadFailed(m_webView, WEBKIT_LOAD_COMMITTED, resourceError.failingURL().string().utf8().data(), error.get());
    9292    }
    9393

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp

    r193830 r194419  
    240240
    241241    priv->stream = nullptr;
    242     WebCore::ResourceError resourceError(g_quark_to_string(error->domain), toWebCoreError(error->code), priv->uri.data(), String::fromUTF8(error->message));
     242    WebCore::ResourceError resourceError(g_quark_to_string(error->domain), toWebCoreError(error->code), WebCore::URL(priv->soupURI.get()), String::fromUTF8(error->message));
    243243    priv->webRequestManager->didFailWithError(priv->requestID, resourceError);
    244244    webkitWebContextDidFinishLoadingCustomProtocol(priv->webContext, priv->requestID);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp

    r190611 r194419  
    8080WebCore::ResourceError internalError(const WebCore::URL& url)
    8181{
    82     return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url.string(), ASCIILiteral("Internal error"));
     82    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, ASCIILiteral("Internal error"));
    8383}
    8484

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp

    r190611 r194419  
    8383WebCore::ResourceError internalError(const WebCore::URL& url)
    8484{
    85     return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url.string(), _("Internal error"));
     85    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url, _("Internal error"));
    8686}
    8787
Note: See TracChangeset for help on using the changeset viewer.