From 8ac2ff1bb6ffef0143576e4cc9245829c1835ac3 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Fri, 14 Nov 2014 07:42:24 -0500
Subject: [PATCH] Bug 1072498 - Collapse the dom.browser_frames.useAsyncPanZoom
 pref into layers.async-pan-zoom.enabled. r=fabrice

---
 b2g/app/b2g.js                 | 1 -
 b2g/chrome/content/settings.js | 4 ----
 dom/base/nsFrameLoader.cpp     | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index a2df9de25b0e..707a262cd808 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -433,7 +433,6 @@ pref("dom.mozBrowserFramesEnabled", true);
 pref("dom.ipc.processCount", 100000);
 
 pref("dom.ipc.browser_frames.oop_by_default", false);
-pref("dom.browser_frames.useAsyncPanZoom", true);
 
 // SMS/MMS
 pref("dom.sms.enabled", true);
diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index 3b90ea5f84e3..0bba83724781 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -510,10 +510,6 @@ let settingsToObserve = {
     defaultValue: 0
   },
   'app.update.interval': 86400,
-  'apz.force-enable': {
-    prefName: 'dom.browser_frames.useAsyncPanZoom',
-    defaultValue: false
-  },
   'apz.overscroll.enabled': true,
   'debug.fps.enabled': {
     prefName: 'layers.acceleration.draw-fps',
diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
index b9ddc16d527b..0e195b12c6c0 100644
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -2103,7 +2103,7 @@ nsFrameLoader::TryRemoteBrowser()
   nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
   ScrollingBehavior scrollingBehavior = DEFAULT_SCROLLING;
 
-  if (Preferences::GetBool("dom.browser_frames.useAsyncPanZoom", false) ||
+  if (Preferences::GetBool("layers.async-pan-zoom.enabled", false) ||
       mOwnerContent->AttrValueIs(kNameSpaceID_None,
                                  nsGkAtoms::mozasyncpanzoom,
                                  nsGkAtoms::_true,