Title: [200506] trunk/Tools
Revision
200506
Author
a...@apple.com
Date
2016-05-05 23:07:25 -0700 (Thu, 05 May 2016)

Log Message

Partially revert http://trac.webkit.org/r200504
Improve HTTP test names in WebKitTestRunner's crash report information
https://bugs.webkit.org/show_bug.cgi?id=157389

* WebKitTestRunner/cocoa/CrashReporterInfo.mm: Turns out that we can't have URLs
in crash reporter information.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (200505 => 200506)


--- trunk/Tools/ChangeLog	2016-05-06 03:14:48 UTC (rev 200505)
+++ trunk/Tools/ChangeLog	2016-05-06 06:07:25 UTC (rev 200506)
@@ -1,8 +1,17 @@
 2016-05-05  Alexey Proskuryakov  <a...@apple.com>
 
+        Partially revert http://trac.webkit.org/r200504
         Improve HTTP test names in WebKitTestRunner's crash report information
         https://bugs.webkit.org/show_bug.cgi?id=157389
 
+        * WebKitTestRunner/cocoa/CrashReporterInfo.mm: Turns out that we can't have URLs
+        in crash reporter information.
+
+2016-05-05  Alexey Proskuryakov  <a...@apple.com>
+
+        Improve HTTP test names in WebKitTestRunner's crash report information
+        https://bugs.webkit.org/show_bug.cgi?id=157389
+
         Reviewed by Alex Christensen.
 
         * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:

Modified: trunk/Tools/WebKitTestRunner/cocoa/CrashReporterInfo.mm (200505 => 200506)


--- trunk/Tools/WebKitTestRunner/cocoa/CrashReporterInfo.mm	2016-05-06 03:14:48 UTC (rev 200505)
+++ trunk/Tools/WebKitTestRunner/cocoa/CrashReporterInfo.mm	2016-05-06 06:07:25 UTC (rev 200506)
@@ -33,7 +33,7 @@
 
 namespace WTR {
 
-static String testDescription(WKURLRef url)
+static String testPathFromURL(WKURLRef url)
 {
     RetainPtr<CFURLRef> cfURL = adoptCF(WKURLCopyCFURL(kCFAllocatorDefault, url));
     if (!cfURL)
@@ -59,18 +59,18 @@
 
     RetainPtr<CFStringRef> hostCFString = adoptCF(CFURLCopyHostName(cfURL.get()));
     String hostString(hostCFString.get());
-    if (hostString != "127.0.0.1")
-        return String();
+    if (hostString == "127.0.0.1")
+        return pathString;
 
-    return CFURLGetString(cfURL.get());
+    return String();
 }
 
 void setCrashReportApplicationSpecificInformationToURL(WKURLRef url)
 {
-    String description = testDescription(url);
-    if (!description.isNull()) {
+    String testPath = testPathFromURL(url);
+    if (!testPath.isNull()) {
         String message("CRASHING TEST: ");
-        message = message + description;
+        message = message + testPath;
         WKSetCrashReportApplicationSpecificInformation(message.createCFString().get());
     }
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to