summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/loader/location-port-expected.txt6
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/location-port-expected.txt6
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt1
3 files changed, 12 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/loader/location-port-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/loader/location-port-expected.txt
new file mode 100644
index 0000000..b69998d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/loader/location-port-expected.txt
@@ -0,0 +1,6 @@
+This tests that modifying location.port works as it should
+
+PASS: internalFrame.contentWindow.location.port == "" should be true and is.
+FAIL: internalFrame.contentWindow.location.port == "88" should be true but instead is false.
+PASS: internalFrame.contentWindow.location.port == "" should be true and is.
+FAIL: internalFrame.contentWindow.location.port == "80" should be true but instead is false.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/location-port-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/location-port-expected.txt
new file mode 100644
index 0000000..b69998d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/loader/location-port-expected.txt
@@ -0,0 +1,6 @@
+This tests that modifying location.port works as it should
+
+PASS: internalFrame.contentWindow.location.port == "" should be true and is.
+FAIL: internalFrame.contentWindow.location.port == "88" should be true but instead is false.
+PASS: internalFrame.contentWindow.location.port == "" should be true and is.
+FAIL: internalFrame.contentWindow.location.port == "80" should be true but instead is false.
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 4b6d197..96119887 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1622,7 +1622,6 @@ LINUX : LayoutTests/fast/canvas/fillrect_gradient.html = FAIL PASS
LINUX : LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html = FAIL
// New failures from Merge 41078:41149
-LayoutTests/fast/loader/location-port.html = FAIL
LINUX WIN : LayoutTests/fast/text/atsui-spacing-features.html = FAIL
LINUX : LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL
LINUX : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL