Title: [178697] trunk/Tools
Revision
178697
Author
bfulg...@apple.com
Date
2015-01-19 21:55:43 -0800 (Mon, 19 Jan 2015)

Log Message

[Win] Layout Test fast/xmlhttprequest/xmlhttprequest-no-file-access.html is failing
https://bugs.webkit.org/show_bug.cgi?id=140665

Reviewed by Brian Burg.

* DumpRenderTree/win/UIDelegate.cpp:
(UIDelegate::webViewAddMessageToConsole): Correct string search and concatenation to
match expected test output.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (178696 => 178697)


--- trunk/Tools/ChangeLog	2015-01-20 05:28:04 UTC (rev 178696)
+++ trunk/Tools/ChangeLog	2015-01-20 05:55:43 UTC (rev 178697)
@@ -1,3 +1,14 @@
+2015-01-19  Brent Fulgham  <bfulg...@apple.com>
+
+        [Win] Layout Test fast/xmlhttprequest/xmlhttprequest-no-file-access.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=140665
+
+        Reviewed by Brian Burg.
+
+        * DumpRenderTree/win/UIDelegate.cpp:
+        (UIDelegate::webViewAddMessageToConsole): Correct string search and concatenation to
+        match expected test output.
+
 2015-01-19  Benjamin Poulain  <bpoul...@apple.com>
 
         Remove the support for custom suffixes on ChangeLog

Modified: trunk/Tools/DumpRenderTree/win/UIDelegate.cpp (178696 => 178697)


--- trunk/Tools/DumpRenderTree/win/UIDelegate.cpp	2015-01-20 05:28:04 UTC (rev 178696)
+++ trunk/Tools/DumpRenderTree/win/UIDelegate.cpp	2015-01-20 05:55:43 UTC (rev 178697)
@@ -416,9 +416,10 @@
     wstring newMessage;
     if (message) {
         newMessage = message;
-        size_t fileProtocol = newMessage.find(L"file://");
+        const std::wstring fileURL(L"file://");
+        size_t fileProtocol = newMessage.find(fileURL);
         if (fileProtocol != wstring::npos)
-            newMessage = newMessage.substr(0, fileProtocol) + lastPathComponent(newMessage.substr(fileProtocol));
+            newMessage = newMessage.substr(0, fileProtocol) + lastPathComponent(newMessage.substr(fileProtocol + fileURL.size()));
     }
 
     printf("CONSOLE MESSAGE: ");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to