Bug 976769 - Stop layering the plugin overlay topmost. r=bsmedberg, a=sledru
authorGeorg Fritzsche <georg.fritzsche@googlemail.com>
Thu, 27 Feb 2014 17:53:56 +0100
changeset 183232 eeae2bb00b8f3110c6c44083be9e5829b05ebaff
parent 183231 fbbdc60eea00a27d5e3ab3be8ac9a317a760f25b
child 183233 7dfa048bd34579f92056cff9d4675920dda32329
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, sledru
bugs976769
milestone29.0a2
Bug 976769 - Stop layering the plugin overlay topmost. r=bsmedberg, a=sledru
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_bug752516.js
browser/base/content/test/general/plugin_bug752516.html
toolkit/mozapps/plugins/content/pluginProblemContent.css
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -62,17 +62,16 @@ support-files =
   page_style_sample.html
   plugin_add_dynamically.html
   plugin_alternate_content.html
   plugin_big.html
   plugin_both.html
   plugin_both2.html
   plugin_bug744745.html
   plugin_bug749455.html
-  plugin_bug752516.html
   plugin_bug787619.html
   plugin_bug797677.html
   plugin_bug820497.html
   plugin_clickToPlayAllow.html
   plugin_clickToPlayDeny.html
   plugin_data_url.html
   plugin_iframe.html
   plugin_hidden_to_visible.html
@@ -223,17 +222,16 @@ skip-if = os == "mac" # Intermittent fai
 [browser_bug710878.js]
 [browser_bug719271.js]
 [browser_bug724239.js]
 [browser_bug734076.js]
 [browser_bug735471.js]
 [browser_bug743421.js]
 [browser_bug744745.js]
 [browser_bug749738.js]
-[browser_bug752516.js]
 [browser_bug763468_perwindowpb.js]
 [browser_bug767836_perwindowpb.js]
 [browser_bug771331.js]
 [browser_bug783614.js]
 [browser_bug787619.js]
 [browser_bug797677.js]
 [browser_bug812562.js]
 [browser_bug816527.js]
deleted file mode 100644
--- a/browser/base/content/test/general/browser_bug752516.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- *  License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var gTestBrowser = null;
-
-function test() {
-  waitForExplicitFinish();
-  registerCleanupFunction(function() {
-    Services.prefs.clearUserPref("plugins.click_to_play");
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-
-  Services.prefs.setBoolPref("plugins.click_to_play", true);
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gTestBrowser = gBrowser.selectedBrowser;
-  let gHttpTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
-  gTestBrowser.contentWindow.location = gHttpTestRoot + "plugin_bug752516.html";
-
-  gTestBrowser.addEventListener("load", tabLoad, true);
-}
-
-function tabLoad() {
-  // Due to layout being async, "PluginBindAttached" may trigger later.
-  // This forces a layout flush, thus triggering it, and schedules the
-  // test so it is definitely executed afterwards.
-  gTestBrowser.contentDocument.getElementById('test').clientTop;
-  executeSoon(actualTest);
-}
-
-function actualTest() {
-  let doc = gTestBrowser.contentDocument;
-  let plugin = doc.getElementById("test");
-  ok(!plugin.activated, "Plugin should not be activated");
-  ok(PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser).dismissed, "Doorhanger should not be open");
-
-  EventUtils.synthesizeMouseAtCenter(plugin, {}, gTestBrowser.contentWindow);
-  let condition = function() !PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser).dismissed;
-  waitForCondition(condition, finish, "Waited too long for plugin doorhanger to activate");
-}
deleted file mode 100644
--- a/browser/base/content/test/general/plugin_bug752516.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8"/>
-  <style type="text/css">
-    div {
-      padding: 2%;
-      position: absolute;
-      top: 0; bottom: 0;
-      left: 0; right: 0;
-      text-align: center;
-      border: 4px solid red;
-    }
-  </style>
-</head>
-<body>
-  <div id="container">
-    <object id="test" type="application/x-test" width="159" height="91"></object>
-  </div>
-  <div id="overlay">
-  	<h1>overlay</h1>
-  </div>
-</body>
-</html>
--- a/toolkit/mozapps/plugins/content/pluginProblemContent.css
+++ b/toolkit/mozapps/plugins/content/pluginProblemContent.css
@@ -48,17 +48,16 @@ html|applet:not([height]), html|applet[h
   /* used to block inherited properties */
   text-transform: none;
   text-indent: 0;
   cursor: initial;
   white-space: initial;
   word-spacing: initial;
   letter-spacing: initial;
   line-height: initial;
-  z-index: 2147483647;
   position: relative;
 }
 
 /* Initialize the overlay with visibility:hidden to prevent flickering if
 * the plugin is too small to show the overlay */
 .mainBox > .hoverBox,
 .mainBox > .closeIcon {
   visibility: hidden;