Changeset 79827 in webkit

Timestamp:

Feb 27, 2011 1:16:50 PM (13 years ago)

Author:

Adam Roben

Message:

Make ResourceLoadDelegate print URLs relative to the main resource on Windows

This matches Mac. (In fact, the code was ported from Mac!)

Fixes <​http://webkit.org/b/55328> URLs printed by ResourceLoadDelegate on Windows don't
match Mac

Reviewed by Anders Carlsson.

• DumpRenderTree/win/DumpRenderTree.cpp:

(substringFromIndex): Added. Emulates -[NSString substringFromIndex:].
(urlSuitableForTestResult): Ported code from -[NSURL(DRTExtras)
_drt_descriptionSuitableForTestResult].
(cfStringRefToWString): Moved here from LayoutTestControllerWin.cpp.

• DumpRenderTree/win/DumpRenderTreeWin.h: Added declaration of cfStringRefToWString.

• DumpRenderTree/win/LayoutTestControllerWin.cpp: Moved cfStringRefToWString to

DumpRenderTree.cpp.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/win/DumpRenderTree.cpp (modified) (3 diffs)
• DumpRenderTree/win/DumpRenderTreeWin.h (modified) (1 diff)
• DumpRenderTree/win/LayoutTestControllerWin.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-27  Adam Roben  <aroben@apple.com>
+
+        Make ResourceLoadDelegate print URLs relative to the main resource on Windows
+
+        This matches Mac. (In fact, the code was ported from Mac!)
+
+        Fixes <http://webkit.org/b/55328> URLs printed by ResourceLoadDelegate on Windows don't
+        match Mac
+
+        Reviewed by Anders Carlsson.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (substringFromIndex): Added. Emulates -[NSString substringFromIndex:].
+        (urlSuitableForTestResult): Ported code from -[NSURL(DRTExtras)
+        _drt_descriptionSuitableForTestResult].
+        (cfStringRefToWString): Moved here from LayoutTestControllerWin.cpp.
+
+        * DumpRenderTree/win/DumpRenderTreeWin.h: Added declaration of cfStringRefToWString.
+
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp: Moved cfStringRefToWString to
+        DumpRenderTree.cpp.
+
 2011-02-27  Adam Roben  <aroben@apple.com>
 

trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

@@ -41 +41 @@
 #include "WorkQueue.h"
 
+#include <comutil.h>
 #include <fcntl.h>
 #include <io.h>
@@ -132 +133 @@
 }
 
-wstring urlSuitableForTestResult(const wstring& url)
-{
-    if (url.find(L"file://") == wstring::npos)
-        return url;
-
-    return lastPathComponent(url);
+static RetainPtr<CFStringRef> substringFromIndex(CFStringRef string, CFIndex index)
+{
+    return RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithSubstring(kCFAllocatorDefault, string, CFRangeMake(index, CFStringGetLength(string) - index)));
+}
+
+wstring urlSuitableForTestResult(const wstring& urlString)
+{
+    RetainPtr<CFURLRef> url(AdoptCF, CFURLCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(urlString.c_str()), urlString.length() * sizeof(wstring::value_type), kCFStringEncodingUTF16, 0));
+
+    RetainPtr<CFStringRef> scheme(AdoptCF, CFURLCopyScheme(url.get()));
+    if (scheme && CFStringCompare(scheme.get(), CFSTR("file"), kCFCompareCaseInsensitive) != kCFCompareEqualTo)
+        return urlString;
+
+    COMPtr<IWebDataSource> dataSource;
+    if (FAILED(frame->dataSource(&dataSource))) {
+        if (FAILED(frame->provisionalDataSource(&dataSource)))
+            return urlString;
+    }
+
+    COMPtr<IWebMutableURLRequest> request;
+    if (FAILED(dataSource->request(&request)))
+        return urlString;
+
+    _bstr_t requestURLString;
+    if (FAILED(request->URL(requestURLString.GetAddress())))
+        return urlString;
+
+    RetainPtr<CFURLRef> requestURL(AdoptCF, CFURLCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(requestURLString.GetBSTR()), requestURLString.length() * sizeof(OLECHAR), kCFStringEncodingUTF16, 0));
+    RetainPtr<CFURLRef> baseURL(AdoptCF, CFURLCreateCopyDeletingLastPathComponent(kCFAllocatorDefault, requestURL.get()));
+
+    RetainPtr<CFStringRef> basePath(AdoptCF, CFURLCopyPath(baseURL.get()));
+    RetainPtr<CFStringRef> path(AdoptCF, CFURLCopyPath(url.get()));
+
+    return cfStringRefToWString(substringFromIndex(path.get(), CFStringGetLength(basePath.get())).get());
 }
 
@@ -167 +196 @@
 {
     return toUTF8(wideString.c_str(), wideString.length());
+}
+
+wstring cfStringRefToWString(CFStringRef cfStr)
+{
+    Vector<wchar_t> v(CFStringGetLength(cfStr));
+    CFStringGetCharacters(cfStr, CFRangeMake(0, CFStringGetLength(cfStr)), (UniChar *)v.data());
+
+    return wstring(v.data(), v.size());
 }
 

trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h

@@ -53 +53 @@
 std::string toUTF8(BSTR);
 std::string toUTF8(const std::wstring&);
+std::wstring cfStringRefToWString(CFStringRef);
+
 IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow = 0);
 Vector<HWND>& openWindows();

trunk/Tools/DumpRenderTree/win/LayoutTestControllerWin.cpp

@@ -712 +712 @@
 }
 
-static wstring cfStringRefToWString(CFStringRef cfStr)
-{
-    Vector<wchar_t> v(CFStringGetLength(cfStr));
-    CFStringGetCharacters(cfStr, CFRangeMake(0, CFStringGetLength(cfStr)), (UniChar *)v.data());
-
-    return wstring(v.data(), v.size());
-}
-
 void LayoutTestController::setUserStyleSheetLocation(JSStringRef jsURL)
 {