Bug 868556 - We are not using gralloc on b2g anymore - r=vladv
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 03 May 2013 22:57:18 -0400
changeset 141837 39c44b2b1ef52335e714dec37ed4fed734aa4337
parent 141836 a081cfffeed01cea72304ae476e663e770631f01
child 141838 cdc859533b8d767d143f9f7671b96ba06bd4b1a0
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvladv
bugs868556
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 868556 - We are not using gralloc on b2g anymore - r=vladv
gfx/layers/ipc/ISurfaceAllocator.h
image/test/reftest/bmp/bmp-1bpp/reftest.list
--- a/gfx/layers/ipc/ISurfaceAllocator.h
+++ b/gfx/layers/ipc/ISurfaceAllocator.h
@@ -6,16 +6,27 @@
 #ifndef GFX_LAYERS_ISURFACEDEALLOCATOR
 #define GFX_LAYERS_ISURFACEDEALLOCATOR
 
 #include "mozilla/ipc/SharedMemory.h"
 #include "mozilla/RefPtr.h"
 #include "gfxPoint.h"
 #include "gfxASurface.h"
 
+/*
+ * FIXME [bjacob] *** PURE CRAZYNESS WARNING ***
+ *
+ * This #define is actually needed here, because subclasses of ISurfaceAllocator,
+ * namely ShadowLayerForwarder, will or will not override AllocGrallocBuffer
+ * depending on whether MOZ_HAVE_SURFACEDESCRIPTORGRALLOC is defined.
+ */
+#ifdef MOZ_WIDGET_GONK
+#define MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
+#endif
+
 class gfxSharedImageSurface;
 class gfxASurface;
 
 namespace base {
 class Thread;
 } // namespace
 
 namespace mozilla {
--- a/image/test/reftest/bmp/bmp-1bpp/reftest.list
+++ b/image/test/reftest/bmp/bmp-1bpp/reftest.list
@@ -1,12 +1,12 @@
 # BMP 1BPP tests
 
 # Images of various sizes
-== bmp-size-1x1-1bpp.bmp   bmp-size-1x1-1bpp.png
+fails-if(B2G) == bmp-size-1x1-1bpp.bmp   bmp-size-1x1-1bpp.png
 == bmp-size-2x2-1bpp.bmp   bmp-size-2x2-1bpp.png
 == bmp-size-3x3-1bpp.bmp   bmp-size-3x3-1bpp.png
 == bmp-size-4x4-1bpp.bmp   bmp-size-4x4-1bpp.png
 == bmp-size-5x5-1bpp.bmp   bmp-size-5x5-1bpp.png
 == bmp-size-6x6-1bpp.bmp   bmp-size-6x6-1bpp.png
 == bmp-size-7x7-1bpp.bmp   bmp-size-7x7-1bpp.png
 == bmp-size-8x8-1bpp.bmp   bmp-size-8x8-1bpp.png
 == bmp-size-9x9-1bpp.bmp   bmp-size-9x9-1bpp.png