[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit be3ba9045f2470a26f082917e864a85eac31698f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 22:46:35 2010 +0000

    2010-07-14  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r63346.
            http://trac.webkit.org/changeset/63346
            https://bugs.webkit.org/show_bug.cgi?id=42295
    
            Broke lots of tests, some of which probably just need new
            results (Requested by aroben on #webkit).
    
            * DumpRenderTree/win/DumpRenderTree.cpp:
            (urlSuitableForTestResult):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63363 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0c6af99..f841d38 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-14  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r63346.
+        http://trac.webkit.org/changeset/63346
+        https://bugs.webkit.org/show_bug.cgi?id=42295
+
+        Broke lots of tests, some of which probably just need new
+        results (Requested by aroben on #webkit).
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (urlSuitableForTestResult):
+
 2010-07-14  Adam Roben  <aroben at apple.com>
 
         Speed up killing of Apache on Windows
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 1286397..451ff86 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -134,7 +134,7 @@ bool setAlwaysAcceptCookies(bool alwaysAcceptCookies)
 
 wstring urlSuitableForTestResult(const wstring& url)
 {
-    if (!url.c_str() || (url.find(L"file://") == wstring::npos && url.find(L"http://") == wstring::npos))
+    if (!url.c_str() || url.find(L"file://") == wstring::npos)
         return url;
 
     return PathFindFileNameW(url.c_str());

-- 
WebKit Debian packaging