Bug 968762 - Plugin overlays are not displayed if plugin element is not fully in scroll view. r=jaws

This commit is contained in:
Georg Fritzsche 2014-02-24 17:45:48 +01:00
parent 6b1059d859
commit 0f93103c15
4 changed files with 157 additions and 1 deletions

View File

@ -134,8 +134,12 @@ var gPluginHandler = {
return false;
}
let contentWindow = plugin.ownerDocument.defaultView.top;
let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
for (let [x, y] of points) {
let el = plugin.ownerDocument.elementFromPoint(x, y);
let el = cwu.elementFromPoint(x, y, true, true);
if (el !== plugin) {
return false;
}

View File

@ -78,6 +78,7 @@ support-files =
plugin_clickToPlayDeny.html
plugin_data_url.html
plugin_hidden_to_visible.html
plugin_outsideScrollArea.html
plugin_overlayed.html
plugin_positioned.html
plugin_small.html
@ -117,6 +118,7 @@ run-if = crashreporter
[browser_CTP_multi_allow.js]
[browser_CTP_nonplugins.js]
[browser_CTP_notificationBar.js]
[browser_CTP_outsideScrollArea.js]
[browser_CTP_resize.js]
[browser_URLBarSetURI.js]
[browser_aboutAccounts.js]

View File

@ -0,0 +1,125 @@
var rootDir = getRootDirectory(gTestPath);
const gTestRoot = rootDir;
const gHttpTestRoot = rootDir.replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
var gTestBrowser = null;
var gNextTest = null;
var gPluginHost = Components.classes["@mozilla.org/plugin/host;1"].getService(Components.interfaces.nsIPluginHost);
var gRunNextTestAfterPluginRemoved = false;
Components.utils.import("resource://gre/modules/Services.jsm");
function test() {
waitForExplicitFinish();
registerCleanupFunction(function() {
clearAllPluginPermissions();
Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
});
Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
var newTab = gBrowser.addTab();
gBrowser.selectedTab = newTab;
gTestBrowser = gBrowser.selectedBrowser;
gTestBrowser.addEventListener("load", pageLoad, true);
Services.prefs.setBoolPref("plugins.click_to_play", true);
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
prepareTest(test1, gHttpTestRoot + "plugin_outsideScrollArea.html");
}
function finishTest() {
clearAllPluginPermissions();
gTestBrowser.removeEventListener("load", pageLoad, true);
gBrowser.removeCurrentTab();
window.focus();
finish();
}
function pageLoad() {
// The plugin events are async dispatched and can come after the load event
// This just allows the events to fire before we then go on to test the states
executeSoon(gNextTest);
}
function prepareTest(nextTest, url) {
gNextTest = nextTest;
gTestBrowser.contentWindow.location = url;
}
// Due to layout being async, "PluginBindAttached" may trigger later.
// This wraps a function to force a layout flush, thus triggering it,
// and schedules the function execution so they're definitely executed
// afterwards.
function runAfterPluginBindingAttached(func) {
return function() {
let doc = gTestBrowser.contentDocument;
let elems = doc.getElementsByTagName('embed');
if (elems.length < 1) {
elems = doc.getElementsByTagName('object');
}
elems[0].clientTop;
executeSoon(func);
};
}
// Add plugin relative to bottom-left corner of #container.
function addPlugin(x, y) {
let doc = gTestBrowser.contentDocument;
let p = doc.createElement('embed');
p.setAttribute('id', 'test');
p.setAttribute('type', 'application/x-test');
p.style.left = x.toString() + 'px';
p.style.bottom = y.toString() + 'px';
doc.getElementById('container').appendChild(p);
}
// Test that the click-to-play overlay is not hidden for elements
// partially or fully outside the viewport.
function test1() {
addPlugin(0, -200);
executeSoon(runAfterPluginBindingAttached(test2));
}
function test2() {
let doc = gTestBrowser.contentDocument;
let plugin = doc.getElementById("test");
let overlay = doc.getAnonymousElementByAttribute(plugin, "anonid", "main");
ok(overlay, "Test 2, Should have an overlay.");
ok(overlay.classList.contains("visible"), "Test 2, Overlay should be visible");
prepareTest(test3, gHttpTestRoot + "plugin_outsideScrollArea.html");
}
function test3() {
addPlugin(0, -410);
executeSoon(runAfterPluginBindingAttached(test4));
}
function test4() {
let doc = gTestBrowser.contentDocument;
let plugin = doc.getElementById("test");
let overlay = doc.getAnonymousElementByAttribute(plugin, "anonid", "main");
ok(overlay, "Test 4, Should have an overlay.");
ok(overlay.classList.contains("visible"), "Test 4, Overlay should be visible");
prepareTest(test5, gHttpTestRoot + "plugin_outsideScrollArea.html");
}
function test5() {
addPlugin(-600, 0);
executeSoon(runAfterPluginBindingAttached(test6));
}
function test6() {
let doc = gTestBrowser.contentDocument;
let plugin = doc.getElementById("test");
let overlay = doc.getAnonymousElementByAttribute(plugin, "anonid", "main");
ok(overlay, "Test 6, Should have an overlay.");
ok(!overlay.classList.contains("visible"), "Test 6, Overlay should be hidden");
finishTest();
}

View File

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style type="text/css">
#container {
position: fixed;
top: 0;
bottom: 0;
width: 100%;
height: 100%;
background: blue;
}
#test {
width: 400px;
height: 400px;
position: absolute;
}
</style>
</head>
<body>
<div id="container"></div>
</body>
</html>