Bug 1338172 part D - Fix tests that expect windowed mode on Linux, r?jimm
MozReview-Commit-ID: 8zAZ3K9LxlW
--- a/dom/html/test/file_fullscreen-plugins.html
+++ b/dom/html/test/file_fullscreen-plugins.html
@@ -1,20 +1,21 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=545812
Test plugins with DOM full-screen API:
-* Presence of plugins has no effect on request for full-screen on MacOS.
* Request for full-screen is denied when windowed plugin in current doc is present.
* Request for full-screen is denied when windowed plugin in subdocument is present.
* Request for full-screen is not denied when the only plugin present is windowless.
* Adding an existing (out-of-doc) windowed plugin to a full-screen document causes document to exit full-screen.
* Create windowed plugin and adding it to full-screen document caused exit from full-screen.
+* On non-Windows, plugins can only be windowless, so the presence of plugins
+ should have no effect on request for full-screen.
-->
<head>
<title>Test for Bug 545812</title>
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="plugin-utils.js"></script>
<script type="application/javascript">
@@ -60,17 +61,17 @@ function is(a, b, msg) {
function e(id) {
return document.getElementById(id);
}
function removeElement(e) {
e.remove();
}
-const isMacOs = navigator.appVersion.indexOf("Macintosh") != -1;
+const supportsWindowedMode = navigator.appVersion.indexOf("Windows") != -1;
var windowedPlugin = null;
function begin() {
// Delay test startup long enough for the windowed plugin in the subframe to
// start up and create its window.
opener.SimpleTest.executeSoon(function() {
opener.SimpleTest.executeSoon(function() {
@@ -78,47 +79,48 @@ function begin() {
})
});
}
function startTest() {
ok(!document.fullscreenElement, "Should not be in full-screen mode initially");
document.body.requestFullscreen();
- // Focus the windowed plugin. On MacOS we should still enter full-screen mode,
- // on windows the pending request for full-screen should be denied.
+ // Focus the windowed plugin. On non-Windows we should still enter
+ // full-screen mode, on Windows the pending request for full-screen should
+ // be denied.
e("windowed-plugin").focus();
-
- if (isMacOs) {
- // Running on MacOS, all plugins are effectively windowless, request for full-screen should be granted.
- // Continue test in the (mac-specific) "fullscreenchange" handler.
- addFullscreenChangeContinuation("enter", macFullScreenChange1);
+
+ if (!supportsWindowedMode) {
+ // If all plugins are effectively windowless, request for full-screen should be granted.
+ // Continue test in the "fullscreenchange" handler.
+ addFullscreenChangeContinuation("enter", windowlessFullScreenChange1);
} else {
- // Non-MacOS, request should be denied, carry on the test after receiving error event.
- addFullscreenErrorContinuation(nonMacTest);
+ // On Windows, request should be denied, carry on the test after receiving error event.
+ addFullscreenErrorContinuation(windowsTest);
}
}
-function nonMacTest() {
+function windowsTest() {
ok(!document.fullscreenElement, "Request for full-screen with focused windowed plugin should be denied.");
// Focus a regular html element, and re-request full-screen, request should be granted.
e("windowless-plugin").focus();
- addFullscreenChangeContinuation("enter", nonMacTest2);
+ addFullscreenChangeContinuation("enter", windowsTest2);
document.body.requestFullscreen();
}
-function nonMacTest2() {
+function windowsTest2() {
ok(document.fullscreenElement, "Request for full-screen with non-plugin focused should be granted.");
// Focus a windowed plugin, full-screen should be revoked.
- addFullscreenChangeContinuation("exit", nonMacTest3);
+ addFullscreenChangeContinuation("exit", windowsTest3);
e("windowed-plugin").focus();
}
-function nonMacTest3() {
+function windowsTest3() {
ok(!document.fullscreenElement, "Full-screen should have been revoked when windowed-plugin was focused.");
// Remove windowed plugins before closing the window
// to work around bug 1237853.
removeElement(e("windowed-plugin"));
removeElement(e("subdoc-plugin").contentDocument.getElementById("windowed-plugin"));
opener.nextTest();
}
@@ -126,35 +128,35 @@ var fullScreenChangeCount = 0;
function createWindowedPlugin() {
var p = document.createElement("embed");
p.setAttribute("type", "application/x-test");
p.setAttribute("wmode", "window");
return p;
}
-function macFullScreenChange1(event) {
- ok(document.fullscreenElement, "Requests for full-screen with focused windowed plugins should be granted on MacOS");
+function windowlessFullScreenChange1(event) {
+ ok(document.fullscreenElement, "Requests for full-screen with focused windowed plugins should be granted on non-Windows");
- // Create a new windowed plugin, and add that to the document. Should *not* exit full-screen mode on MacOS.
+ // Create a new windowed plugin, and add that to the document. Should *not* exit full-screen mode on MacOS/Linux.
windowedPlugin = createWindowedPlugin();
document.body.appendChild(windowedPlugin);
- // Focus windowed plugin. Should not exit full-screen mode on MacOS.
+ // Focus windowed plugin. Should not exit full-screen mode on MacOS/Linux.
windowedPlugin.focus();
setTimeout(
function() {
- ok(document.fullscreenElement, "Adding & focusing a windowed plugin to document should not cause full-screen to exit on MacOS.");
- addFullscreenChangeContinuation("exit", macFullScreenChange2);
+ ok(document.fullscreenElement, "Adding & focusing a windowed plugin to document should not cause full-screen to exit on MacOS/Linux.");
+ addFullscreenChangeContinuation("exit", windowlessFullScreenChange2);
document.exitFullscreen();
}, 0);
}
-function macFullScreenChange2(event) {
+function windowlessFullScreenChange2(event) {
ok(!document.fullscreenElement, "Should have left full-screen mode after calling document.exitFullscreen().");
opener.nextTest();
}
</script>
</pre>
</body>
</html>
--- a/dom/plugins/test/mochitest/test_wmode.xul
+++ b/dom/plugins/test/mochitest/test_wmode.xul
@@ -16,23 +16,23 @@
</body>
<script class="testbody" type="application/javascript">
<![CDATA[
SimpleTest.waitForExplicitFinish();
function runTests() {
var p1 = document.getElementById("plugin1");
is(p1.hasWidget(), false, "Plugin should be windowless by default");
-
+
var p2 = document.getElementById("plugin2");
if (navigator.platform.indexOf("Mac") >= 0) {
is(p2.hasWidget(), false, "Mac does not support windowed plugins");
} else if (navigator.platform.indexOf("Win") >= 0) {
is(p2.hasWidget(), true, "Windows supports windowed plugins");
} else if (navigator.platform.indexOf("Linux") >= 0) {
- is(p2.hasWidget(), true, "Linux supports windowed plugins");
+ is(p2.hasWidget(), false, "Linux does not support windowed plugins");
}
SimpleTest.finish();
}
]]>
</script>
</window>