Backed out changeset 1b9719af21a2 (bug 1269209)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 28 Oct 2016 00:37:49 +0200
changeset 319764 1879e501620f87143dae2cdbf957a6a6e823dc8a
parent 319763 81dbe8b3c629a94c581a0d0d96f64b913cfaf80f
child 319765 bf99c4d5d8e076db9058a5255a690e0165d2e33b
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 out1b9719af21a2109701967b51689462c7e605eac6
Backed out changeset 1b9719af21a2 (bug 1269209) MozReview-Commit-ID: HiRfHGgLsuS
editor/libeditor/tests/chrome.ini
editor/libeditor/tests/mochitest.ini
editor/libeditor/tests/test_bug1100966.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_bug1100966.html]
 [test_bug1102906.html]
 [test_bug1101392.html]
 subsuite = clipboard
 [test_bug1140105.html]
 [test_bug1140617.xul]
 subsuite = clipboard
 [test_bug1153237.html]
 [test_bug1154791.html]
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -166,17 +166,16 @@ skip-if = toolkit == 'android'
 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_bug1100966.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]
 [test_keypress_untrusted_event.html]
 [test_root_element_replacement.html]
--- a/editor/libeditor/tests/test_bug1100966.html
+++ b/editor/libeditor/tests/test_bug1100966.html
@@ -1,18 +1,18 @@
 <!DOCTYPE>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1100966
 -->
 <head>
   <title>Test for Bug 1100966</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" href="/tests/SimpleTest/test.css">
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
 </head>
 <body>
 <div id="display">
 </div>
 <div id="content" contenteditable>
 =====<br>
 correct<br>
 fivee sixx<br>
@@ -43,22 +43,21 @@ SimpleTest.waitForFocus(function() {
 
       SimpleTest.finish();
     },0);
   },0);
 
 });
 
 function getSpellCheckSelection() {
-  var Ci = SpecialPowers.Ci;
-  var editingSession = SpecialPowers.wrap(window)
-    .QueryInterface(Ci.nsIInterfaceRequestor)
-    .getInterface(Ci.nsIWebNavigation)
-    .QueryInterface(Ci.nsIInterfaceRequestor)
-    .getInterface(Ci.nsIEditingSession);
+  var Ci = Components.interfaces;
+  var editingSession = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                             .getInterface(Ci.nsIWebNavigation)
+                             .QueryInterface(Ci.nsIInterfaceRequestor)
+                             .getInterface(Ci.nsIEditingSession);
   var editor = editingSession.getEditorForWindow(window);
   var selcon = editor.selectionController;
   return selcon.getSelection(selcon.SELECTION_SPELLCHECK);
 }
 
 </script>
 </body>