Bug 1072498 - Collapse the dom.browser_frames.useAsyncPanZoom pref into layers.async-pan-zoom.enabled. r=fabrice
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 14 Nov 2014 07:42:24 -0500
changeset 215823 80caf94c011d00b3991364ab2938c6cf41895f2f
parent 215822 a9c8df3f4ebda7d06f58647d650ea7f8a311b723
child 215824 d3dcc73710baf0354a29a6a0c828d7efd7bdcf49
push id27827
push userryanvm@gmail.com
push dateFri, 14 Nov 2014 22:48:07 +0000
treeherdermozilla-central@acbd7b68fa8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs1072498
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1072498 - Collapse the dom.browser_frames.useAsyncPanZoom pref into layers.async-pan-zoom.enabled. r=fabrice
b2g/app/b2g.js
b2g/chrome/content/settings.js
dom/base/nsFrameLoader.cpp
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -428,17 +428,16 @@ pref("browser.link.open_newwindow.restri
 // work), but make in-process browser frames the default.
 pref("dom.mozBrowserFramesEnabled", true);
 
 // Enable a (virtually) unlimited number of mozbrowser processes.
 // We'll run out of PIDs on UNIX-y systems before we hit this limit.
 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);
 
 //The waiting time in network manager.
 pref("network.gonk.ms-release-mms-connection", 30000);
 
 // WebContacts
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -505,20 +505,16 @@ let settingsToObserve = {
     defaultValue: ''
   },
   'accessibility.screenreader_quicknav_index': {
     prefName: 'accessibility.accessfu.quicknav_index',
     resetToPref: true,
     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',
     defaultValue: false
   },
   'debug.log-animations.enabled': {
     prefName: 'layers.offmainthreadcomposition.log-animations',
     defaultValue: false
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -2098,17 +2098,17 @@ nsFrameLoader::TryRemoteBrowser()
   PROFILER_LABEL("nsFrameLoader", "CreateRemoteBrowser",
     js::ProfileEntry::Category::OTHER);
 
   MutableTabContext context;
   nsCOMPtr<mozIApplication> ownApp = GetOwnApp();
   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,
                                  eCaseMatters)) {
     scrollingBehavior = ASYNC_PAN_ZOOM;
   }
 
   bool rv = true;