[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5a3f612413ecb381a9979ae7eb163b20db19a680
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 30 14:30:33 2009 +0000

    2009-12-30  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] layoutTestController.pathToLocalResource() should return a path, not an URL
            https://bugs.webkit.org/show_bug.cgi?id=33051
    
            Moreover, its primary function is to normalize the path in regard of platform
            specific directory separators. Therefore, it can simply make use of the
            QDir::toNativeSeparators function.
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::pathToLocalResource):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1dd1723..247ba8c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-30  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] layoutTestController.pathToLocalResource() should return a path, not an URL
+        https://bugs.webkit.org/show_bug.cgi?id=33051
+
+        Moreover, its primary function is to normalize the path in regard of platform
+        specific directory separators. Therefore, it can simply make use of the
+        QDir::toNativeSeparators function.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::pathToLocalResource):
+
 2009-12-30  David D. Kilzer  <ddkilzer at webkit.org>
 
         Fix executable bits for r52646
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 40a06ae..adcdbca 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -160,7 +160,7 @@ void LayoutTestController::clearBackForwardList()
 QString LayoutTestController::pathToLocalResource(const QString& url)
 {
     // Function introduced in r28690.
-    return QLatin1String("file://") + QUrl(url).toLocalFile();
+    return QDir::toNativeSeparators(url);
 }
 
 void LayoutTestController::dumpEditingCallbacks()

-- 
WebKit Debian packaging