Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 778072 - Add pref for reftests to use iframe mozbrowser. r=cjones

Browse Source
This commit is contained in:
Andrew Halberstadt 2012-08-17 11:45:39 -04:00
parent 666f75f381
commit 83ccf6c3d4
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/tools/reftest/reftest.js
View File

@ -51,6 +51,8 @@ const BLANK_URL_FOR_CLEARING = "data:text/html,%3C%21%2D%2DCLEAR%2D%2D%3E";
var gBrowser;
// Are we testing web content loaded in a separate process?
var gBrowserIsRemote; // bool
// Are we using <iframe mozbrowser>?
var gBrowserIsIframe; // bool
var gBrowserMessageManager;
var gCanvas1, gCanvas2;
// gCurrentCanvas is non-null between InitCurrentCanvasWithSnapshot and the next
@ -219,6 +221,12 @@ function OnRefTestLoad(win)
gBrowserIsRemote = false;
}
try {
gBrowserIsIframe = prefs.getBoolPref("reftest.browser.iframe.enabled");
} catch (e) {
gBrowserIsIframe = false;
}
if (win === undefined || win == null) {
win = window;
}
@ -226,7 +234,12 @@ function OnRefTestLoad(win)
gContainingWindow = win;
}
gBrowser = gContainingWindow.document.createElementNS(XUL_NS, "xul:browser");
if (gBrowserIsIframe) {
gBrowser = gContainingWindow.document.createElementNS(XHTML_NS, "iframe");
gBrowser.setAttribute("mozbrowser", "");
} else {
gBrowser = gContainingWindow.document.createElementNS(XUL_NS, "xul:browser");
}
gBrowser.setAttribute("id", "browser");
gBrowser.setAttribute("type", "content-primary");
gBrowser.setAttribute("remote", gBrowserIsRemote ? "true" : "false");

14
layout/tools/reftest/runreftestb2g.py
View File

@ -365,15 +365,21 @@ class B2GReftest(RefTest):
# Turn off the locale picker screen
fhandle = open(os.path.join(profileDir, "user.js"), 'a')
fhandle.write("""
user_pref("browser.homescreenURL", "data:text/html,<h1>reftests should start soon</h1>");
user_pref("browser.manifestURL", "dummy (bug 772307)");
user_pref("browser.firstrun.show.localepicker", false);
user_pref("browser.dom.window.dump.enabled", true);
user_pref("browser.homescreenURL","app://system.gaiamobile.org");\n
user_pref("browser.manifestURL","app://system.gaiamobile.org/manifest.webapp");\n
user_pref("browser.tabs.remote", true);\n
user_pref("dom.ipc.browser_frames.oop_by_default", true);\n
user_pref("dom.ipc.tabs.disabled", false);\n
user_pref("dom.mozBrowserFramesEnabled", true);\n
user_pref("dom.mozBrowserFramesWhitelist","app://system.gaiamobile.org");\n
user_pref("network.dns.localDomains","app://system.gaiamobile.org");\n
user_pref("font.size.inflation.emPerLine", 0);
user_pref("font.size.inflation.minTwips", 0);
user_pref("reftest.browser.iframe.enabled", true);
user_pref("reftest.remote", true);
user_pref("toolkit.telemetry.prompted", true);
user_pref("reftest.uri", "%s");
user_pref("toolkit.telemetry.prompted", true);
""" % reftestlist)
#workaround for jsreftests.