Changeset 84924 in webkit

Timestamp:

Apr 26, 2011 10:16:36 AM (13 years ago)

Author:

Adam Roben

Message:

Make DRT/win log loading errors the same way DRT/mac does

Fixes <​http://webkit.org/b/59303> [Windows WebKit1 Tests]
http/tests/misc/will-send-request-returns-null-on-redirect.html failing since r84742

Reviewed by Alexey Proskuryakov.

• DumpRenderTree/win/ResourceLoadDelegate.cpp:

(ResourceLoadDelegate::descriptionSuitableForTestResult): Removed the workaround for
<rdar://problem/5064234>, which has long since been fixed, and then made this function match
-[NSError(DRTExtras) _drt_descriptionSuitableForTestResult] more closely.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/win/ResourceLoadDelegate.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-26  Adam Roben  <aroben@apple.com>
+
+        Make DRT/win log loading errors the same way DRT/mac does
+
+        Fixes <http://webkit.org/b/59303> [Windows WebKit1 Tests]
+        http/tests/misc/will-send-request-returns-null-on-redirect.html failing since r84742
+
+        Reviewed by Alexey Proskuryakov.
+
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::descriptionSuitableForTestResult): Removed the workaround for
+        <rdar://problem/5064234>, which has long since been fixed, and then made this function match
+        -[NSError(DRTExtras) _drt_descriptionSuitableForTestResult] more closely.
+
 2011-04-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Tools/DumpRenderTree/win/ResourceLoadDelegate.cpp

@@ -155 +155 @@
         return wstring();
 
-    wstring failingURL;
-    
-    // If the error doesn't have a failing URL, we fake one by using the URL the resource had 
-    // at creation time. This seems to work fine for now.
-    // See <rdar://problem/5064234> CFErrors should have failingURL key.
-    if (failingURLSTR)
-        failingURL = wstringFromBSTR(failingURLSTR);
-    else
-        failingURL = descriptionSuitableForTestResult(identifier);
-
-    ::SysFreeString(failingURLSTR);
-
-    result += L", failing URL \"" + urlSuitableForTestResult(failingURL) + L"\">";
+    if (failingURLSTR) {
+        result += L", failing URL \"" + urlSuitableForTestResult(wstringFromBSTR(failingURLSTR)) + L"\"";
+        ::SysFreeString(failingURLSTR);
+    }
+
+    result += L">";
 
     return result;