diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 07:58:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 07:58:25 -0700 |
| commit | 9d5dcb4073f42efce6325ead421506902827febf (patch) | |
| tree | 54de209dd5b07b5c567e36e556f2ceb958f5fa69 /Source/WebKit2/WebProcess | |
| parent | 2d59667e270387d6bf950a6cf680ab3fe0912808 (diff) | |
| parent | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (diff) | |
| download | external_webkit-9d5dcb4073f42efce6325ead421506902827febf.zip external_webkit-9d5dcb4073f42efce6325ead421506902827febf.tar.gz external_webkit-9d5dcb4073f42efce6325ead421506902827febf.tar.bz2 | |
Merge "Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()"
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)); } |