Bug 1112170 - Don't disable tiles for the basic backend on Linux. r=Bas
authorNicolas Silva <nsilva@mozilla.com>
Thu, 18 Dec 2014 22:23:53 +0100
changeset 220583 3233b239e61d238c50f28e2949791de63ffffb9f
parent 220582 e7dbd3eb21e5201a4e2985b4a2683fd60d1cb4cd
child 220584 cf81114dbc71e09c531b25ee7b50029e70ec1e15
push id10503
push userryanvm@gmail.com
push dateFri, 19 Dec 2014 20:13:42 +0000
treeherderfx-team@98ee95ac6be5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersBas
bugs1112170
milestone37.0a1
Bug 1112170 - Don't disable tiles for the basic backend on Linux. r=Bas
gfx/layers/client/ClientPaintedLayer.cpp
--- a/gfx/layers/client/ClientPaintedLayer.cpp
+++ b/gfx/layers/client/ClientPaintedLayer.cpp
@@ -157,20 +157,23 @@ ClientLayerManager::CreatePaintedLayer()
 already_AddRefed<PaintedLayer>
 ClientLayerManager::CreatePaintedLayerWithHint(PaintedLayerCreationHint aHint)
 {
   NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
   if (
 #ifdef MOZ_B2G
       aHint == SCROLLABLE &&
 #endif
-      gfxPlatform::GetPlatform()->UseTiling() &&
-      (AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_OPENGL ||
-       AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D9 ||
-       AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D11)) {
+      gfxPlatform::GetPlatform()->UseTiling()
+#ifndef MOZ_X11
+      && (AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_OPENGL ||
+          AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D9 ||
+          AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D11)
+#endif
+  ) {
     nsRefPtr<ClientTiledPaintedLayer> layer = new ClientTiledPaintedLayer(this, aHint);
     CREATE_SHADOW(Painted);
     return layer.forget();
   } else {
     nsRefPtr<ClientPaintedLayer> layer = new ClientPaintedLayer(this, aHint);
     CREATE_SHADOW(Painted);
     return layer.forget();
   }