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

CLOSED TREE

gfx/layers/client/ClientLayerManager.cpp

@@ -4,27 +4,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ClientLayerManager.h"
-#include "CompositorChild.h"            // for CompositorChild
-#include "GeckoProfilerImpl.h"          // for PROFILER_LABEL
-#include "gfx3DMatrix.h"                // for gfx3DMatrix
-#include "gfxASurface.h"                // for gfxASurface, etc
-#include "ipc/AutoOpenSurface.h"        // for AutoOpenSurface
-#include "mozilla/Assertions.h"         // for MOZ_ASSERT, etc
+#include "nsIWidget.h"
+#include "mozilla/dom/TabChild.h"
 #include "mozilla/Hal.h"
-#include "mozilla/dom/ScreenOrientation.h"  // for ScreenOrientation
-#include "mozilla/dom/TabChild.h"       // for TabChild
-#include "mozilla/hal_sandbox/PHal.h"   // for ScreenConfiguration
-#include "mozilla/layers/CompositableClient.h"  // for CompositableChild, etc
-#include "mozilla/layers/ContentClient.h"  // for ContentClientRemote
-#include "mozilla/layers/ISurfaceAllocator.h"
-#include "mozilla/layers/LayerTransaction.h"  // for EditReply, etc
-#include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
-#include "mozilla/layers/PLayerChild.h"  // for PLayerChild
+#include "mozilla/layers/PLayerChild.h"
 #include "mozilla/layers/PLayerTransactionChild.h"
-#include "nsAString.h"
-#include "nsIWidget.h"                  // for nsIWidget
-#include "nsTArray.h"                   // for AutoInfallibleTArray
-#include "nsXULAppAPI.h"                // for XRE_GetProcessType, etc
+#include "mozilla/layers/PLayerTransactionParent.h"
+#include "CompositorChild.h"
+#include "ipc/AutoOpenSurface.h"
+#include "ipc/ShadowLayerChild.h"
+#include "mozilla/layers/CompositableClient.h"
+#include "mozilla/layers/ContentClient.h"
+
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif