Bug 1151644 - Don't disallow the basic compositor backend. r=jrmuizel
authorNicolas Silva <nsilva@mozilla.com>
Thu, 16 Apr 2015 07:57:00 +0200
changeset 239489 c20a7ab389ff55382ade892889f73e97ab53f175
parent 239488 c0c4d56594f92a8835866c0c1bd847fd4b9d3588
child 239490 40f06a0c961bc0896d82129ffe9c437163031ce3
push id28600
push userryanvm@gmail.com
push dateThu, 16 Apr 2015 20:25:17 +0000
treeherderautoland@51e3cb11a258 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1151644
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 1151644 - Don't disallow the basic compositor backend. r=jrmuizel
widget/nsBaseWidget.cpp
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -1132,27 +1132,16 @@ void nsBaseWidget::CreateCompositor(int 
     ConfigureAPZCTreeManager();
   }
 
   TextureFactoryIdentifier textureFactoryIdentifier;
   PLayerTransactionChild* shadowManager = nullptr;
   nsTArray<LayersBackend> backendHints;
   GetPreferredCompositorBackends(backendHints);
 
-#if !defined(MOZ_X11) && !defined(XP_WIN)
-  if (!mRequireOffMainThreadCompositing &&
-      !Preferences::GetBool("layers.offmainthreadcomposition.force-basic", false)) {
-    for (size_t i = 0; i < backendHints.Length(); ++i) {
-      if (backendHints[i] == LayersBackend::LAYERS_BASIC) {
-        backendHints[i] = LayersBackend::LAYERS_NONE;
-      }
-    }
-  }
-#endif
-
   bool success = false;
   if (!backendHints.IsEmpty()) {
     shadowManager = mCompositorChild->SendPLayerTransactionConstructor(
       backendHints, 0, &textureFactoryIdentifier, &success);
   }
 
   ShadowLayerForwarder* lf = lm->AsShadowForwarder();