Bug 1001039 - Disable APZ tests in desktop e10s (r=roc)

This commit is contained in:
Bill McCloskey 2014-07-26 12:21:57 -07:00
parent 21dba40d04
commit 6f37484071
3 changed files with 18 additions and 12 deletions

View File

@ -1,10 +1,10 @@
skip-if(!browserIsRemote) == bg-fixed-1.html bg-fixed-1-ref.html
skip-if(!browserIsRemote) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
skip-if(!browserIsRemote) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
skip-if(!browserIsRemote) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
skip-if(!browserIsRemote) == element-1.html element-1-ref.html
skip-if(!browserIsRemote) == position-fixed-1.html position-fixed-1-ref.html
skip-if(!browserIsRemote) == position-fixed-2.html position-fixed-2-ref.html
skip-if(!browserIsRemote) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
skip-if(!browserIsRemote) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
skip-if(!browserIsRemote) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
skip-if(!asyncPanZoom) == bg-fixed-1.html bg-fixed-1-ref.html
skip-if(!asyncPanZoom) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
skip-if(!asyncPanZoom) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
skip-if(!asyncPanZoom) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
skip-if(!asyncPanZoom) == element-1.html element-1-ref.html
skip-if(!asyncPanZoom) == position-fixed-1.html position-fixed-1-ref.html
skip-if(!asyncPanZoom) == position-fixed-2.html position-fixed-2-ref.html
skip-if(!asyncPanZoom) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
skip-if(!asyncPanZoom) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
skip-if(!asyncPanZoom) == position-fixed-cover-3.html position-fixed-cover-3-ref.html

View File

@ -159,10 +159,10 @@ fails fuzzy-if(false,2,1) random-if(Android) == fuzzy.html fuzzy-ref.html
# Test that reftest-no-paint fails correctly
fails == reftest-no-paint.html reftest-no-paint-ref.html
skip-if(!browserIsRemote) == async-scroll-1a.html async-scroll-1-ref.html
skip-if(!asyncPanZoom) == async-scroll-1a.html async-scroll-1-ref.html
# Disable low-res painting for this test as it will cause more to
# be drawn than we want.
default-preferences pref(layers.low-precision-buffer,false)
skip-if(!browserIsRemote) != async-scroll-1b.html async-scroll-1-ref.html
skip-if(!asyncPanZoom) != async-scroll-1b.html async-scroll-1-ref.html
default-preferences

View File

@ -752,6 +752,12 @@ function BuildConditionSandbox(aURL) {
// crash the content process
sandbox.browserIsRemote = gBrowserIsRemote;
try {
sandbox.asyncPanZoom = prefs.getBoolPref("layers.async-pan-zoom.enabled");
} catch (e) {
sandbox.asyncPanZoom = false;
}
// Distinguish the Fennecs:
sandbox.xulFennec = sandbox.Android && sandbox.browserIsRemote;
sandbox.nativeFennec = sandbox.Android && !sandbox.browserIsRemote;