diff -r 000000000000 -r 6474c204b198 gfx/layers/composite/CanvasLayerComposite.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/composite/CanvasLayerComposite.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 GFX_CanvasLayerComposite_H
+#define GFX_CanvasLayerComposite_H
+
+#include "Layers.h"                     // for CanvasLayer, etc
+#include "mozilla/Attributes.h"         // for MOZ_OVERRIDE
+#include "mozilla/RefPtr.h"             // for RefPtr
+#include "mozilla/layers/LayerManagerComposite.h"  // for LayerComposite, etc
+#include "mozilla/layers/LayersTypes.h"  // for LayerRenderState, etc
+#include "nsDebug.h"                    // for NS_RUNTIMEABORT
+#include "nsRect.h"                     // for nsIntRect
+#include "nscore.h"                     // for nsACString
+struct nsIntPoint;
+
+namespace mozilla {
+namespace layers {
+
+class CompositableHost;
+// Canvas layers use ImageHosts (but CanvasClients) because compositing a
+// canvas is identical to compositing an image.
+class ImageHost;
+
+class CanvasLayerComposite : public CanvasLayer,
+                             public LayerComposite
+{
+public:
+  CanvasLayerComposite(LayerManagerComposite* aManager);
+
+  virtual ~CanvasLayerComposite();
+
+  // CanvasLayer impl
+  virtual void Initialize(const Data& aData) MOZ_OVERRIDE
+  {
+    NS_RUNTIMEABORT("Incompatibe surface type");
+  }
+
+  virtual LayerRenderState GetRenderState() MOZ_OVERRIDE;
+
+  virtual bool SetCompositableHost(CompositableHost* aHost) MOZ_OVERRIDE;
+
+  virtual void Disconnect() MOZ_OVERRIDE
+  {
+    Destroy();
+  }
+
+  virtual Layer* GetLayer() MOZ_OVERRIDE;
+  virtual void RenderLayer(const nsIntRect& aClipRect) MOZ_OVERRIDE;
+
+  virtual void CleanupResources() MOZ_OVERRIDE;
+
+  CompositableHost* GetCompositableHost() MOZ_OVERRIDE;
+
+  virtual LayerComposite* AsLayerComposite() MOZ_OVERRIDE { return this; }
+
+  void SetBounds(nsIntRect aBounds) { mBounds = aBounds; }
+
+  virtual const char* Name() const MOZ_OVERRIDE { return "CanvasLayerComposite"; }
+
+protected:
+  virtual nsACString& PrintInfo(nsACString& aTo, const char* aPrefix) MOZ_OVERRIDE;
+
+private:
+  RefPtr<CompositableHost> mImageHost;
+};
+
+} /* layers */
+} /* mozilla */
+#endif /* GFX_CanvasLayerComposite_H */