Backed out changeset 016b31e0631f (
bug 1269209)
MozReview-Commit-ID: FjxnOGL1u2a
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -6,16 +6,17 @@ support-files = green.png
[test_bug490879.xul]
subsuite = clipboard
[test_bug569988.html]
skip-if = buildapp == 'mulet'
[test_bug599983.xul]
skip-if = buildapp == 'mulet'
[test_bug607584.xul]
[test_bug616590.xul]
+[test_bug635636.html]
[test_bug636465.xul]
[test_bug646194.xul]
[test_bug780908.xul]
[test_bug830600.html]
subsuite = clipboard
[test_bug1053048.html]
[test_bug1100966.html]
[test_bug1102906.html]
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -110,18 +110,16 @@ skip-if = toolkit == 'android'
[test_bug612128.html]
[test_bug612447.html]
[test_bug620906.html]
skip-if = toolkit == 'android' #TIMED_OUT
[test_bug622371.html]
skip-if = toolkit == 'android' #bug 957797
[test_bug625452.html]
[test_bug629845.html]
-[test_bug635636.html]
-skip-if = e10s
[test_bug638596.html]
[test_bug640321.html]
skip-if = android_version == '18' # bug 1147989
[test_bug641466.html]
[test_bug645914.html]
[test_bug668599.html]
[test_bug674770-1.html]
subsuite = clipboard
--- a/editor/libeditor/tests/test_bug635636.html
+++ b/editor/libeditor/tests/test_bug635636.html
@@ -1,18 +1,18 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=635636
-->
<head>
<title>Test for Bug 635636</title>
- <script src="/tests/SimpleTest/SimpleTest.js"></script>
- <script src="/tests/SimpleTest/EventUtils.js"></script>
- <link rel="stylesheet" href="/tests/SimpleTest/test.css">
+ <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+ <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+ <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=635636">Mozilla Bug 635636</a>
<p id="display"></p>
<div id="content">
</div>
<pre id="test">
<script type="application/javascript">
@@ -28,19 +28,18 @@ addLoadEvent(function() {
SimpleTest.waitForFocus(b2, w);
}
function b2()
{
w.document.designMode = 'on';
w.location = "data:text/plain,2";
d = w.document.getElementsByTagName("div")[0];
- const Ci = SpecialPowers.Ci;
- var mainWindow = SpecialPowers.wrap(w)
- .QueryInterface(Ci.nsIInterfaceRequestor)
+ const Ci = Components.interfaces;
+ var mainWindow = w.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShellTreeItem)
.rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow);
var browser = mainWindow.gBrowser.selectedBrowser;
browser.addEventListener("pageshow", function() {
setTimeout(b3, 0);