Commit d0c7ac34 authored by bfulgham@apple.com's avatar bfulgham@apple.com

[Windows] LayoutTests on Windows debug fails and exits early

https://bugs.webkit.org/show_bug.cgi?id=120438

Reviewed by Tim Horton.

Visual Studio mishandles char* containing utf8-content. Must manually
escape non-ASCII characters so the byte stream is correct for localized
string lookup.

* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::cannotShowURLError): Replace unicode apostrophe
character with utf8-byte equivalent.
(WebFrameLoaderClient::cannotShowMIMETypeError): Ditto.
(WebFrameLoaderClient::dispatchDidFailToStartPlugin): Ditto.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fe757073
2013-08-28 Brent Fulgham <bfulgham@apple.com>
[Windows] LayoutTests on Windows debug fails and exits early
https://bugs.webkit.org/show_bug.cgi?id=120438
Reviewed by Tim Horton.
Visual Studio mishandles char* containing utf8-content. Must manually
escape non-ASCII characters so the byte stream is correct for localized
string lookup.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::cannotShowURLError): Replace unicode apostrophe
character with utf8-byte equivalent.
(WebFrameLoaderClient::cannotShowMIMETypeError): Ditto.
(WebFrameLoaderClient::dispatchDidFailToStartPlugin): Ditto.
2013-08-28 Brent Fulgham <bfulgham@apple.com>
[Windows] Provide useful error messages for WebKitErrorDomain errors
......
......@@ -880,7 +880,7 @@ ResourceError WebFrameLoaderClient::blockedError(const ResourceRequest& request)
ResourceError WebFrameLoaderClient::cannotShowURLError(const ResourceRequest& request)
{
return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url().string(), WEB_UI_STRING("The URL cant be shown", "WebKitErrorCannotShowURL description"));
return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url().string(), WEB_UI_STRING("The URL can\xE2\x80\x99t be shown", "WebKitErrorCannotShowURL description"));
}
ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
......@@ -890,7 +890,7 @@ ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const Resour
ResourceError WebFrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
{
return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url().string(), WEB_UI_STRING("Content with specified MIME type cant be shown", "WebKitErrorCannotShowMIMEType description"));
return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url().string(), WEB_UI_STRING("Content with specified MIME type can\xE2\x80\x99t be shown", "WebKitErrorCannotShowMIMEType description"));
}
ResourceError WebFrameLoaderClient::fileDoesNotExistError(const ResourceResponse& response)
......@@ -1144,11 +1144,11 @@ void WebFrameLoaderClient::dispatchDidFailToStartPlugin(const PluginView* plugin
switch (pluginView->status()) {
case PluginStatusCanNotFindPlugin:
errorCode = WebKitErrorCannotFindPlugIn;
description = WEB_UI_STRING("The plug-in cant be found", "WebKitErrorCannotFindPlugin description");
description = WEB_UI_STRING("The plug-in can\xE2\x80\x99t be found", "WebKitErrorCannotFindPlugin description");
break;
case PluginStatusCanNotLoadPlugin:
errorCode = WebKitErrorCannotLoadPlugIn;
description = WEB_UI_STRING("The plug-in cant be loaded", "WebKitErrorCannotLoadPlugin description");
description = WEB_UI_STRING("The plug-in can\xE2\x80\x99t be loaded", "WebKitErrorCannotLoadPlugin description");
break;
default:
ASSERT_NOT_REACHED();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment