mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1335475 - Switch browser_tab_dragdrop.js to load a plugin from HTTP instead of a no-privilege data: URI which doesn't work any more. Also re-enable this test on Linux now that we don't have windowed-mode plugins any more, so this won't assert (undo bug 1331320). r=jaws 

MozReview-Commit-ID: D6JzYliULPG
This commit is contained in:
Benjamin Smedberg 2017-03-07 11:11:54 -05:00
Родитель 17f4d62f9b
Коммит eb61894ba9
3 изменённых файлов: 6 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/base/content/test/general/browser.ini
Просмотреть файл

@ -22,6 +22,7 @@ support-files =
browser_registerProtocolHandler_notification.html
browser_star_hsts.sjs
browser_tab_dragdrop2_frame1.xul
browser_tab_dragdrop_embed.html
browser_web_channel.html
browser_web_channel_iframe.html
bug592338.html
@ -510,7 +511,7 @@ skip-if = os == 'linux' # Bug 1304272
[browser_tab_drag_drop_perwindow.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_tab_dragdrop.js]
skip-if = buildapp == 'mulet' || (e10s && (debug || os == 'linux')) # Bug 1312436
skip-if = buildapp == 'mulet' || (e10s && debug) # Bug 1312436
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_tab_dragdrop2.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

5
browser/base/content/test/general/browser_tab_dragdrop.js
Просмотреть файл

@ -38,7 +38,7 @@ function loadURI(tab, url) {
// in the page which tells us the plugin hasn't been reinitialized.
function* cacheObjectValue(browser) {
yield ContentTask.spawn(browser, null, function*() {
let plugin = content.document.wrappedJSObject.body.firstChild;
let plugin = content.document.getElementById("p").wrappedJSObject;
info(`plugin is ${plugin}`);
let win = content.document.defaultView;
info(`win is ${win}`);
@ -101,7 +101,6 @@ function checkObjectValue(browser) {
}
add_task(function*() {
let embed = '<embed type="application/x-test" allowscriptaccess="always" allowfullscreen="true" wmode="window" width="640" height="480"></embed>'
setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED);
// create a few tabs
@ -117,7 +116,7 @@ add_task(function*() {
yield loadURI(tabs[1], "data:text/html;charset=utf-8,<title>tab1</title><body>tab1<iframe>");
yield loadURI(tabs[2], "data:text/plain;charset=utf-8,tab2");
yield loadURI(tabs[3], "data:text/html;charset=utf-8,<title>tab3</title><body>tab3<iframe>");
yield loadURI(tabs[4], "data:text/html;charset=utf-8,<body onload='clicks=0' onclick='++clicks'>" + embed);
yield loadURI(tabs[4], "http://example.com/browser/browser/base/content/test/general/browser_tab_dragdrop_embed.html");
yield BrowserTestUtils.switchTab(gBrowser, tabs[3]);
swapTabsAndCloseOther(2, 3); // now: 0 1 2 4

2
browser/base/content/test/general/browser_tab_dragdrop_embed.html Normal file
Просмотреть файл

@ -0,0 +1,2 @@
<body onload="clicks=0" onclick="++clicks">
<embed type="application/x-test" allowscriptaccess="always" allowfullscreen="true" wmode="window" width="640" height="480" id="p"></embed>