Title: [92339] trunk/LayoutTests
- Revision
- 92339
- Author
- [email protected]
- Date
- 2011-08-03 18:44:14 -0700 (Wed, 03 Aug 2011)
Log Message
[Chromium] fast/dom/resource-locations-in-created-html-document.html fails on win32
https://bugs.webkit.org/show_bug.cgi?id=65521
Patch by Noel Gordon <[email protected]> on 2011-08-03
Reviewed by Adam Barth.
file: scheme URI paths on Windows include the disk drive reference (C: for example).
Refer to http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx.
* fast/dom/resource-locations-in-created-html-document.html:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (92338 => 92339)
--- trunk/LayoutTests/ChangeLog 2011-08-04 01:41:29 UTC (rev 92338)
+++ trunk/LayoutTests/ChangeLog 2011-08-04 01:44:14 UTC (rev 92339)
@@ -1,3 +1,16 @@
+2011-08-03 Noel Gordon <[email protected]>
+
+ [Chromium] fast/dom/resource-locations-in-created-html-document.html fails on win32
+ https://bugs.webkit.org/show_bug.cgi?id=65521
+
+ Reviewed by Adam Barth.
+
+ file: scheme URI paths on Windows include the disk drive reference (C: for example).
+ Refer to http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx.
+
+ * fast/dom/resource-locations-in-created-html-document.html:
+ * platform/chromium/test_expectations.txt:
+
2011-08-03 Ryosuke Niwa <[email protected]>
Revert an erroneous rebaseline from r92315.
Modified: trunk/LayoutTests/fast/dom/resource-locations-in-created-html-document.html (92338 => 92339)
--- trunk/LayoutTests/fast/dom/resource-locations-in-created-html-document.html 2011-08-04 01:41:29 UTC (rev 92338)
+++ trunk/LayoutTests/fast/dom/resource-locations-in-created-html-document.html 2011-08-04 01:44:14 UTC (rev 92339)
@@ -10,8 +10,12 @@
htmlDoc.open();
htmlDoc.write('<html><img id="theImage" src=""
- if (htmlDoc.getElementById('theImage').src == 'file:///test')
+ var path = htmlDoc.getElementById('theImage').src;
+
+ if (path == 'file:///test')
document.getElementById('result').innerHTML = 'SUCCESS';
+ else if (/^file:\/\/\/[C-Z]:\/test$/.test(path)) // MS Windows.
+ document.getElementById('result').innerHTML = 'SUCCESS';
}
</script>
</head>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (92338 => 92339)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-08-04 01:41:29 UTC (rev 92338)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-08-04 01:44:14 UTC (rev 92339)
@@ -1041,13 +1041,6 @@
// Post-MERGE failures: these will all need to be fixed one day
-// This test assumes we're using unix paths and looks for a file:///test
-// path. We correctly return file:///C:/test on Windows. We should fix
-// upstream
-// Expectations for this test changed upstream. We should fix this test, but
-// it doesn't need to block the current release
-BUGCR10325 WIN : fast/dom/resource-locations-in-created-html-document.html = FAIL
-
// GURL/KURL difference in handling of "http:".
// New test. We should fix it, but it doesn't need to block the current release
BUGCR7386 : http/tests/security/postMessage/invalid-origin-throws-exception.html = FAIL
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
