Backed out changeset afe951130c65 because of test failure
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 24 Jan 2011 00:10:02 -0500
changeset 61165 064c6937f64e461372d3d772003a11695b0979c3
parent 61162 afe951130c656a404cce775b78a89992086b5d25
child 61166 a186a082a084c97b997d007e17f326e8e1b55ebc
push id18253
push usereakhgari@mozilla.com
push dateMon, 24 Jan 2011 05:10:23 +0000
treeherdermozilla-central@a186a082a084 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b10pre
backs outafe951130c656a404cce775b78a89992086b5d25
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
Backed out changeset afe951130c65 because of test failure
modules/plugin/test/mochitest/Makefile.in
modules/plugin/test/mochitest/test_visibility.html
--- a/modules/plugin/test/mochitest/Makefile.in
+++ b/modules/plugin/test/mochitest/Makefile.in
@@ -115,21 +115,21 @@ endif
   utils.js \
   test_npruntime.xul   \
   test_privatemode.xul \
   test_wmode.xul \
   test_bug479979.xul \
   $(NULL)
 
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+ifneq ($(OS_ARCH),WINNT)
 _MOCHITEST_FILES += \
   test_visibility.html \
   $(NULL)
 
-ifneq ($(OS_ARCH),WINNT)
 _MOCHICHROME_FILES += \
   test_xulbrowser_plugin_visibility.xul \
   xulbrowser_plugin_visibility.xul \
   plugin_visibility_loader.html \
   $(NULL)
 endif
 endif
 
--- a/modules/plugin/test/mochitest/test_visibility.html
+++ b/modules/plugin/test/mochitest/test_visibility.html
@@ -80,24 +80,15 @@
 
     clearInterval(part4Interval);
 
     ok(true, "Plugin became invisible again.");
     p.setColor('FF00FF00');
     setTimeout(SimpleTest.finish, 500);
     // wait to make sure we don't actually paint
   }
-
-  function inPaint() {
-    // We're actually in the middle of painting the plugin so don't do anything
-    // complex here, for the sake of cases where async plugin painting isn't
-    // enabled yet
-    setTimeout(didPaint, 0);
-    // Don't run that didPaint callback again
-    didPaint = function() {};
-  }
   </script>
 
-  <embed id="theplugin" class="hidden" type="application/x-test" drawmode="solid" color="FFFF0000" paintscript="inPaint()"></embed>
+  <embed id="theplugin" class="hidden" type="application/x-test" drawmode="solid" color="FFFF0000" paintscript="setTimeout(didpaint, 0)"></embed>
   
   <script type="application/javascript">
   var p = document.getElementById('theplugin');
   </script>