Bug 1352572 - Refactor getEmbed() in pluginstream.js; r?bsmedberg
This method will be used in a future commit.
MozReview-Commit-ID: GNL4VBJO2nt
--- a/dom/plugins/test/mochitest/pluginstream.js
+++ b/dom/plugins/test/mochitest/pluginstream.js
@@ -1,20 +1,13 @@
SimpleTest.waitForExplicitFinish();
function frameLoaded(finishWhenCalled = true, lastObject = false) {
var testframe = document.getElementById('testframe');
- function getNode(list) {
- if (list.length === 0)
- return undefined;
- return lastObject ? list[list.length - 1] : list[0];
- }
- var embed = getNode(document.getElementsByTagName('embed'));
- if (undefined === embed)
- embed = getNode(document.getElementsByTagName('object'));
+ var embed = getEmbed(lastObject);
// In the file:// URI case, this ends up being cross-origin.
// Skip these checks in that case.
if (testframe.contentDocument) {
var content = testframe.contentDocument.body.innerHTML;
if (!content.length)
return;
@@ -32,8 +25,20 @@
"content doesn't match");
}
is(embed.getError(), "pass", "plugin reported error");
if (finishWhenCalled) {
SimpleTest.finish();
}
}
+
+ function getEmbed(lastObject = false) {
+ function getNode(list) {
+ if (list.length === 0)
+ return undefined;
+ return lastObject ? list[list.length - 1] : list[0];
+ }
+ var embed = getNode(document.getElementsByTagName('embed'));
+ if (undefined === embed)
+ embed = getNode(document.getElementsByTagName('object'));
+ return embed;
+ }