Bug 1264540 - Turn on test_windowless_ime.html on e10s. r=jimm
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 15 Apr 2016 14:25:39 +0900
changeset 331862 bc213dff20a3c30df7f6eab9eab1f2b7cc1dcbd2
parent 331861 b14d94f953ee8d9d4ffa1166fafaaf751202ace5
child 331863 80f80bdc6b41467760bbb0a64df2db9bc932a724
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1264540
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1264540 - Turn on test_windowless_ime.html on e10s. r=jimm Use plugin-utils.js's setTestPluginEnabledState to fix race. MozReview-Commit-ID: 6eVTDJzdKR0
dom/plugins/test/mochitest/mochitest.ini
dom/plugins/test/mochitest/test_windowless_ime.html
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@@ -133,10 +133,10 @@ skip-if = toolkit != "cocoa"
 [test_twostreams.html]
 [test_visibility.html]
 skip-if = toolkit == "cocoa"
 [test_windowed_invalidate.html]
 skip-if = os != "win"
 [test_windowless_flash.html]
 skip-if = !(os == "win" && processor == "x86_64" && !e10s) # Bug 1253957
 [test_windowless_ime.html]
-skip-if = os != "win" || e10s
+skip-if = os != "win"
 [test_zero_opacity.html]
--- a/dom/plugins/test/mochitest/test_windowless_ime.html
+++ b/dom/plugins/test/mochitest/test_windowless_ime.html
@@ -31,16 +31,16 @@ function runTests() {
 
   synthesizeComposition({ type: "compositionstart", data: "" });
   is(plugin.getLastCompositionText(), "", "can get empty composition string");
   synthesizeComposition({ type: "compositioncommit", data: "" });
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
+setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
   </script>
 </head>
 
 <body onload="runTests()">
   <embed id="plugin1" type="application/x-test" wmode="transparent" width="200" height="200"></embed>
 </body>
 </html>