From 41473dd86dc4b13a7ee850636573b9d5b994d67f Mon Sep 17 00:00:00 2001 From: Yoshi Huang Date: Tue, 20 Jun 2017 14:11:18 +0800 Subject: [PATCH] Bug 1373513 - Part 2: Revert Bug 1364367. r=ckerschb Revert what we did in Bug1364367, as data URI for -moz-binding should be same origin. --- dom/xbl/test/mochitest.ini | 1 - dom/xbl/test/test_bug379959.html | 6 +- dom/xbl/test/test_bug379959_legacy.html | 73 ------------------------- 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 dom/xbl/test/test_bug379959_legacy.html diff --git a/dom/xbl/test/mochitest.ini b/dom/xbl/test/mochitest.ini index d679ea19b7b9..8d0bd3b92b76 100644 --- a/dom/xbl/test/mochitest.ini +++ b/dom/xbl/test/mochitest.ini @@ -24,7 +24,6 @@ support-files = [test_bug372769.html] [test_bug378866.xhtml] [test_bug379959.html] -[test_bug379959_legacy.html] [test_bug389322.xhtml] [test_bug397934.html] [test_bug400705.xhtml] diff --git a/dom/xbl/test/test_bug379959.html b/dom/xbl/test/test_bug379959.html index 3d6570f404a3..e86bdfe86a94 100644 --- a/dom/xbl/test/test_bug379959.html +++ b/dom/xbl/test/test_bug379959.html @@ -6,10 +6,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=379959 Test for Bug 379959 - @@ -37,7 +33,7 @@ function receiveMessage(e) { is(e.origin, "http://mochi.test:8888", "wrong sender!"); if (e.data.test === "dataIsAllowed") { - is(e.data.result, 0, "data-url load should have blocked"); + is(e.data.result, 1, "data-url load should have succeeded"); seenData = true; } else if (e.data.test === "sameOriginIsAllowed") { diff --git a/dom/xbl/test/test_bug379959_legacy.html b/dom/xbl/test/test_bug379959_legacy.html deleted file mode 100644 index eb58c596de70..000000000000 --- a/dom/xbl/test/test_bug379959_legacy.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - Test for Bug 379959 - - - - - - Mozilla Bug 379959 -

- Note: In order to re-run this test correctly you need to shift-reload - rather than simply reload. If you just reload we will restore the - previous url in the iframe which will result in an extra unexpected - message. -

- - - - - 
-    
-
- -