From 73c49311cc65def8f8c439f154eacf758a432e6f Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 2 Sep 2015 16:31:06 -0400
Subject: [PATCH] Bug 1201217 - Don't fiddle with the resolution on tab switch
 when using APZ in fennec. r=rbarker

---
 mobile/android/chrome/content/browser.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 215432959fe..2c960ebd1e4 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1096,7 +1096,9 @@ var BrowserApp = {
       return;
 
     aTab.setActive(true);
-    aTab.setResolution(aTab._zoom, true);
+    if (!AppConstants.MOZ_ANDROID_APZ) {
+      aTab.setResolution(aTab._zoom, true);
+    }
     this.contentDocumentChanged();
     this.deck.selectedPanel = aTab.browser;
     // Focus the browser so that things like selection will be styled correctly.