From 6f374840710827a228a349b879b00093f07bdd18 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Sat, 26 Jul 2014 12:21:57 -0700
Subject: [PATCH] Bug 1001039 - Disable APZ tests in desktop e10s (r=roc)

---
 layout/reftests/async-scrolling/reftest.list | 20 ++++++++++----------
 layout/reftests/reftest-sanity/reftest.list  |  4 ++--
 layout/tools/reftest/reftest.js              |  6 ++++++
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/layout/reftests/async-scrolling/reftest.list b/layout/reftests/async-scrolling/reftest.list
index 48ee9cda712a..4ef8ab84b765 100644
--- a/layout/reftests/async-scrolling/reftest.list
+++ b/layout/reftests/async-scrolling/reftest.list
@@ -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
diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index 758a3d2dd4e4..b66f9f721b1f 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -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
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index e9ed64d9a64e..3bc44a3241c4 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -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;