Backed out changeset 4ebf2657b295 (bug 920927) for Android Reftest Failure on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 30 Sep 2013 15:05:09 +0200
changeset 149269 674700b7062413962ec209166cb4602e71090139
parent 149268 1c09eccf1bdbb225b3326a942014221e7eff296d
child 149270 4ae5aa6fb0db57e7c3e791e6120ac21236f8899b
push id25380
push userryanvm@gmail.com
push dateMon, 30 Sep 2013 20:16:36 +0000
treeherdermozilla-central@1332fc1c15e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs920927
milestone27.0a1
backs out4ebf2657b29509df0006b479c9c48beb87604ffb
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 4ebf2657b295 (bug 920927) for Android Reftest Failure on a CLOSED TREE
browser/base/content/browser-plugins.js
toolkit/mozapps/plugins/content/pluginProblemBinding.css
toolkit/mozapps/plugins/content/pluginProblemContent.css
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -308,17 +308,17 @@ var gPluginHandler = {
         break;
 
       case "PluginInstantiated":
       case "PluginRemoved":
         shouldShowNotification = true;
         break;
     }
 
-    // Show the in-content UI if it's not too big. The crashed plugin handler already did this.
+    // Hide the in-content UI if it's too big. The crashed plugin handler already did this.
     if (eventType != "PluginCrashed" && eventType != "PluginRemoved") {
       let overlay = this.getPluginUI(plugin, "main");
       if (overlay != null) {
         if (!this.isTooSmall(plugin, overlay))
           overlay.style.visibility = "visible";
 
         plugin.addEventListener("overflow", function(event) {
           overlay.style.visibility = "hidden";
@@ -984,22 +984,22 @@ var gPluginHandler = {
     // Is the <object>'s size too small to hold what we want to show?
     if (this.isTooSmall(plugin, overlay)) {
       // First try hiding the crash report submission UI.
       statusDiv.removeAttribute("status");
 
       if (this.isTooSmall(plugin, overlay)) {
         // Hide the overlay's contents. Use visibility style, so that it doesn't
         // collapse down to 0x0.
+        overlay.style.visibility = "hidden";
         isShowing = false;
       }
     }
 
     if (isShowing) {
-      overlay.style.visibility = "visible";
       // If a previous plugin on the page was too small and resulted in adding a
       // notification bar, then remove it because this plugin instance it big
       // enough to serve as in-content notification.
       hideNotificationBar();
       doc.mozNoPluginCrashedNotification = true;
     } else {
       // If another plugin on the page was large enough to show our UI, we don't
       // want to show a notification bar.
--- a/toolkit/mozapps/plugins/content/pluginProblemBinding.css
+++ b/toolkit/mozapps/plugins/content/pluginProblemBinding.css
@@ -21,12 +21,15 @@ applet:-moz-handler-vulnerable-no-update
 object:-moz-handler-disabled,
 object:-moz-handler-blocked,
 object:-moz-handler-crashed,
 object:-moz-handler-clicktoplay,
 object:-moz-handler-playpreview,
 object:-moz-handler-vulnerable-updatable,
 object:-moz-handler-vulnerable-no-update {
     display: inline-block;
+    /* Initialize the overlay with visibility:hidden to prevent flickering if
+     * the plugin is too small to show the overlay */
+    visibility: hidden;
     overflow: hidden;
     opacity: 1 !important;
     -moz-binding: url('chrome://mozapps/content/plugins/pluginProblem.xml#pluginProblem') !important;
 }
--- a/toolkit/mozapps/plugins/content/pluginProblemContent.css
+++ b/toolkit/mozapps/plugins/content/pluginProblemContent.css
@@ -37,19 +37,16 @@ html|applet:not([height]), html|applet[h
 :-moz-handler-disabled .mainBox:focus,
 :-moz-handler-blocked .mainBox:focus {
   outline: 1px dotted;
 }
 
 .mainBox {
   width: inherit;
   height: inherit;
-  /* Initialize the overlay with visibility:hidden to prevent flickering if
-   * the plugin is too small to show the overlay */
-  visibility: hidden;
   overflow: hidden;
   direction: ltr;
   unicode-bidi: embed;
   /* used to block inherited properties */
   text-transform: none;
   text-indent: 0;
   cursor: initial;
   white-space: initial;