Bug 739679 - Part 7: Enable tiling. r=pcwalton a=blocking-fennec

gfx/layers/TiledLayerBuffer.h

@@ -8,7 +8,11 @@
 #define TILEDLAYERBUFFER_TILE_SIZE 256
 
 // Debug defines
-//#define FORCE_BASICTILEDTHEBESLAYER
+#ifdef MOZ_JAVA_COMPOSITOR
+  // This needs to go away as we enabled tiled
+  // layers everywhere.
+  #define FORCE_BASICTILEDTHEBESLAYER
+#endif
 //#define GFX_TILEDLAYER_DEBUG_OVERLAY
 //#define GFX_TILEDLAYER_PREF_WARNINGS
 

gfx/layers/basic/BasicLayers.cpp

@@ -3128,7 +3128,7 @@ BasicShadowLayerManager::CreateThebesLayer()
 {
   NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
 #ifdef FORCE_BASICTILEDTHEBESLAYER
-  if (HasShadowManager()) {
+  if (HasShadowManager() && GetParentBackendType() == LayerManager::LAYERS_OPENGL) {
     // BasicTiledThebesLayer doesn't support main
     // thread compositing so only return this layer
     // type if we have a shadow manager.