diff -r 000000000000 -r 6474c204b198 gfx/layers/ipc/ShadowLayerUtilsGralloc.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_layers_ShadowLayerUtilsGralloc_h
+#define mozilla_layers_ShadowLayerUtilsGralloc_h
+
+#include <unistd.h>
+#include <ui/GraphicBuffer.h>
+
+#include "ipc/IPCMessageUtils.h"
+#include "mozilla/layers/PGrallocBufferChild.h"
+#include "mozilla/layers/PGrallocBufferParent.h"
+
+#define MOZ_HAVE_SURFACEDESCRIPTORGRALLOC
+#define MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
+
+namespace mozilla {
+namespace layers {
+
+class MaybeMagicGrallocBufferHandle;
+class TextureHost;
+
+/**
+ * This class exists to share the underlying GraphicBuffer resources
+ * from one thread context to another.  This requires going through
+ * slow paths in the kernel so can be somewhat expensive.
+ *
+ * This is not just platform-specific, but also
+ * gralloc-implementation-specific.
+ */
+struct MagicGrallocBufferHandle {
+  typedef android::GraphicBuffer GraphicBuffer;
+
+  MagicGrallocBufferHandle()
+  { }
+
+  MagicGrallocBufferHandle(const android::sp<GraphicBuffer>& aGraphicBuffer);
+
+  // Default copy ctor and operator= are OK
+
+  bool operator==(const MagicGrallocBufferHandle& aOther) const {
+    return mGraphicBuffer == aOther.mGraphicBuffer;
+  }
+
+  android::sp<GraphicBuffer> mGraphicBuffer;
+};
+
+/**
+ * GrallocBufferActor is an "IPC wrapper" for an underlying
+ * GraphicBuffer (pmem region).  It allows us to cheaply and
+ * conveniently share gralloc handles between processes.
+ */
+class GrallocBufferActor : public PGrallocBufferChild
+                         , public PGrallocBufferParent
+{
+  friend class ShadowLayerForwarder;
+  friend class LayerManagerComposite;
+  friend class ImageBridgeChild;
+  typedef android::GraphicBuffer GraphicBuffer;
+
+public:
+  virtual ~GrallocBufferActor();
+
+  static PGrallocBufferParent*
+  Create(const gfx::IntSize& aSize,
+         const uint32_t& aFormat,
+         const uint32_t& aUsage,
+         MaybeMagicGrallocBufferHandle* aOutHandle);
+
+  static PGrallocBufferChild*
+  Create();
+
+  // used only for hacky fix in gecko 23 for bug 862324
+  // see bug 865908 about fixing this.
+  void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
+
+  void AddTextureHost(TextureHost* aTextureHost);
+  void RemoveTextureHost();
+
+  android::GraphicBuffer* GetGraphicBuffer();
+
+  void InitFromHandle(const MagicGrallocBufferHandle& aHandle);
+
+private:
+  GrallocBufferActor();
+
+  android::sp<GraphicBuffer> mGraphicBuffer;
+
+  // This value stores the number of bytes allocated in this
+  // BufferActor. This will be used for the memory reporter.
+  size_t mAllocBytes;
+
+  // Used only for hacky fix for bug 966446.
+  TextureHost* mTextureHost;
+
+  friend class ISurfaceAllocator;
+};
+
+} // namespace layers
+} // namespace mozilla
+
+namespace IPC {
+
+template <>
+struct ParamTraits<mozilla::layers::MagicGrallocBufferHandle> {
+  typedef mozilla::layers::MagicGrallocBufferHandle paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam);
+  static bool Read(const Message* aMsg, void** aIter, paramType* aResult);
+};
+
+} // namespace IPC
+
+#endif  // mozilla_layers_ShadowLayerUtilsGralloc_h