Backed out changeset d6701dc311d0 (bug 1269209)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 28 Oct 2016 00:37:45 +0200
changeset 319763 81dbe8b3c629a94c581a0d0d96f64b913cfaf80f
parent 319762 6a42178adcf30bc7adde5101c6f5de7385f43eff
child 319764 1879e501620f87143dae2cdbf957a6a6e823dc8a
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 outd6701dc311d006e875e7147a9180c5da829e8c2a
Backed out changeset d6701dc311d0 (bug 1269209) MozReview-Commit-ID: 2Vg2oalCgvo
editor/libeditor/tests/chrome.ini
editor/libeditor/tests/mochitest.ini
editor/libeditor/tests/test_bug1140105.html
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -12,16 +12,17 @@ skip-if = buildapp == 'mulet'
 [test_bug607584.xul]
 [test_bug616590.xul]
 [test_bug636465.xul]
 [test_bug646194.xul]
 [test_bug780908.xul]
 [test_bug1102906.html]
 [test_bug1101392.html]
 subsuite = clipboard
+[test_bug1140105.html]
 [test_bug1140617.xul]
 subsuite = clipboard
 [test_bug1153237.html]
 [test_bug1154791.html]
 [test_bug1248128.html]
 [test_bug1248185.html]
 [test_bug1250010.html]
 [test_bug1257363.html]
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -167,17 +167,16 @@ 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_bug1140105.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_bug1140105.html
+++ b/editor/libeditor/tests/test_bug1140105.html
@@ -1,18 +1,18 @@
 <!DOCTYPE>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1140105
 -->
 <head>
   <title>Test for Bug 1140105</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><font face="Arial">1234567890</font></div>
 
 <pre id="test">
@@ -33,35 +33,34 @@ SimpleTest.waitForFocus(function() {
   is(selRange.endContainer.nodeName, "#text", "selection should be in text node");
   is(selRange.endOffset, 9, "offset should be 9");
 
   var firstHas = {};
   var anyHas = {};
   var allHas = {};
   var editor = getEditor();
 
-  var atomService = SpecialPowers.Cc["@mozilla.org/atom-service;1"].getService(SpecialPowers.Ci.nsIAtomService);
+  var atomService = Components.classes["@mozilla.org/atom-service;1"].getService(Components.interfaces.nsIAtomService);
   var propAtom = atomService.getAtom("font");
   editor.getInlineProperty(propAtom, "face", "Arial", firstHas, anyHas, allHas);
   is(firstHas.value, true, "Test for Arial: firstHas: true expected");
   is(anyHas.value, true, "Test for Arial: anyHas: true expected");
   is(allHas.value, true, "Test for Arial: allHas: true expected");
   editor.getInlineProperty(propAtom, "face", "Courier", firstHas, anyHas, allHas);
   is(firstHas.value, false, "Test for Courier: firstHas: false expected");
   is(anyHas.value, false, "Test for Courier: anyHas: false expected");
   is(allHas.value, false, "Test for Courier: allHas: false expected");
 
   SimpleTest.finish();
 
 });
 
 function getEditor() {
-  var Ci = SpecialPowers.Ci;
-  var editingSession = SpecialPowers.wrap(window)
-                             .QueryInterface(Ci.nsIInterfaceRequestor)
+  var Ci = Components.interfaces;
+  var editingSession = window.QueryInterface(Ci.nsIInterfaceRequestor)
                              .getInterface(Ci.nsIWebNavigation)
                              .QueryInterface(Ci.nsIInterfaceRequestor)
                              .getInterface(Ci.nsIEditingSession);
   var editor = editingSession.getEditorForWindow(window);
   editor.QueryInterface(Ci.nsIHTMLEditor);
   return editor;
 }