summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-11-12 14:24:49 +0000
committerIain Merrick <husky@google.com>2010-11-15 11:18:10 +0000
commit649040c55ad0f299f58ae83062b40b29f3825fb4 (patch)
treecf6ca0d472f6f98e41e87af4fa2b650ecf4818a4
parentd14ead3da91cffe84ab520406be62b9d988a3212 (diff)
downloadexternal_webkit-649040c55ad0f299f58ae83062b40b29f3825fb4.zip
external_webkit-649040c55ad0f299f58ae83062b40b29f3825fb4.tar.gz
external_webkit-649040c55ad0f299f58ae83062b40b29f3825fb4.tar.bz2
Don't set error description strings in ResourceError.
These strings may be displayed to the user, so they need to be localized. In a separate change (I7dec8dff) I updated the Java framework to use a standard localized message if the description is empty, so here we just use the empty string (same as Chrome). Bug: 3172265 Test: Load http://google.com:81 to force a timeout error, check that the correct message is displayed. Change-Id: I9042a2ee99cd78619cc0392cdc2cbb82ebd51743
-rw-r--r--WebKit/android/WebCoreSupport/WebResponse.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/WebResponse.cpp b/WebKit/android/WebCoreSupport/WebResponse.cpp
index bad733c..57e9460 100644
--- a/WebKit/android/WebCoreSupport/WebResponse.cpp
+++ b/WebKit/android/WebCoreSupport/WebResponse.cpp
@@ -84,7 +84,7 @@ WebCore::ResourceResponse WebResponse::createResourceResponse()
WebCore::ResourceError WebResponse::createResourceError()
{
- WebCore::ResourceError error(m_host.c_str(), ToWebViewClientError(m_error), m_url.c_str(), net::ErrorToString(m_error));
+ WebCore::ResourceError error(m_host.c_str(), ToWebViewClientError(m_error), m_url.c_str(), WTF::String());
return error;
}