Back out d393cfeb5dbf:9f82224bb8a3 (bug 903816) for Android reftest failures

CLOSED TREE

gfx/layers/composite/TextureHost.cpp

@@ -4,21 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/layers/TextureHost.h"
-#include "LayersLogging.h"              // for AppendToString
-#include "gfx2DGlue.h"                  // for ToIntSize
-#include "gfxImageSurface.h"            // for gfxImageSurface
-#include "mozilla/gfx/2D.h"             // for DataSourceSurface, Factory
-#include "mozilla/ipc/Shmem.h"          // for Shmem
-#include "mozilla/layers/Compositor.h"  // for Compositor
-#include "mozilla/layers/ISurfaceAllocator.h"  // for ISurfaceAllocator
+#include "mozilla/layers/LayersSurfaces.h"
+#include "LayersLogging.h"
+#include "nsPrintfCString.h"
+#include "mozilla/ipc/Shmem.h"
+#include "ipc/AutoOpenSurface.h"
 #include "mozilla/layers/ImageDataSerializer.h"
-#include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor, etc
 #include "mozilla/layers/YCbCrImageDataSerializer.h"
-#include "nsAString.h"
-#include "nsAutoPtr.h"                  // for nsRefPtr
-#include "nsPrintfCString.h"            // for nsPrintfCString
+#include "gfx2DGlue.h"
+#include "mozilla/gfx/2D.h"
 
-struct nsIntPoint;
 
 namespace mozilla {
 namespace layers {