diff -r 000000000000 -r 6474c204b198 gfx/layers/composite/ContainerLayerComposite.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/composite/ContainerLayerComposite.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,95 @@
+/* -*- 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_ContainerLayerComposite_H
+#define GFX_ContainerLayerComposite_H
+
+#include "Layers.h"                     // for Layer (ptr only), etc
+#include "mozilla/Attributes.h"         // for MOZ_OVERRIDE
+#include "mozilla/layers/LayerManagerComposite.h"
+
+struct nsIntPoint;
+struct nsIntRect;
+
+namespace mozilla {
+namespace layers {
+
+class CompositableHost;
+
+class ContainerLayerComposite : public ContainerLayer,
+                                public LayerComposite
+{
+  template<class ContainerT>
+  friend void ContainerRender(ContainerT* aContainer,
+                              LayerManagerComposite* aManager,
+                              const nsIntRect& aClipRect);
+public:
+  ContainerLayerComposite(LayerManagerComposite *aManager);
+
+  ~ContainerLayerComposite();
+
+  // LayerComposite Implementation
+  virtual Layer* GetLayer() MOZ_OVERRIDE { return this; }
+
+  virtual void Destroy() MOZ_OVERRIDE;
+
+  LayerComposite* GetFirstChildComposite();
+
+  virtual void RenderLayer(const nsIntRect& aClipRect) MOZ_OVERRIDE;
+
+  virtual void ComputeEffectiveTransforms(const gfx::Matrix4x4& aTransformToSurface) MOZ_OVERRIDE
+  {
+    DefaultComputeEffectiveTransforms(aTransformToSurface);
+  }
+
+  virtual void CleanupResources() MOZ_OVERRIDE;
+
+  virtual LayerComposite* AsLayerComposite() MOZ_OVERRIDE { return this; }
+
+  // container layers don't use a compositable
+  CompositableHost* GetCompositableHost() MOZ_OVERRIDE { return nullptr; }
+
+  virtual const char* Name() const MOZ_OVERRIDE { return "ContainerLayerComposite"; }
+};
+
+class RefLayerComposite : public RefLayer,
+                          public LayerComposite
+{
+  template<class ContainerT>
+  friend void ContainerRender(ContainerT* aContainer,
+                              LayerManagerComposite* aManager,
+                              const nsIntRect& aClipRect);
+public:
+  RefLayerComposite(LayerManagerComposite *aManager);
+  ~RefLayerComposite();
+
+  /** LayerOGL implementation */
+  Layer* GetLayer() MOZ_OVERRIDE { return this; }
+
+  void Destroy() MOZ_OVERRIDE;
+
+  LayerComposite* GetFirstChildComposite();
+
+  virtual void RenderLayer(const nsIntRect& aClipRect) MOZ_OVERRIDE;
+
+  virtual void ComputeEffectiveTransforms(const gfx::Matrix4x4& aTransformToSurface) MOZ_OVERRIDE
+  {
+    DefaultComputeEffectiveTransforms(aTransformToSurface);
+  }
+
+  virtual void CleanupResources() MOZ_OVERRIDE;
+
+  virtual LayerComposite* AsLayerComposite() MOZ_OVERRIDE { return this; }
+
+  // ref layers don't use a compositable
+  CompositableHost* GetCompositableHost() MOZ_OVERRIDE { return nullptr; }
+
+  virtual const char* Name() const MOZ_OVERRIDE { return "RefLayerComposite"; }
+};
+
+} /* layers */
+} /* mozilla */
+
+#endif /* GFX_ContainerLayerComposite_H */