Title: [105461] trunk
Revision
105461
Author
[email protected]
Date
2012-01-19 16:13:05 -0800 (Thu, 19 Jan 2012)

Log Message

[WK2] fast/url/degenerate-file-base.html fails
https://bugs.webkit.org/show_bug.cgi?id=76619

Reviewed by Adam Roben.

Tools:

A URL generated form local path for loading had an extra slash, making document.URL
incorrect in all WebKit2 tests (file://localhost//path/to/test.html).

* WebKitTestRunner/TestInvocation.cpp: (WTR::createWKURL):

LayoutTests:

* platform/qt-wk2/Skipped: Unskipped the test.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (105460 => 105461)


--- trunk/LayoutTests/ChangeLog	2012-01-20 00:07:53 UTC (rev 105460)
+++ trunk/LayoutTests/ChangeLog	2012-01-20 00:13:05 UTC (rev 105461)
@@ -1,3 +1,12 @@
+2012-01-19  Alexey Proskuryakov  <[email protected]>
+
+        [WK2] fast/url/degenerate-file-base.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=76619
+
+        Reviewed by Adam Roben.
+
+        * platform/qt-wk2/Skipped: Unskipped the test.
+
 2012-01-19  Adam Barth  <[email protected]>
 
         Add Chromium-specific image baselines for

Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (105460 => 105461)


--- trunk/LayoutTests/platform/qt-wk2/Skipped	2012-01-20 00:07:53 UTC (rev 105460)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped	2012-01-20 00:13:05 UTC (rev 105461)
@@ -448,7 +448,3 @@
 # https://bugs.webkit.org/show_bug.cgi?id=76546
 svg/W3C-SVG-1.1
 svg/W3C-SVG-1.1-SE
-
-# [Qt][WK2] fast/url/degenerate-file-base.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=76619
-fast/url/degenerate-file-base.html

Modified: trunk/Tools/ChangeLog (105460 => 105461)


--- trunk/Tools/ChangeLog	2012-01-20 00:07:53 UTC (rev 105460)
+++ trunk/Tools/ChangeLog	2012-01-20 00:13:05 UTC (rev 105461)
@@ -1,3 +1,15 @@
+2012-01-19  Alexey Proskuryakov  <[email protected]>
+
+        [WK2] fast/url/degenerate-file-base.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=76619
+
+        Reviewed by Adam Roben.
+
+        A URL generated form local path for loading had an extra slash, making document.URL
+        incorrect in all WebKit2 tests (file://localhost//path/to/test.html).
+
+        * WebKitTestRunner/TestInvocation.cpp: (WTR::createWKURL):
+
 2012-01-18  Ojan Vafai  <[email protected]>
 
         check-webkit-style of the chromium test_expectations.txt file doesn't test all chromium ports

Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (105460 => 105461)


--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp	2012-01-20 00:07:53 UTC (rev 105460)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp	2012-01-20 00:13:05 UTC (rev 105461)
@@ -59,16 +59,17 @@
     if (!length)
         return 0;
 
-    // FIXME: Remove the "localhost/" suffix once <http://webkit.org/b/55683> is fixed.
-    const char* filePrefix = "file://localhost/";
-    static const size_t prefixLength = strlen(filePrefix);
 #if OS(WINDOWS)
     const char separator = '\\';
     bool isAbsolutePath = length >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == separator;
+    // FIXME: Remove the "localhost/" suffix once <http://webkit.org/b/55683> is fixed.
+    const char* filePrefix = "file://localhost/";
 #else
     const char separator = '/';
     bool isAbsolutePath = pathOrURL[0] == separator;
+    const char* filePrefix = "file://";
 #endif
+    static const size_t prefixLength = strlen(filePrefix);
 
     OwnArrayPtr<char> buffer;
     if (isAbsolutePath) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to