bug 1254091 convert test_mousecapture.xul to mochitest-plain so we can run it in e10s, r=enndeakin

MozReview-Commit-ID: 8xqtaIjafSw

--HG--
rename : toolkit/content/tests/chrome/test_mousecapture.xul => toolkit/content/tests/mochitest/test_mousecapture.xhtml
extra : rebase_source : 9d5476c965b2a67757e372a7ec1ee2db980acc4f
This commit is contained in:
Gijs Kruitbosch 2016-03-18 12:48:22 +00:00
Родитель 001bdcabde
Коммит e6fd6099aa
4 изменённых файлов: 44 добавлений и 40 удалений

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

@ -118,8 +118,6 @@ skip-if = buildapp == 'mulet'
[test_menulist_keynav.xul] [test_menulist_keynav.xul]
[test_menulist_null_value.xul] [test_menulist_null_value.xul]
[test_menulist_paging.xul] [test_menulist_paging.xul]
[test_mousecapture.xul]
skip-if = buildapp == 'mulet'
[test_mousescroll.xul] [test_mousescroll.xul]
skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet'
[test_notificationbox.xul] [test_notificationbox.xul]

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

@ -0,0 +1,3 @@
[test_mousecapture.xhtml]
skip-if = toolkit == "android"

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

@ -1,15 +1,18 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?> <!DOCTYPE HTML>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> <html xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Mouse Capture Tests</title>
<link rel="stylesheet" href="chrome://global/skin/" type="text/css"/>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
</head>
<body id="body" xmlns="http://www.w3.org/1999/xhtml">
<p id="display"/><div id="content" style="display: none"/><pre id="test"/>
<window title="Mouse Capture Tests" align="start" <script><![CDATA[
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<script>
<![CDATA[
SimpleTest.expectAssertions(6, 12); SimpleTest.expectAssertions(6, 12);
@ -266,30 +269,31 @@ SimpleTest.waitForFocus(runTests);
]]> ]]>
</script> </script>
<tooltip id="tooltip"> <xul:vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="start">
<label value="Test"/> <tooltip id="tooltip">
</tooltip> <label value="Test"/>
</tooltip>
<hbox id="splitterbox" style="margin-top: 5px;" onmousedown="this.setCapture()"> <hbox id="splitterbox" style="margin-top: 5px;" onmousedown="this.setCapture()">
<hbox id="leftbox" width="100" flex="1"/> <hbox id="leftbox" width="100" flex="1"/>
<splitter id="splitter" height="5"/> <splitter id="splitter" height="5"/>
<hbox id="rightbox" width="100" flex="1"/> <hbox id="rightbox" width="100" flex="1"/>
</hbox> </hbox>
<vbox id="custom" width="10" height="10" onmousedown="this.setCapture(); cachedMouseDown = event;"/> <vbox id="custom" width="10" height="10" onmousedown="this.setCapture(); cachedMouseDown = event;"/>
<vbox id="custom2" width="10" height="10" onmousedown="this.setCapture(); document.releaseCapture();"/> <vbox id="custom2" width="10" height="10" onmousedown="this.setCapture(); document.releaseCapture();"/>
<vbox id="custom3" width="10" height="10" onmousedown="this.setCapture(); this.releaseCapture();"/> <vbox id="custom3" width="10" height="10" onmousedown="this.setCapture(); this.releaseCapture();"/>
<vbox id="custom4" width="10" height="10" onmousedown="this.setCapture();" <vbox id="custom4" width="10" height="10" onmousedown="this.setCapture();"
onmousemove="this.releaseCapture();"/> onmousemove="this.releaseCapture();"/>
<hbox id="custom5" width="40" height="40" <hbox id="custom5" width="40" height="40"
onmousedown="this.setCapture(captureRetargetMode);"> onmousedown="this.setCapture(captureRetargetMode);">
<spacer id="custom5spacer" width="5"/> <spacer id="custom5spacer" width="5"/>
<hbox id="custom5inner" width="35" height="35"/> <hbox id="custom5inner" width="35" height="35"/>
</hbox> </hbox>
<vbox id="custom6" width="10" height="10" <vbox id="custom6" width="10" height="10"
onmousedown="document.createElement('hbox').setCapture();"/> onmousedown="document.createElement('hbox').setCapture();"/>
</xul:vbox>
<hbox>
<iframe width="100" height="100" <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"/> 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"/>
@ -311,17 +315,13 @@ SimpleTest.waitForFocus(runTests);
<option id="option9">Nine</option> <option id="option9">Nine</option>
<option id="option10">Ten</option> <option id="option10">Ten</option>
</select> </select>
</hbox>
<hbox>
<img id="image" xmlns="http://www.w3.org/1999/xhtml" <img id="image" xmlns="http://www.w3.org/1999/xhtml"
onmousedown="this.setCapture();" onmouseup="this.releaseCapture();" onmousedown="this.setCapture();" onmouseup="this.releaseCapture();"
ondragstart="ok(false, 'should not get a drag when a setCapture is active');" ondragstart="ok(false, 'should not get a drag when a setCapture is active');"
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAG0lEQVR42mP8z0A%2BYKJA76jmUc2jmkc1U0EzACKcASfOgGoMAAAAAElFTkSuQmCC"/> src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAG0lEQVR42mP8z0A%2BYKJA76jmUc2jmkc1U0EzACKcASfOgGoMAAAAAElFTkSuQmCC"/>
</hbox>
<body id="body" xmlns="http://www.w3.org/1999/xhtml">
<p id="display"/><div id="content" style="display: none"/><pre id="test"/>
</body> </body>
</window> </html>

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

@ -13,4 +13,7 @@ MOCHITEST_CHROME_MANIFESTS += [
'widgets/chrome.ini', 'widgets/chrome.ini',
] ]
MOCHITEST_MANIFESTS += ['widgets/mochitest.ini'] MOCHITEST_MANIFESTS += [
'mochitest/mochitest.ini',
'widgets/mochitest.ini',
]