Bug 777194. Part 10: Reenable test_transformed_scrolling_repaints_2 on all platforms, and test_transformed_scrolling_repaints on 64-bit Linux.

This commit is contained in:
Robert O'Callahan 2012-09-14 15:49:24 +12:00
parent 8ee9ed5cfe
commit 83a9f571e2
2 changed files with 6 additions and 8 deletions

View File

@ -21,6 +21,8 @@ var t = document.getElementById("t");
var e = document.getElementById("e"); var e = document.getElementById("e");
var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor). var utils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
getInterface(Components.interfaces.nsIDOMWindowUtils); getInterface(Components.interfaces.nsIDOMWindowUtils);
const isLinux = navigator.platform.indexOf("Linux") >= 0;
const is64 = navigator.platform.indexOf("x86_64") >= 0;
function startTest() { function startTest() {
// Do a couple of scrolls to ensure we've triggered activity heuristics. // Do a couple of scrolls to ensure we've triggered activity heuristics.
@ -34,10 +36,10 @@ function startTest() {
t.scrollTop = 33; t.scrollTop = 33;
waitForAllPaintsFlushed(function () { waitForAllPaintsFlushed(function () {
var painted = utils.checkAndClearPaintedState(e); var painted = utils.checkAndClearPaintedState(e);
if (navigator.platform.indexOf("Linux") == -1) { if (isLinux && !is64) {
is(painted, false, "Fully-visible scrolled element should not have been painted"); todo_is(painted, false, "Fully-visible scrolled element should not have been painted (disabled on Linux-32)");
} else { } else {
ok(true, "Fully-visible scrolled element should not have been painted"); is(painted, false, "Fully-visible scrolled element should not have been painted");
} }
SimpleTest.finish(); SimpleTest.finish();
}); });

View File

@ -34,11 +34,7 @@ function startTest() {
t.scrollTop = 33; t.scrollTop = 33;
waitForAllPaintsFlushed(function () { waitForAllPaintsFlushed(function () {
var painted = utils.checkAndClearPaintedState(e); var painted = utils.checkAndClearPaintedState(e);
if (navigator.platform.indexOf("Mac") >= 0) { is(painted, false, "Fully-visible scrolled element should not have been painted");
is(painted, false, "Fully-visible scrolled element should not have been painted");
} else {
todo_is(painted, false, "Fully-visible scrolled element should not have been painted");
}
SimpleTest.finish(); SimpleTest.finish();
}); });
}); });