Backed out changeset b669da0374a2 (bug 1337272) for linting failure at test_mousecapture.xhtml:208: 'topPos' is assigned a value but never used. r=backout

This commit is contained in:
Sebastian Hengst 2017-07-18 14:16:54 +02:00
Родитель 07a6807814
Коммит c80daf709f
13 изменённых файлов: 18 добавлений и 34 удалений

Просмотреть файл

@ -1,5 +0,0 @@
<html>
<body>
test_named_window.html new window
</body>
</html>

Просмотреть файл

@ -4,8 +4,6 @@ tags = openwindow
[test_blank_named_window.html]
skip-if = (os == 'android') # Fennec doesn't support web content opening new windows (See bug 1277544 for details)
[test_named_window.html]
support-files =
file_named_window.html
skip-if = (os == 'android') # Fennec doesn't support web content opening new windows (See bug 1277544 for details)
[test_storage_copied.html]
support-files =

Просмотреть файл

@ -21,8 +21,7 @@ window.
"use strict";
const NAME = "my_window";
const TARGET_URL = location.href.replace("test_named_window.html",
"file_named_window.html");
const TARGET_URL = "data:text/html,<html><body>test_named_window.html new window</body></html>";
const TARGET_URL_2 = TARGET_URL + "#2";
const TARGET_URL_3 = TARGET_URL + "#3";

Просмотреть файл

@ -1 +0,0 @@
<html><p>One</p><p style='margin-top: 200px;'>Two</p><p style='margin-top: 4000px'>This is some text</p></html>

Просмотреть файл

@ -1 +0,0 @@
<html><p>One</p><p style='margin-top: " + topPos + "'>Two</p><p style='margin-top: 4000px'>This is some text</p></html>

Просмотреть файл

@ -1 +0,0 @@
<body style='font-size: 40pt;'>.<b id='b'>This</b> is some text<div id='fixed' style='position: fixed; left: 55px; top: 5px; width: 10px; height: 10px'>.</div></body>

Просмотреть файл

@ -1 +0,0 @@
<frameset cols='50%, 50%'><frame src='about:blank'><frame src='about:blank'></frameset>

Просмотреть файл

@ -1 +0,0 @@
<input id='input' onfocus='this.style.display = "none"' style='float: left;'>

Просмотреть файл

@ -1,11 +1,5 @@
[test_autocomplete_change_after_focus.html]
skip-if = toolkit == "android"
[test_mousecapture.xhtml]
support-files =
file_mousecapture.html
file_mousecapture2.html
file_mousecapture3.html
file_mousecapture4.html
file_mousecapture5.html
skip-if = toolkit == "android"

Просмотреть файл

@ -18,8 +18,6 @@ SimpleTest.expectAssertions(6, 12);
SimpleTest.waitForExplicitFinish();
const TEST_PATH = location.href.replace("test_mousecapture.xhtml", "");
var captureRetargetMode = false;
var cachedMouseDown = null;
var previousWidth = 0, originalWidth = 0;
@ -97,7 +95,7 @@ function selectionScrollCheck() {
synthesizeMouse(document.getElementById("custom"), 2, 2, { type: "mousedown" });
// check to ensure that selection dragging scrolls the right scrollable area
otherWindow = window.open(TEST_PATH + "file_mousecapture.html", "_blank", "width=200,height=200,scrollbars=yes");
otherWindow = window.open("data:text/html,<html><p>One</p><p style='margin-top: 200px;'>Two</p><p style='margin-top: 4000px'>This is some text</p></html>", "_blank", "width=200,height=200,scrollbars=yes");
SimpleTest.waitForFocus(selectionScrollCheck, otherWindow);
}
}
@ -185,7 +183,7 @@ function runTests() {
previousWidth = frames[1].frames[0].document.documentElement.clientWidth;
originalWidth = previousWidth;
runCaptureTest(frames[1].document.documentElement.lastElementChild, framesetCallback);
runCaptureTest(frames[1].document.documentElement.lastChild, framesetCallback);
// ensure that clicking on an element where the frame disappears doesn't crash
synthesizeMouse(frames[2].document.getElementById("input"), 8, 8, { type: "mousedown" }, frames[2]);
@ -206,7 +204,7 @@ function runTests() {
// This should open the page in a new tab.
var topPos = window.innerHeight;
otherWindow = window.open(TEST_PATH + "file_mousecapture2.html", "_blank");
otherWindow = window.open("data:text/html,<html><p>One</p><p style='margin-top: " + topPos + "'>Two</p><p style='margin-top: 4000px'>This is some text</p></html>", "_blank");
SimpleTest.waitForFocus(selectionScrollCheck, otherWindow);
}
@ -300,9 +298,14 @@ SimpleTest.waitForFocus(runTests);
onmousedown="document.createElement('hbox').setCapture();"/>
</xul:vbox>
<iframe width="100" height="100" src="file_mousecapture3.html"/>
<iframe width="100" height="100" src="file_mousecapture4.html"/>
<iframe width="100" height="100" src="file_mousecapture5.html"/>
<iframe width="100" height="100"
src="data:text/html,%3Cbody style%3D'font-size%3A 40pt%3B'%3E.%3Cb id%3D'b'%3EThis%3C/b%3E is some text%3Cdiv id='fixed' style='position: fixed; left: 55px; top: 5px; width: 10px; height: 10px'%3E.%3C/div%3E%3C/body%3E"/>
<iframe width="100" height="100"
src="data:text/html,%3Cframeset cols='50%, 50%'%3E%3Cframe src='about:blank'%3E%3Cframe src='about:blank'%3E%3C/frameset%3E"/>
<iframe width="100" height="100"
src="data:text/html,%3Cinput id='input' onfocus='this.style.display = &quot;none&quot;' style='float: left;'>"/>
<select id="select" xmlns="http://www.w3.org/1999/xhtml" size="4">
<option id="option1">One</option>

Просмотреть файл

@ -1,2 +0,0 @@
<video src="seek_with_sound.ogg" controls autoplay=true></video>
<script>window.testExpando = true;</script>

Просмотреть файл

@ -2,7 +2,6 @@
support-files =
audio.wav
audio.ogg
file_videocontrols_jsdisabled.html
seek_with_sound.ogg
video.ogg
head.js

Просмотреть файл

@ -55,9 +55,12 @@ function loadevent(event) {
var win;
function startTest() {
const TEST_FILE = location.href.replace("test_videocontrols_jsdisabled.html",
"file_videocontrols_jsdisabled.html");
win = window.open(TEST_FILE);
var videoURL = new URL("seek_with_sound.ogg", document.documentURI).href;
// eslint-disable-next-line no-useless-concat
var url = "data:text/html,<video src=" + videoURL + " controls autoplay=true></video><script>window.testExpando = true;</scr" + "ipt>";
win = window.open(url);
win.addEventListener("load", loadevent);
}