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

CLOSED TREE

gfx/layers/ImageContainer.cpp

@@ -4,21 +4,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
+#include "mozilla/layers/ImageBridgeChild.h"
+
 #include "ImageContainer.h"
-#include <string.h>                     // for memcpy, memset
-#include "SharedTextureImage.h"         // for SharedTextureImage
-#include "gfxImageSurface.h"            // for gfxImageSurface
-#include "gfxPlatform.h"                // for gfxPlatform
-#include "gfxUtils.h"                   // for gfxUtils
-#include "mozilla/RefPtr.h"             // for TemporaryRef
-#include "mozilla/ipc/CrossProcessMutex.h"  // for CrossProcessMutex, etc
-#include "mozilla/layers/CompositorTypes.h"
-#include "mozilla/layers/ImageBridgeChild.h"  // for ImageBridgeChild
-#include "mozilla/layers/ImageClient.h"  // for ImageClient
-#include "nsISupportsUtils.h"           // for NS_IF_ADDREF
-#ifdef MOZ_WIDGET_GONK
 #include "GrallocImages.h"
-#endif
+#include "mozilla/ipc/Shmem.h"
+#include "mozilla/ipc/CrossProcessMutex.h"
+#include "SharedTextureImage.h"
+#include "gfxImageSurface.h"
+#include "gfxSharedImageSurface.h"
+#include "yuv_convert.h"
+#include "gfxUtils.h"
+#include "gfxPlatform.h"
+#include "mozilla/layers/ImageClient.h"
 
 #ifdef XP_MACOSX
 #include "mozilla/gfx/QuartzSupport.h"
@@ -41,9 +39,6 @@ using mozilla::gfx::SourceSurface;
 namespace mozilla {
 namespace layers {
 
-class DataSourceSurface;
-class SourceSurface;
-
 int32_t Image::sSerialCounter = 0;
 
 already_AddRefed<Image>