Attachment 267892 Details for Bug 146391 – Patch v6

[patch] Patch v6

bug-146391-20151223224859.patch (text/plain), 52.77 KB, created by David Kilzer (:ddkilzer) on 2015-12-23 22:49:35 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2015-12-23 22:49:35 PST

Size: 52.77 KB

patch

obsolete

>Subversion Revision: 194385
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 999cce00f1c11976c81ffd0dca08e54cd2609295..aecb0e4c9185636d7f64466c0fd331e331d70f04 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,108 @@
>+2015-12-23  David Kilzer  <ddkilzer@apple.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        * 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().
>+
> 2015-12-22  Andy Estes  <aestes@apple.com>
> 
>         Try to fix the iOS build after r194378
>diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
>index 8241e1f6f570fa59e86eb4fb6065028cbc157924..3432c2d9b78dc7cb9935db13aab64aa6a988e423 100644
>--- a/Source/WebKit/win/ChangeLog
>+++ b/Source/WebKit/win/ChangeLog
>@@ -1,3 +1,27 @@
>+2015-12-23  David Kilzer  <ddkilzer@apple.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        * 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().
>+
> 2015-12-20  Dan Bernstein  <mitz@apple.com>
> 
>         Remove unused setToolbarHeight
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 0439b02ece86d73f6bc91a113e83b3ec5861eeec..d4bbe77dd6626817fe23e5c722db4bc5fc37f70a 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,25 @@
>+2015-12-23  David Kilzer  <ddkilzer@apple.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        * 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/WebKitURISchemeRequest.cpp:
>+        (webkit_uri_scheme_request_finish_error):
>+        - Update for type change of 'failingURL' argument to
>+          ResourceError().
>+
> 2015-12-22  Hunseop Jeong  <hs85.jeong@samsung.com>
> 
>         [EFL] ewk_application_cache_manager test failed after r193812
>diff --git a/Source/WebCore/loader/DocumentThreadableLoader.cpp b/Source/WebCore/loader/DocumentThreadableLoader.cpp
>index d5406052b5e79cfe0e0f04a11b2af1d57d23c96e..1f614eb31797958fe8a52e84dedf06d5ad5d81f4 100644
>--- a/Source/WebCore/loader/DocumentThreadableLoader.cpp
>+++ b/Source/WebCore/loader/DocumentThreadableLoader.cpp
>@@ -85,7 +85,7 @@ DocumentThreadableLoader::DocumentThreadableLoader(Document& document, Threadabl
>     }
> 
>     if (m_options.crossOriginRequestPolicy == DenyCrossOriginRequests) {
>-        m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, request.url().string(), "Cross origin requests are not supported."));
>+        m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, request.url(), "Cross origin requests are not supported."));
>         return;
>     }
> 
>@@ -119,7 +119,7 @@ void DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest(const Resource
> 
>     // 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.
>     if (!SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(request.url().protocol())) {
>-        m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, request.url().string(), "Cross origin requests are only supported for HTTP."));
>+        m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, request.url(), "Cross origin requests are only supported for HTTP."));
>         return;
>     }
> 
>@@ -261,7 +261,7 @@ void DocumentThreadableLoader::didReceiveResponse(unsigned long identifier, cons
>     } else {
>         if (!m_sameOriginRequest && m_options.crossOriginRequestPolicy == UseAccessControl) {
>             if (!passesAccessControlCheck(response, m_options.allowCredentials(), securityOrigin(), accessControlErrorDescription)) {
>-                m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, response.url().string(), accessControlErrorDescription));
>+                m_client->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, response.url(), accessControlErrorDescription));
>                 return;
>             }
>         }
>@@ -333,7 +333,7 @@ void DocumentThreadableLoader::preflightSuccess()
>     loadRequest(*actualRequest, SkipSecurityCheck);
> }
> 
>-void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const String& url, const String& errorDescription)
>+void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const URL& url, const String& errorDescription)
> {
>     ResourceError error(errorDomainWebKitInternal, 0, url, errorDescription);
>     if (m_actualRequest)
>diff --git a/Source/WebCore/loader/DocumentThreadableLoader.h b/Source/WebCore/loader/DocumentThreadableLoader.h
>index 778d31ef3fe2ba542226b6744ccb7de38be00c8d..ff083fb90f172adbce53754e0ec7dc50fb4a7f65 100644
>--- a/Source/WebCore/loader/DocumentThreadableLoader.h
>+++ b/Source/WebCore/loader/DocumentThreadableLoader.h
>@@ -91,7 +91,7 @@ namespace WebCore {
>         void makeSimpleCrossOriginAccessRequest(const ResourceRequest& request);
>         void makeCrossOriginAccessRequestWithPreflight(const ResourceRequest& request);
>         void preflightSuccess();
>-        void preflightFailure(unsigned long identifier, const String& url, const String& errorDescription);
>+        void preflightFailure(unsigned long identifier, const URL&, const String& errorDescription);
> 
>         void loadRequest(const ResourceRequest&, SecurityCheckPolicy);
>         bool isAllowedRedirect(const URL&);
>diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
>index 1629ec57ce5ddc10ce89d311046e900a14343fcd..1a40b6da445c9c2835abe94450e632d655ac2b24 100644
>--- a/Source/WebCore/loader/EmptyClients.h
>+++ b/Source/WebCore/loader/EmptyClients.h
>@@ -320,15 +320,15 @@ public:
>     virtual void committedLoad(DocumentLoader*, const char*, int) override { }
>     virtual void finishedLoading(DocumentLoader*) override { }
> 
>-    virtual ResourceError cancelledError(const ResourceRequest&) override { ResourceError error("", 0, "", ""); error.setIsCancellation(true); return error; }
>-    virtual ResourceError blockedError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
>-    virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
>-    virtual ResourceError cannotShowURLError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
>-    virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) override { return ResourceError("", 0, "", ""); }
>-
>-    virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) override { return ResourceError("", 0, "", ""); }
>-    virtual ResourceError fileDoesNotExistError(const ResourceResponse&) override { return ResourceError("", 0, "", ""); }
>-    virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&) override { return ResourceError("", 0, "", ""); }
>+    virtual ResourceError cancelledError(const ResourceRequest&) override { ResourceError error("", 0, URL(), ""); error.setIsCancellation(true); return error; }
>+    virtual ResourceError blockedError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
>+    virtual ResourceError blockedByContentBlockerError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
>+    virtual ResourceError cannotShowURLError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
>+    virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) override { return ResourceError("", 0, URL(), ""); }
>+
>+    virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) override { return ResourceError("", 0, URL(), ""); }
>+    virtual ResourceError fileDoesNotExistError(const ResourceResponse&) override { return ResourceError("", 0, URL(), ""); }
>+    virtual ResourceError pluginWillHandleLoadError(const ResourceResponse&) override { return ResourceError("", 0, URL(), ""); }
> 
>     virtual bool shouldFallBack(const ResourceError&) override { return false; }
> 
>diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
>index 48150a0e3a4f27d8902250ca3adfc02f3563c681..900dd3800bfa4559978c2e41a40200715c4c2ebc 100644
>--- a/Source/WebCore/loader/FrameLoader.cpp
>+++ b/Source/WebCore/loader/FrameLoader.cpp
>@@ -2686,7 +2686,7 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
>             if (auto* controller = page->userContentController()) {
>                 if (m_documentLoader && controller->processContentExtensionRulesForLoad(newRequest, ResourceType::Raw, *m_documentLoader) == ContentExtensions::BlockedStatus::Blocked) {
>                     newRequest = { };
>-                    error = ResourceError(errorDomainWebKitInternal, 0, initialRequest.url().string(), emptyString());
>+                    error = ResourceError(errorDomainWebKitInternal, 0, initialRequest.url(), emptyString());
>                     response = { };
>                     data = nullptr;
>                 }
>diff --git a/Source/WebCore/loader/MediaResourceLoader.cpp b/Source/WebCore/loader/MediaResourceLoader.cpp
>index 20d2e6ec9a339fbee1ddeb9208420ccfc21cbf07..d933cee3d5bf30642852b1cc1c027ef347948097 100644
>--- a/Source/WebCore/loader/MediaResourceLoader.cpp
>+++ b/Source/WebCore/loader/MediaResourceLoader.cpp
>@@ -100,7 +100,7 @@ void MediaResourceLoader::responseReceived(CachedResource* resource, const Resou
>         static NeverDestroyed<const String> consoleMessage("Cross-origin media resource load denied by Cross-Origin Resource Sharing policy.");
>         m_document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());
>         m_didPassAccessControlCheck = false;
>-        m_client->accessControlCheckFailed(ResourceError(errorDomainWebKitInternal, 0, response.url().string(), consoleMessage.get()));
>+        m_client->accessControlCheckFailed(ResourceError(errorDomainWebKitInternal, 0, response.url(), consoleMessage.get()));
>         stop();
>         return;
>     }
>diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp
>index 0d81ff5ba28a2104d528aecfbbbe7356ca23b678..1a973b0d523b8e1f32f25a8089c829857450e3ec 100644
>--- a/Source/WebCore/loader/ResourceLoader.cpp
>+++ b/Source/WebCore/loader/ResourceLoader.cpp
>@@ -257,7 +257,7 @@ void ResourceLoader::loadDataURL()
>         if (loader->reachedTerminalState())
>             return;
>         if (!decodeResult) {
>-            loader->didFail(ResourceError(errorDomainWebKitInternal, 0, url.string(), "Data URL decoding failed"));
>+            loader->didFail(ResourceError(errorDomainWebKitInternal, 0, url, "Data URL decoding failed"));
>             return;
>         }
>         if (loader->wasCancelled())
>diff --git a/Source/WebCore/loader/WorkerThreadableLoader.cpp b/Source/WebCore/loader/WorkerThreadableLoader.cpp
>index a0dc3ca1afc256c56209c9d968d45b02dd512f14..1db8d64892fa232497b038214406f37ef132ebc3 100644
>--- a/Source/WebCore/loader/WorkerThreadableLoader.cpp
>+++ b/Source/WebCore/loader/WorkerThreadableLoader.cpp
>@@ -139,7 +139,7 @@ void WorkerThreadableLoader::MainThreadBridge::cancel()
>     if (!clientWrapper->done()) {
>         // If the client hasn't reached a termination state, then transition it by sending a cancellation error.
>         // Note: no more client callbacks will be done after this method -- the clearClientWrapper() call ensures that.
>-        ResourceError error(String(), 0, String(), String());
>+        ResourceError error(String(), 0, URL(), String());
>         error.setIsCancellation(true);
>         clientWrapper->didFail(error);
>     }
>diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>index 7378d6d1ac9241bc6769697632c7cf47bbf52b9e..d9fcfe62436304939d1ffa82ec3a03700e264a73 100644
>--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
>@@ -544,7 +544,7 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::requestResource(Cache
>                 auto resource = createResource(type, request.mutableResourceRequest(), request.charset(), sessionID());
>                 ASSERT(resource);
>                 resource->error(CachedResource::Status::LoadError);
>-                resource->setResourceError(ResourceError(ContentExtensions::WebKitContentBlockerDomain, 0, request.resourceRequest().url().string(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description")));
>+                resource->setResourceError(ResourceError(ContentExtensions::WebKitContentBlockerDomain, 0, request.resourceRequest().url(), WEB_UI_STRING("The URL was blocked by a content blocker", "WebKitErrorBlockedByContentBlocker description")));
>                 return resource;
>             }
>             return nullptr;
>diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp
>index b8341e6b6c07576f74f412345332af5e9926c464..2013c08e80c9e0f042384b75b96158007506c5ea 100644
>--- a/Source/WebCore/page/EventSource.cpp
>+++ b/Source/WebCore/page/EventSource.cpp
>@@ -273,7 +273,7 @@ void EventSource::didFail(const ResourceError& error)
> 
> void EventSource::didFailAccessControlCheck(const ResourceError& error)
> {
>-    String message = makeString("EventSource cannot load ", error.failingURL(), ". ", error.localizedDescription());
>+    String message = makeString("EventSource cannot load ", error.failingURL().string(), ". ", error.localizedDescription());
>     scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message);
> 
>     abortConnectionAttempt();
>diff --git a/Source/WebCore/platform/efl/ErrorsEfl.cpp b/Source/WebCore/platform/efl/ErrorsEfl.cpp
>index 6eff555933c9631a2382e26cd192293c7d8b6e37..32826e56727303befde29c08de8c57ab49dbe39a 100644
>--- a/Source/WebCore/platform/efl/ErrorsEfl.cpp
>+++ b/Source/WebCore/platform/efl/ErrorsEfl.cpp
>@@ -34,42 +34,42 @@ namespace WebCore {
> 
> ResourceError cancelledError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url().string(), ASCIILiteral("Load request cancelled"));
>+    return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url(), ASCIILiteral("Load request cancelled"));
> }
> 
> ResourceError blockedError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url().string(), ASCIILiteral("Not allowed to use restricted network port"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url(), ASCIILiteral("Not allowed to use restricted network port"));
> }
> 
> ResourceError blockedByContentBlockerError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url().string(), ASCIILiteral("Blocked by content blocker"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url(), ASCIILiteral("Blocked by content blocker"));
> }
> 
> ResourceError cannotShowURLError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url().string(), ASCIILiteral("URL cannot be shown"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url(), ASCIILiteral("URL cannot be shown"));
> }
> 
> ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url().string(), ASCIILiteral("Frame load was interrupted"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url(), ASCIILiteral("Frame load was interrupted"));
> }
> 
> ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url().string(), ASCIILiteral("Content with the specified MIME type cannot be shown"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url(), ASCIILiteral("Content with the specified MIME type cannot be shown"));
> }
> 
> ResourceError fileDoesNotExistError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url().string(), ASCIILiteral("File does not exist"));
>+    return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url(), ASCIILiteral("File does not exist"));
> }
> 
> ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url().string(), ASCIILiteral("Plugin will handle load"));
>+    return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url(), ASCIILiteral("Plugin will handle load"));
> }
> 
> ResourceError downloadNetworkError(const ResourceError& networkError)
>@@ -79,12 +79,12 @@ ResourceError downloadNetworkError(const ResourceError& networkError)
> 
> ResourceError downloadCancelledByUserError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url().string(), ASCIILiteral("User cancelled the download"));
>+    return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url(), ASCIILiteral("User cancelled the download"));
> }
> 
> ResourceError downloadDestinationError(const ResourceResponse& response, const String& errorMessage)
> {
>-    return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url().string(), errorMessage);
>+    return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url(), errorMessage);
> }
> 
> ResourceError printError(const URL& failingURL, const String& errorMessage)
>diff --git a/Source/WebCore/platform/gtk/ErrorsGtk.cpp b/Source/WebCore/platform/gtk/ErrorsGtk.cpp
>index 688a906d9eb408edfb473afff79825646ec1fe0f..8dfd158b3b4d6c544bdb29a615741dbda4b41a54 100644
>--- a/Source/WebCore/platform/gtk/ErrorsGtk.cpp
>+++ b/Source/WebCore/platform/gtk/ErrorsGtk.cpp
>@@ -29,67 +29,57 @@ namespace WebCore {
> 
> ResourceError cancelledError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainNetwork, NetworkErrorCancelled,
>-                         request.url().string(), _("Load request cancelled"));
>+    return ResourceError(errorDomainNetwork, NetworkErrorCancelled, request.url(), _("Load request cancelled"));
> }
> 
> ResourceError blockedError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort,
>-                         request.url().string(), _("Not allowed to use restricted network port"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorCannotUseRestrictedPort, request.url(), _("Not allowed to use restricted network port"));
> }
> 
> ResourceError blockedByContentBlockerError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url().string(), _("Blocked by content blocker"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorBlockedByContentBlocker, request.url(), _("Blocked by content blocker"));
> }
> 
> ResourceError cannotShowURLError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL,
>-                         request.url().string(), _("URL cannot be shown"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowURL, request.url(), _("URL cannot be shown"));
> }
> 
> ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange,
>-                         request.url().string(), _("Frame load was interrupted"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorFrameLoadInterruptedByPolicyChange, request.url(), _("Frame load was interrupted"));
> }
> 
> ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType,
>-                         response.url().string(), _("Content with the specified MIME type cannot be shown"));
>+    return ResourceError(errorDomainPolicy, PolicyErrorCannotShowMimeType, response.url(), _("Content with the specified MIME type cannot be shown"));
> }
> 
> ResourceError fileDoesNotExistError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist,
>-                         response.url().string(), _("File does not exist"));
>+    return ResourceError(errorDomainNetwork, NetworkErrorFileDoesNotExist, response.url(), _("File does not exist"));
> }
> 
> ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad,
>-                         response.url().string(), _("Plugin will handle load"));
>+    return ResourceError(errorDomainPlugin, PluginErrorWillHandleLoad, response.url(), _("Plugin will handle load"));
> }
> 
> ResourceError downloadNetworkError(const ResourceError& networkError)
> {
>-    return ResourceError(errorDomainDownload, DownloadErrorNetwork,
>-                         networkError.failingURL(), networkError.localizedDescription());
>+    return ResourceError(errorDomainDownload, DownloadErrorNetwork, networkError.failingURL(), networkError.localizedDescription());
> }
> 
> ResourceError downloadCancelledByUserError(const ResourceResponse& response)
> {
>-    return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser,
>-                         response.url().string(), _("User cancelled the download"));
>+    return ResourceError(errorDomainDownload, DownloadErrorCancelledByUser, response.url(), _("User cancelled the download"));
> }
> 
> ResourceError downloadDestinationError(const ResourceResponse& response, const String& errorMessage)
> {
>-    return ResourceError(errorDomainDownload, DownloadErrorDestination,
>-                         response.url().string(), errorMessage);
>+    return ResourceError(errorDomainDownload, DownloadErrorDestination, response.url(), errorMessage);
> }
> 
> ResourceError printError(const URL& failingURL, const String& errorMessage)
>diff --git a/Source/WebCore/platform/network/ResourceErrorBase.h b/Source/WebCore/platform/network/ResourceErrorBase.h
>index 5ae837c31c5d8a48562009386f80edc01954c689..a80e7619b5ad9dddde856823762ece4f551bad3f 100644
>--- a/Source/WebCore/platform/network/ResourceErrorBase.h
>+++ b/Source/WebCore/platform/network/ResourceErrorBase.h
>@@ -26,6 +26,7 @@
> #ifndef ResourceErrorBase_h
> #define ResourceErrorBase_h
> 
>+#include "URL.h"
> #include <wtf/text/WTFString.h>
> 
> namespace WebCore {
>@@ -43,7 +44,7 @@ public:
> 
>     const String& domain() const { lazyInit(); return m_domain; }
>     int errorCode() const { lazyInit(); return m_errorCode; }
>-    const String& failingURL() const { lazyInit(); return m_failingURL; }
>+    const URL& failingURL() const { lazyInit(); return m_failingURL; }
>     const String& localizedDescription() const { lazyInit(); return m_localizedDescription; }
> 
>     void setIsCancellation(bool isCancellation) { m_isCancellation = isCancellation; }
>@@ -63,7 +64,7 @@ protected:
>     {
>     }
> 
>-    ResourceErrorBase(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
>+    ResourceErrorBase(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
>         : m_domain(domain)
>         , m_failingURL(failingURL)
>         , m_localizedDescription(localizedDescription)
>@@ -86,7 +87,7 @@ protected:
>     static bool platformCompare(const ResourceError&, const ResourceError&) { return true; }
> 
>     String m_domain;
>-    String m_failingURL;
>+    URL m_failingURL;
>     String m_localizedDescription;
>     int m_errorCode;
>     bool m_isNull : 1;
>diff --git a/Source/WebCore/platform/network/cf/ResourceError.h b/Source/WebCore/platform/network/cf/ResourceError.h
>index 1703cc91f68b2a5e64f87923ce6fba1d27dd241d..b328ba17150410f53f771669208514b6a7746f67 100644
>--- a/Source/WebCore/platform/network/cf/ResourceError.h
>+++ b/Source/WebCore/platform/network/cf/ResourceError.h
>@@ -50,7 +50,7 @@ public:
>     {
>     }
> 
>-    ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
>+    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
>         : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
>         , m_dataIsUpToDate(true)
>     {
>@@ -63,7 +63,7 @@ public:
> 
> #if USE(CFNETWORK)
> #if PLATFORM(WIN)
>-    ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription, CFDataRef certificate);
>+    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate);
>     PCCERT_CONTEXT certificate() const;
>     void setCertificate(CFDataRef);
> #endif
>diff --git a/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp b/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
>index 131fbb04611706f64d850a1c50e05e14a2c6e133..60bfb36591e07c1bfbeab6b1e3b56fab98478473 100644
>--- a/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
>+++ b/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
>@@ -49,7 +49,7 @@ ResourceError::ResourceError(CFErrorRef cfError)
> }
> 
> #if PLATFORM(WIN)
>-ResourceError::ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription, CFDataRef certificate)
>+ResourceError::ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription, CFDataRef certificate)
>     : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
>     , m_dataIsUpToDate(true)
>     , m_certificate(certificate)
>@@ -101,17 +101,12 @@ void ResourceError::platformLazyInit()
>     if (userInfo.get()) {
>         CFStringRef failingURLString = (CFStringRef) CFDictionaryGetValue(userInfo.get(), failingURLStringKey);
>         if (failingURLString)
>-            m_failingURL = String(failingURLString);
>+            m_failingURL = URL(URL(), failingURLString);
>         else {
>             CFURLRef failingURL = (CFURLRef) CFDictionaryGetValue(userInfo.get(), failingURLKey);
>             if (failingURL) {
>-                RetainPtr<CFURLRef> absoluteURLRef = adoptCF(CFURLCopyAbsoluteURL(failingURL));
>-                if (absoluteURLRef.get()) {
>-                    // FIXME: CFURLGetString returns a normalized URL which is different from what is actually used by CFNetwork.
>-                    // We should use CFURLGetBytes instead.
>-                    failingURLString = CFURLGetString(absoluteURLRef.get());
>-                    m_failingURL = String(failingURLString);
>-                }
>+                if (RetainPtr<CFURLRef> absoluteURLRef = adoptCF(CFURLCopyAbsoluteURL(failingURL)))
>+                    m_failingURL = URL(absoluteURLRef.get());
>             }
>         }
>         m_localizedDescription = (CFStringRef) CFDictionaryGetValue(userInfo.get(), kCFErrorLocalizedDescriptionKey);
>@@ -152,12 +147,9 @@ CFErrorRef ResourceError::cfError() const
>             CFDictionarySetValue(userInfo.get(), kCFErrorLocalizedDescriptionKey, m_localizedDescription.createCFString().get());
> 
>         if (!m_failingURL.isEmpty()) {
>-            RetainPtr<CFStringRef> failingURLString = m_failingURL.createCFString();
>+            RetainPtr<CFStringRef> failingURLString = m_failingURL.string().createCFString();
>             CFDictionarySetValue(userInfo.get(), failingURLStringKey, failingURLString.get());
>-            // FIXEME: We normally create a CFURL from a string by using URL::createCFURL, which handles
>-            // cases correctly that CFURLCreateWithString handles incorrectly.
>-            RetainPtr<CFURLRef> url = adoptCF(CFURLCreateWithString(0, failingURLString.get(), 0));
>-            if (url)
>+            if (RetainPtr<CFURLRef> url = m_failingURL.createCFURL())
>                 CFDictionarySetValue(userInfo.get(), failingURLKey, url.get());
>         }
> 
>diff --git a/Source/WebCore/platform/network/curl/ResourceError.h b/Source/WebCore/platform/network/curl/ResourceError.h
>index 41c19914bdbc6ec61838ab9a5b839aec80dcb3ca..c31dd4251f67a1cef6ab49293e5945a77eae2b52 100644
>--- a/Source/WebCore/platform/network/curl/ResourceError.h
>+++ b/Source/WebCore/platform/network/curl/ResourceError.h
>@@ -44,7 +44,7 @@ public:
>     {
>     }
> 
>-    ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
>+    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
>         : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription), m_sslErrors(0)
>     {
>     }
>diff --git a/Source/WebCore/platform/network/mac/ResourceErrorMac.mm b/Source/WebCore/platform/network/mac/ResourceErrorMac.mm
>index f7c864ce3b5099fe02f16969ace397f682e83dba..641893800063333c701db53cac001ab5499f7076 100644
>--- a/Source/WebCore/platform/network/mac/ResourceErrorMac.mm
>+++ b/Source/WebCore/platform/network/mac/ResourceErrorMac.mm
>@@ -182,12 +182,9 @@ static RetainPtr<NSError> createNSErrorFromResourceErrorBase(const ResourceError
>         [userInfo.get() setValue:resourceError.localizedDescription() forKey:NSLocalizedDescriptionKey];
> 
>     if (!resourceError.failingURL().isEmpty()) {
>-        // FIXEME: We normally create an NSURL from a string by using URL::createNSURL, which handles
>-        // cases correctly that initWithString: handles incorrectly.
>-        RetainPtr<NSURL> cocoaURL = adoptNS([[NSURL alloc] initWithString:resourceError.failingURL()]);
>-        [userInfo.get() setValue:resourceError.failingURL() forKey:@"NSErrorFailingURLStringKey"];
>-        if (cocoaURL)
>-            [userInfo.get() setValue:cocoaURL.get() forKey:@"NSErrorFailingURLKey"];
>+        [userInfo.get() setValue:(NSString *)resourceError.failingURL().string() forKey:@"NSErrorFailingURLStringKey"];
>+        if (NSURL *cocoaURL = (NSURL *)resourceError.failingURL())
>+            [userInfo.get() setValue:cocoaURL forKey:@"NSErrorFailingURLKey"];
>     }
> 
>     return adoptNS([[NSError alloc] initWithDomain:resourceError.domain() code:resourceError.errorCode() userInfo:userInfo.get()]);
>@@ -266,10 +263,10 @@ void ResourceError::platformLazyInit()
>     m_domain = [m_platformError.get() domain];
>     m_errorCode = [m_platformError.get() code];
> 
>-    NSString* failingURLString = [[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLStringKey"];
>-    if (!failingURLString)
>-        failingURLString = [[[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLKey"] absoluteString];
>-    m_failingURL = failingURLString; 
>+    if (NSString* failingURLString = [[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLStringKey"])
>+        m_failingURL = URL(URL(), failingURLString);
>+    else
>+        m_failingURL = URL((NSURL *)[[m_platformError.get() userInfo] valueForKey:@"NSErrorFailingURLKey"]);
>     // Workaround for <rdar://problem/6554067>
>     m_localizedDescription = m_failingURL;
>     BEGIN_BLOCK_OBJC_EXCEPTIONS;
>diff --git a/Source/WebCore/platform/network/soup/ResourceError.h b/Source/WebCore/platform/network/soup/ResourceError.h
>index e50297a7fe9d4c89493810d56bb80f8a75f4b8eb..447b002748a63f5ac4076ab3d9c3f2a5235fb6fc 100644
>--- a/Source/WebCore/platform/network/soup/ResourceError.h
>+++ b/Source/WebCore/platform/network/soup/ResourceError.h
>@@ -41,7 +41,7 @@ namespace WebCore {
> class ResourceError : public ResourceErrorBase
> {
> public:
>-    ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription)
>+    ResourceError(const String& domain, int errorCode, const URL& failingURL, const String& localizedDescription)
>         : ResourceErrorBase(domain, errorCode, failingURL, localizedDescription)
>         , m_tlsErrors(0)
>     {
>@@ -56,7 +56,7 @@ public:
>     static ResourceError transportError(SoupRequest*, int statusCode, const String& reasonPhrase);
>     static ResourceError genericGError(GError*, SoupRequest*);
>     static ResourceError tlsError(SoupRequest*, unsigned tlsErrors, GTlsCertificate*);
>-    static ResourceError timeoutError(const String& failingURL);
>+    static ResourceError timeoutError(const URL& failingURL);
>     static ResourceError authenticationError(SoupMessage*);
> 
>     unsigned tlsErrors() const { return m_tlsErrors; }
>diff --git a/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp b/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
>index b25b5a0b8651e1a0cf5f61960d57a224aa53583b..ad6b8e708673aeb9a5658e4ccb8c351299efee9e 100644
>--- a/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
>@@ -35,14 +35,13 @@
> 
> namespace WebCore {
> 
>-static String failingURI(SoupURI* soupURI)
>+static URL failingURI(SoupURI* soupURI)
> {
>     ASSERT(soupURI);
>-    GUniquePtr<char> uri(soup_uri_to_string(soupURI, FALSE));
>-    return uri.get();
>+    return URL(soupURI);
> }
> 
>-static String failingURI(SoupRequest* request)
>+static URL failingURI(SoupRequest* request)
> {
>     ASSERT(request);
>     return failingURI(soup_request_get_uri(request));
>@@ -85,7 +84,7 @@ ResourceError ResourceError::tlsError(SoupRequest* request, unsigned tlsErrors,
>     return resourceError;
> }
> 
>-ResourceError ResourceError::timeoutError(const String& failingURL)
>+ResourceError ResourceError::timeoutError(const URL& failingURL)
> {
>     // FIXME: This should probably either be integrated into Errors(Gtk/EFL).h or the
>     // networking errors from those files should be moved here.
>diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
>index 956897b5c9dcfda3edd132f4f17e234def27d3db..b67c90dd9b4c297c082e12058a1819702b97a17e 100644
>--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
>@@ -1051,7 +1051,7 @@ RefPtr<ResourceHandle> ResourceHandle::releaseForDownload(ResourceHandleClient*
> 
> void ResourceHandle::timeoutFired()
> {
>-    client()->didFail(this, ResourceError::timeoutError(firstRequest().url().string()));
>+    client()->didFail(this, ResourceError::timeoutError(firstRequest().url()));
>     cancel();
> }
> 
>diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
>index 4c48c94f8b29336b4424112d6b2ecbb96083fc5e..579f1ccf855f1092329e260fd54312435baa266c 100644
>--- a/Source/WebCore/xml/XMLHttpRequest.cpp
>+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
>@@ -1077,8 +1077,10 @@ void XMLHttpRequest::didFail(const ResourceError& error)
>     }
> 
>     // Network failures are already reported to Web Inspector by ResourceLoader.
>-    if (error.domain() == errorDomainWebKitInternal)
>-        logConsoleError(scriptExecutionContext(), "XMLHttpRequest cannot load " + error.failingURL() + ". " + error.localizedDescription());
>+    if (error.domain() == errorDomainWebKitInternal) {
>+        String message = makeString("XMLHttpRequest cannot load ", error.failingURL().string(), ". ", error.localizedDescription());
>+        logConsoleError(scriptExecutionContext(), message);
>+    }
> 
>     m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
>     networkError();
>diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
>index 7b2445777cb2056f6cfefe057e4ef5897007afe6..b9dc511c322498cb3c2e3dac408f3ceba8ae1edf 100644
>--- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
>+++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
>@@ -851,12 +851,12 @@ ResourceError WebFrameLoaderClient::cancelledError(const ResourceRequest& reques
> {
>     // FIXME: Need ChickenCat to include CFNetwork/CFURLError.h to get these values
>     // Alternatively, we could create our own error domain/codes.
>-    return ResourceError(String(WebURLErrorDomain), -999, request.url().string(), String("Cancelled"));
>+    return ResourceError(String(WebURLErrorDomain), -999, request.url(), String("Cancelled"));
> }
> 
> ResourceError WebFrameLoaderClient::blockedError(const ResourceRequest& request)
> {
>-    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url().string(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
>+    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotUseRestrictedPort, request.url(), WEB_UI_STRING("Not allowed to use restricted network port", "WebKitErrorCannotUseRestrictedPort description"));
> }
> 
> ResourceError WebFrameLoaderClient::blockedByContentBlockerError(const ResourceRequest& request)
>@@ -866,27 +866,27 @@ ResourceError WebFrameLoaderClient::blockedByContentBlockerError(const ResourceR
> 
> ResourceError WebFrameLoaderClient::cannotShowURLError(const ResourceRequest& request)
> {
>-    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url().string(), WEB_UI_STRING("The URL can\xE2\x80\x99t be shown", "WebKitErrorCannotShowURL description"));
>+    return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url(), WEB_UI_STRING("The URL can\xE2\x80\x99t be shown", "WebKitErrorCannotShowURL description"));
> }
> 
> ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
> {
>-    return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
>+    return ResourceError(String(WebKitErrorDomain), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url(), WEB_UI_STRING("Frame load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange description"));
> }
> 
> ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
> {
>-    return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url().string(), WEB_UI_STRING("Content with specified MIME type can\xE2\x80\x99t be shown", "WebKitErrorCannotShowMIMEType description"));
>+    return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url(), WEB_UI_STRING("Content with specified MIME type can\xE2\x80\x99t be shown", "WebKitErrorCannotShowMIMEType description"));
> }
> 
> ResourceError WebFrameLoaderClient::fileDoesNotExistError(const ResourceResponse& response)
> {
>-    return ResourceError(String(WebURLErrorDomain), -1100, response.url().string(), String("File does not exist."));
>+    return ResourceError(String(WebURLErrorDomain), -1100, response.url(), String("File does not exist."));
> }
> 
> ResourceError WebFrameLoaderClient::pluginWillHandleLoadError(const ResourceResponse& response)
> {
>-    return ResourceError(String(WebKitErrorDomain), WebKitErrorPlugInWillHandleLoad, response.url().string(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
>+    return ResourceError(String(WebKitErrorDomain), WebKitErrorPlugInWillHandleLoad, response.url(), WEB_UI_STRING("Plug-in handled load", "WebKitErrorPlugInWillHandleLoad description"));
> }
> 
> bool WebFrameLoaderClient::shouldFallBack(const ResourceError& error)
>@@ -1166,7 +1166,7 @@ void WebFrameLoaderClient::dispatchDidFailToStartPlugin(const PluginView* plugin
>             ASSERT_NOT_REACHED();
>     }
> 
>-    ResourceError resourceError(String(WebKitErrorDomain), errorCode, pluginView->url().string(), String());
>+    ResourceError resourceError(String(WebKitErrorDomain), errorCode, pluginView->url(), String());
>     COMPtr<IWebError> error(AdoptCOM, WebError::createInstance(resourceError, userInfoBag.get()));
>      
>     resourceLoadDelegate->plugInFailedWithError(webView, error.get(), getWebDataSource(frame->loader().documentLoader()));
>@@ -1244,7 +1244,7 @@ PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& p
> 
>     COMPtr<CFDictionaryPropertyBag> userInfoBag = CFDictionaryPropertyBag::createInstance();
> 
>-    ResourceError resourceError(String(WebKitErrorDomain), WebKitErrorJavaUnavailable, String(), WEB_UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description"));
>+    ResourceError resourceError(String(WebKitErrorDomain), WebKitErrorJavaUnavailable, URL(), WEB_UI_STRING("Java is unavailable", "WebKitErrorJavaUnavailable description"));
>     COMPtr<IWebError> error(AdoptCOM, WebError::createInstance(resourceError, userInfoBag.get()));
> 
>     Frame* coreFrame = core(m_webFrame);
>diff --git a/Source/WebKit/win/WebDownloadCFNet.cpp b/Source/WebKit/win/WebDownloadCFNet.cpp
>index 4615d778490b780a17b551b3f5a14f37ec96326f..15f11977878b950b7be40f7ccab3b25cc93eaa37 100644
>--- a/Source/WebKit/win/WebDownloadCFNet.cpp
>+++ b/Source/WebKit/win/WebDownloadCFNet.cpp
>@@ -307,7 +307,7 @@ HRESULT WebDownload::cancelAuthenticationChallenge(_In_opt_ IWebURLAuthenticatio
>     }
> 
>     // FIXME: Do we need a URL or description for this error code?
>-    ResourceError error(String(WebURLErrorDomain), WebURLErrorUserCancelledAuthentication, "", "");
>+    ResourceError error(String(WebURLErrorDomain), WebURLErrorUserCancelledAuthentication, URL(), "");
>     COMPtr<WebError> webError(AdoptCOM, WebError::createInstance(error));
>     m_delegate->didFailWithError(this, webError.get());
> 
>diff --git a/Source/WebKit/win/WebError.cpp b/Source/WebKit/win/WebError.cpp
>index ef8faa3aa5617f1c14d4f8e7a41e2733324fcbd0..170c6c8efe590b1ce0eee7962f2310dcd532b46f 100644
>--- a/Source/WebKit/win/WebError.cpp
>+++ b/Source/WebKit/win/WebError.cpp
>@@ -107,7 +107,7 @@ ULONG WebError::Release()
> 
> HRESULT WebError::init(_In_ BSTR domain, int code, _In_ BSTR url)
> {
>-    m_error = ResourceError(String(domain, SysStringLen(domain)), code, String(url, SysStringLen(url)), String());
>+    m_error = ResourceError(String(domain, SysStringLen(domain)), code, URL(URL(), String(url, SysStringLen(url))), String());
>     return S_OK;
> }
>   
>diff --git a/Source/WebKit2/NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp b/Source/WebKit2/NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp
>index 946f351549be7b96dd8e7c45872a47fb1dffd52a..ac00d51b37138921e776b1ac58a0d455516b086a 100644
>--- a/Source/WebKit2/NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp
>+++ b/Source/WebKit2/NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp
>@@ -33,7 +33,7 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-ResourceError platformDownloadNetworkError(int errorCode, const String& failingURL, const String& localizedDescription)
>+ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription)
> {
>     return downloadNetworkError(ResourceError(errorDomainDownload, errorCode, failingURL, localizedDescription));
> }
>diff --git a/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp b/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp
>index 0d3f9d3edd15dbab27284bdffd8d176e84223e93..ba2e7b456a415f17d59653001bbdfac0be280342 100644
>--- a/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp
>+++ b/Source/WebKit2/NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp
>@@ -33,7 +33,7 @@ using namespace WebCore;
> 
> namespace WebKit {
> 
>-ResourceError platformDownloadNetworkError(int errorCode, const String& failingURL, const String& localizedDescription)
>+ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription)
> {
>     return downloadNetworkError(ResourceError(errorDomainDownload, errorCode, failingURL, localizedDescription));
> }
>diff --git a/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp b/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp
>index 5655dfc4bb6fee23309b30b4fddcd984be96ef83..e49766bd59c186a9217b23aca867a307f1563d2b 100644
>--- a/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp
>+++ b/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp
>@@ -82,7 +82,7 @@ public:
>         m_download->didReceiveResponse(response);
> 
>         if (response.httpStatusCode() >= 400) {
>-            downloadFailed(platformDownloadNetworkError(response.httpStatusCode(), response.url().string(), response.httpStatusText()));
>+            downloadFailed(platformDownloadNetworkError(response.httpStatusCode(), response.url(), response.httpStatusText()));
>             return;
>         }
> 
>diff --git a/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoupErrors.h b/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoupErrors.h
>index 89e23e0837f0c5081dbb31bad76f8e9a648fdc41..d3fd62b44c72fb8ffe942adf6ee2a8bce5083d0f 100644
>--- a/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoupErrors.h
>+++ b/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoupErrors.h
>@@ -31,7 +31,7 @@
> 
> namespace WebKit {
> 
>-WebCore::ResourceError platformDownloadNetworkError(int errorCode, const String& failingURL, const String& localizedDescription);
>+WebCore::ResourceError platformDownloadNetworkError(int errorCode, const URL& failingURL, const String& localizedDescription);
> WebCore::ResourceError platformDownloadDestinationError(const WebCore::ResourceResponse&, const String& message);
> 
> } // namespace WebKit
>diff --git a/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp b/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
>index 670164f6893b253f078fa29c3a14841894302908..8a8770288dd8e601cb579b469ecbddf18a5c1616 100644
>--- a/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
>+++ b/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
>@@ -193,7 +193,7 @@ void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder,
> 
>     encoder << resourceError.domain();
>     encoder << resourceError.errorCode();
>-    encoder << resourceError.failingURL();
>+    encoder << resourceError.failingURL().string();
>     encoder << resourceError.localizedDescription();
>     encoder << resourceError.isCancellation();
>     encoder << resourceError.isTimeout();
>@@ -235,7 +235,7 @@ bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder,
>     if (!decoder.decode(isTimeout))
>         return false;
> 
>-    resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
>+    resourceError = ResourceError(domain, errorCode, URL(URL(), failingURL), localizedDescription);
>     resourceError.setIsCancellation(isCancellation);
>     resourceError.setIsTimeout(isTimeout);
> 
>diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp
>index 8c91749d1ef6af40aa124006a4393678479c781d..872a5646120cb704485e6bb581699b0d072b0bce 100644
>--- a/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp
>+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp
>@@ -239,7 +239,7 @@ void webkit_uri_scheme_request_finish_error(WebKitURISchemeRequest* request, GEr
>         return;
> 
>     priv->stream = nullptr;
>-    WebCore::ResourceError resourceError(g_quark_to_string(error->domain), toWebCoreError(error->code), priv->uri.data(), String::fromUTF8(error->message));
>+    WebCore::ResourceError resourceError(g_quark_to_string(error->domain), toWebCoreError(error->code), WebCore::URL(priv->soupURI.get()), String::fromUTF8(error->message));
>     priv->webRequestManager->didFailWithError(priv->requestID, resourceError);
>     webkitWebContextDidFinishLoadingCustomProtocol(priv->webContext, priv->requestID);
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 146391: 255717 | 267825 | 267885 | 267886 | 267891 | 267892 | 267896 | 267897 | 267898 | 267899