Modified: trunk/Source/WebKit/win/ChangeLog (154789 => 154790)
--- trunk/Source/WebKit/win/ChangeLog 2013-08-28 23:37:28 UTC (rev 154789)
+++ trunk/Source/WebKit/win/ChangeLog 2013-08-28 23:41:02 UTC (rev 154790)
@@ -1,5 +1,22 @@
2013-08-28 Brent Fulgham <[email protected]>
+ [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 <[email protected]>
+
[Windows] Provide useful error messages for WebKitErrorDomain errors
https://bugs.webkit.org/show_bug.cgi?id=120428
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (154789 => 154790)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2013-08-28 23:37:28 UTC (rev 154789)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2013-08-28 23:41:02 UTC (rev 154790)
@@ -880,7 +880,7 @@
ResourceError WebFrameLoaderClient::cannotShowURLError(const ResourceRequest& request)
{
- return ResourceError(String(WebKitErrorDomain), WebKitErrorCannotShowURL, request.url().string(), WEB_UI_STRING("The URL can\x92t 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::cannotShowMIMETypeError(const ResourceResponse& response)
{
- return ResourceError(String(), WebKitErrorCannotShowMIMEType, response.url().string(), WEB_UI_STRING("Content with specified MIME type can\x92t 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 @@
switch (pluginView->status()) {
case PluginStatusCanNotFindPlugin:
errorCode = WebKitErrorCannotFindPlugIn;
- description = WEB_UI_STRING("The plug-in can\x92t 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 can\x92t be loaded", "WebKitErrorCannotLoadPlugin description");
+ description = WEB_UI_STRING("The plug-in can\xE2\x80\x99t be loaded", "WebKitErrorCannotLoadPlugin description");
break;
default:
ASSERT_NOT_REACHED();
