diff options
author | Steve Block <steveblock@google.com> | 2012-03-27 18:37:04 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-03-28 16:47:03 +0100 |
commit | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (patch) | |
tree | ad88503212f21676929335576967232e5b63477d /Source/WebKit2/WebProcess | |
parent | db951b2c4c8fce1304a13d97dec4ae14be629380 (diff) | |
download | external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.zip external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.gz external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.bz2 |
Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()
This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix
window.location.
Note that a conflict occurred in
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the
change is not required.
See http://trac.webkit.org/changeset/87623
Bug: 2159848
Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
Diffstat (limited to 'Source/WebKit2/WebProcess')
-rw-r--r-- | Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp index 61c2a3a..ace9599 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp @@ -51,7 +51,7 @@ enum { ResourceError cancelledError(const ResourceRequest& request) { - ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().prettyURL(), + ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(), QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8)); error.setIsCancellation(true); return error; @@ -59,7 +59,7 @@ ResourceError cancelledError(const ResourceRequest& request) ResourceError blockedError(const ResourceRequest& request) { - return ResourceError("WebKit", WebKitErrorCannotUseRestrictedPort, request.url().prettyURL(), + return ResourceError("WebKit", WebKitErrorCannotUseRestrictedPort, request.url().string(), QCoreApplication::translate("QWebFrame", "Request blocked", 0, QCoreApplication::UnicodeUTF8)); } |