mozilla-inbound: changeset 164885:38c297cc1babe8eb379c706bf49be0585e12ec54

author	Benoit Jacob <bjacob@mozilla.com>
	Thu, 23 Jan 2014 15:02:23 -0500
changeset 164885	38c297cc1babe8eb379c706bf49be0585e12ec54
parent 164884	f9f11f19eca6b4f53295791334a894997289f642
child 164886	98d0a4876836c603b2ecee02cc67d8b3f63ce127
push id	38848
push user	bjacob@mozilla.com
push date	Thu, 23 Jan 2014 20:03:23 +0000
treeherder	mozilla-inbound@38c297cc1bab [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	959380
milestone	29.0a1
first release with	nightly linux32 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly linux64 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly mac 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly win32 9d650c07b547 / 29.0a1 / 20140124030216 / files nightly win64 9d650c07b547 / 29.0a1 / 20140124030216 / files
last release without	nightly linux32 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly linux64 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly mac b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly win32 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files nightly win64 b9d9649e7ec0 / 29.0a1 / 20140123030204 / files

--- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
@@ -170,17 +170,17 @@ PixelFormatForImageFormat(gfxImageFormat
     return android::PIXEL_FORMAT_RGBA_8888;
   case gfxImageFormat::RGB24:
     return android::PIXEL_FORMAT_RGBX_8888;
   case gfxImageFormat::RGB16_565:
     return android::PIXEL_FORMAT_RGB_565;
   default:
     MOZ_CRASH("Unknown gralloc pixel format");
   }
-  return gfxImageFormat::ARGB32;
+  return android::PIXEL_FORMAT_RGBA_8888;
 }
 
 static size_t
 BytesPerPixelForPixelFormat(android::PixelFormat aFormat)
 {
   switch (aFormat) {
   case PIXEL_FORMAT_RGBA_8888:
   case PIXEL_FORMAT_RGBX_8888: