Bug 1161407 - Only check for IsMultiProcessWindow on non-B2G & non-Android platforms. r=kats
authorPaul Rouget <paul@mozilla.com>
Mon, 11 May 2015 14:59:07 -0400
changeset 243384 0a2cfe0345f0220c5b9102a7bfd7ffe186fab105
parent 243383 57def6a002eae635c378f58d65bb818ddf656e84
child 243385 944c1568d8d830a0584a5843dc10378ed41ba322
push id28738
push usercbook@mozilla.com
push dateTue, 12 May 2015 14:11:31 +0000
treeherdermozilla-central@bedce1b405a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1161407
milestone40.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 1161407 - Only check for IsMultiProcessWindow on non-B2G & non-Android platforms. r=kats
gfx/layers/ipc/CompositorParent.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -657,18 +657,19 @@ CompositorParent::CompositorParent(nsIWi
   mRootLayerTreeID = AllocateLayerTreeId();
 
   { // scope lock
     MonitorAutoLock lock(*sIndirectLayerTreesLock);
     sIndirectLayerTrees[mRootLayerTreeID].mParent = this;
   }
 
   if (gfxPrefs::AsyncPanZoomEnabled() &&
-#if defined(XP_WIN) || defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_GTK)
-      // For desktop platforms we only want to use APZ in e10s-enabled windows.
+#if !defined(MOZ_B2G) && !defined(MOZ_WIDGET_ANDROID)
+      // For XUL applications (everything but B2G on mobile and desktop, and
+      // Firefox on Android) we only want to use APZ in e10s-enabled windows.
       // If we ever get input events off the main thread we can consider
       // relaxing this requirement.
       aWidget->IsMultiProcessWindow() &&
 #endif
       (aWidget->WindowType() == eWindowType_toplevel || aWidget->WindowType() == eWindowType_child)) {
     mApzcTreeManager = new APZCTreeManager();
   }