Bug 596410: Use BasicShadowLayerManager when there might be content processes. r=vlad

widget/src/android/nsWindow.cpp

@@ -591,7 +591,7 @@ nsWindow::GetLayerManager()
 
     if (!topWindow) {
         printf_stderr(" -- no topwindow\n");
-        mLayerManager = new BasicLayerManager(this);
+        mLayerManager = CreateBasicLayerManager();
         return mLayerManager;
     }
 
@@ -601,7 +601,7 @@ nsWindow::GetLayerManager()
         sFailedToCreateGLContext)
     {
         printf_stderr(" -- creating basic, not accelerated\n");
-        mLayerManager = new BasicLayerManager(this);
+        mLayerManager = CreateBasicLayerManager();
         return mLayerManager;
     }
 
@@ -622,7 +622,7 @@ nsWindow::GetLayerManager()
         sGLContext = nsnull;
         sFailedToCreateGLContext = PR_TRUE;
 
-        mLayerManager = new BasicLayerManager(this);
+        mLayerManager = CreateBasicLayerManager();
     }
 
     return mLayerManager;

widget/src/windows/nsWindow.cpp

@@ -3244,7 +3244,7 @@ nsWindow::GetLayerManager()
 
     // Fall back to software if we couldn't use any hardware backends.
     if (!mLayerManager)
-      mLayerManager = new BasicLayerManager(this);
+      mLayerManager = CreateBasicLayerManager();
   }
 #endif
 

widget/src/xpwidgets/nsBaseWidget.cpp

@@ -816,16 +816,21 @@ LayerManager* nsBaseWidget::GetLayerManager()
       }
     }
     if (!mLayerManager) {
-#if !defined(MOZ_IPC)
-      mLayerManager = new BasicLayerManager(this);
-#else
-      mLayerManager = new BasicShadowLayerManager(this);
-#endif
+      mLayerManager = CreateBasicLayerManager();
     }
   }
   return mLayerManager;
 }
 
+BasicLayerManager* nsBaseWidget::CreateBasicLayerManager()
+{
+#if !defined(MOZ_IPC)
+      return new BasicLayerManager(this);
+#else
+      return new BasicShadowLayerManager(this);
+#endif
+}
+
 //-------------------------------------------------------------------------
 //
 // Return the toolkit this widget was created on

widget/src/xpwidgets/nsBaseWidget.h

@@ -243,6 +243,8 @@ protected:
     return widget.forget();
   }
 
+  BasicLayerManager* CreateBasicLayerManager();
+
 protected: 
   void*             mClientData;
   ViewWrapper*      mViewWrapperPtr;