diff -r 000000000000 -r 6474c204b198 gfx/thebes/gfxReusableImageSurfaceWrapper.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/thebes/gfxReusableImageSurfaceWrapper.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,36 @@
+/* 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 GFXMEMCOWSURFACEWRAPPER
+#define GFXMEMCOWSURFACEWRAPPER
+
+#include "gfxReusableSurfaceWrapper.h"
+
+class gfxImageSurface;
+
+/**
+ * A cross-thread capable implementation of gfxReusableSurfaceWrapper based
+ * on gfxImageSurface.
+ */
+class gfxReusableImageSurfaceWrapper : public gfxReusableSurfaceWrapper {
+public:
+  gfxReusableImageSurfaceWrapper(gfxImageSurface* aSurface);
+  ~gfxReusableImageSurfaceWrapper();
+
+  const unsigned char* GetReadOnlyData() const MOZ_OVERRIDE;
+  gfxImageFormat Format() MOZ_OVERRIDE;
+  gfxReusableSurfaceWrapper* GetWritable(gfxImageSurface** aSurface) MOZ_OVERRIDE;
+  void ReadLock() MOZ_OVERRIDE;
+  void ReadUnlock() MOZ_OVERRIDE;
+
+  Type GetType()
+  {
+    return TYPE_IMAGE;
+  }
+
+private:
+  nsRefPtr<gfxImageSurface>         mSurface;
+};
+
+#endif // GFXMEMCOWSURFACEWRAPPER