Backed out changeset dc9d739edd0f (bug 1269209)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 28 Oct 2016 00:37:53 +0200
changeset 319765 bf99c4d5d8e076db9058a5255a690e0165d2e33b
parent 319764 1879e501620f87143dae2cdbf957a6a6e823dc8a
child 319766 177bf2e81f9688b25b96263815820e0a362cf34c
push id20748
push userphilringnalda@gmail.com
push dateFri, 28 Oct 2016 03:39:55 +0000
treeherderfx-team@715360440695 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1269209
milestone52.0a1
backs outdc9d739edd0ff7b694c2bb98da9b0ffb2fcdea9d
Backed out changeset dc9d739edd0f (bug 1269209) MozReview-Commit-ID: FyJ0wypywng
editor/libeditor/tests/chrome.ini
editor/libeditor/tests/mochitest.ini
editor/libeditor/tests/test_bug1053048.html
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -9,16 +9,17 @@ subsuite = clipboard
 skip-if = buildapp == 'mulet'
 [test_bug599983.xul]
 skip-if = buildapp == 'mulet'
 [test_bug607584.xul]
 [test_bug616590.xul]
 [test_bug636465.xul]
 [test_bug646194.xul]
 [test_bug780908.xul]
+[test_bug1053048.html]
 [test_bug1100966.html]
 [test_bug1102906.html]
 [test_bug1101392.html]
 subsuite = clipboard
 [test_bug1140105.html]
 [test_bug1140617.xul]
 subsuite = clipboard
 [test_bug1153237.html]
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -163,17 +163,16 @@ skip-if = e10s
 [test_bug974309.html]
 skip-if = toolkit == 'android'
 [test_bug966155.html]
 skip-if = os != "win"
 [test_bug966552.html]
 skip-if = os != "win"
 [test_bug998188.html]
 [test_bug1026397.html]
-[test_bug1053048.html]
 [test_bug1067255.html]
 [test_bug1094000.html]
 [test_CF_HTML_clipboard.html]
 subsuite = clipboard
 [test_contenteditable_focus.html]
 [test_dom_input_event_on_htmleditor.html]
 skip-if = toolkit == 'android' # bug 1054087
 [test_dom_input_event_on_texteditor.html]
--- a/editor/libeditor/tests/test_bug1053048.html
+++ b/editor/libeditor/tests/test_bug1053048.html
@@ -1,32 +1,32 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1053048
 -->
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 1053048</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="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   /** Test for Bug 1053048 **/
   SimpleTest.waitForExplicitFinish();
   SimpleTest.waitForFocus(runTests);
 
-  const nsISelectionPrivate = SpecialPowers.Ci.nsISelectionPrivate;
-  const nsISelectionListener = SpecialPowers.Ci.nsISelectionListener;
-  const nsIDOMNSEditableElement = SpecialPowers.Ci.nsIDOMNSEditableElement;
+  const nsISelectionPrivate = Components.interfaces.nsISelectionPrivate;
+  const nsISelectionListener = Components.interfaces.nsISelectionListener;
+  const nsIDOMNSEditableElement = Components.interfaces.nsIDOMNSEditableElement;
 
   function runTests()
   {
-    var textarea = SpecialPowers.wrap(document.getElementById("textarea"));
+    var textarea = document.getElementById("textarea");
     textarea.focus();
 
     var editor = textarea.QueryInterface(nsIDOMNSEditableElement).editor;
     var selectionPrivate = editor.selection.QueryInterface(nsISelectionPrivate);
 
     var selectionListener = {
       count: 0,
       notifySelectionChanged: function (aDocument, aSelection, aReason)