Bug 771273 - Part 4: Enable BackForward test for in-process <iframe mozbrowser>, now that it works. r=bz

This commit is contained in:
Justin Lebar 2012-07-23 13:47:34 -04:00
parent 74203655fb
commit c5d51c56b6
3 changed files with 14 additions and 14 deletions

View File

@ -85,6 +85,7 @@ MOCHITEST_FILES = \
test_browserElement_inproc_SecurityChange.html \
file_browserElement_SecurityChange.html \
browserElement_BackForward.js \
test_browserElement_inproc_BackForward.html \
file_bug741717.sjs \
browserElement_Reload.js \
file_bug709759.sjs \
@ -103,8 +104,6 @@ MOCHITEST_FILES = \
# OOP tests don't work on Windows (bug 763081) or native-fennec (bug
# 774939).
#
# Note that there's no inproc equivalent of BackForward; that's intentional.
ifneq ($(OS_ARCH),WINNT) #{
ifndef MOZ_JAVA_COMPOSITOR #{
MOCHITEST_FILES += \

View File

@ -18,18 +18,6 @@ function addOneShotIframeEventListener(event, fn) {
}
function runTest() {
// At the moment, this isn't going to work unless we're actually out of
// process.
//
// With in-process mozbrowser, the root SHistory for an <iframe mozbrowser>
// crosses the mozbrowser boundary. It's like the mozbrowser wasn't there;
// canGoBack reflects whether the top-level frame can go back, not whether the
// iframe itself can go back.
if (!browserElementTestHelpers.getOOPByDefaultPref()) {
ok(false, "This test only works OOP.");
return;
}
browserElementTestHelpers.setEnabledPref(true);
browserElementTestHelpers.addToWhitelist();

View File

@ -0,0 +1,13 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test of browser element.</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="browserElementTestHelpers.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="application/javascript;version=1.7" src="browserElement_BackForward.js">
</script>
</body>
</html>