diff -r 000000000000 -r 6474c204b198 gfx/layers/client/ClientCanvasLayer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/client/ClientCanvasLayer.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 2; 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_CLIENTCANVASLAYER_H
+#define GFX_CLIENTCANVASLAYER_H
+
+#include "mozilla/layers/CanvasClient.h"  // for CanvasClient, etc
+#include "ClientLayerManager.h"         // for ClientLayerManager, etc
+#include "CopyableCanvasLayer.h"        // for CopyableCanvasLayer
+#include "Layers.h"                     // for CanvasLayer, etc
+#include "mozilla/Attributes.h"         // for MOZ_OVERRIDE
+#include "mozilla/RefPtr.h"             // for RefPtr
+#include "mozilla/layers/LayersMessages.h"  // for CanvasLayerAttributes, etc
+#include "mozilla/mozalloc.h"           // for operator delete
+#include "nsAutoPtr.h"                  // for nsRefPtr
+#include "nsDebug.h"                    // for NS_ASSERTION
+#include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
+#include "nsRegion.h"                   // for nsIntRegion
+
+namespace mozilla {
+namespace layers {
+
+class CompositableClient;
+class ShadowableLayer;
+
+class ClientCanvasLayer : public CopyableCanvasLayer,
+                          public ClientLayer
+{
+  typedef CanvasClient::CanvasClientType CanvasClientType;
+public:
+  ClientCanvasLayer(ClientLayerManager* aLayerManager) :
+    CopyableCanvasLayer(aLayerManager,
+                        static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
+    , mTextureSurface(nullptr)
+    , mFactory(nullptr)
+  {
+    MOZ_COUNT_CTOR(ClientCanvasLayer);
+  }
+  virtual ~ClientCanvasLayer();
+
+  virtual void SetVisibleRegion(const nsIntRegion& aRegion)
+  {
+    NS_ASSERTION(ClientManager()->InConstruction(),
+                 "Can only set properties in construction phase");
+    CanvasLayer::SetVisibleRegion(aRegion);
+  }
+
+  virtual void Initialize(const Data& aData);
+
+  virtual void RenderLayer();
+
+  virtual void ClearCachedResources()
+  {
+    if (mCanvasClient) {
+      mCanvasClient->Clear();
+    }
+  }
+
+  virtual void FillSpecificAttributes(SpecificLayerAttributes& aAttrs)
+  {
+    aAttrs = CanvasLayerAttributes(mFilter, mBounds);
+  }
+
+  virtual Layer* AsLayer() { return this; }
+  virtual ShadowableLayer* AsShadowableLayer() { return this; }
+
+  virtual void Disconnect()
+  {
+    mCanvasClient = nullptr;
+    ClientLayer::Disconnect();
+  }
+
+  virtual CompositableClient* GetCompositableClient() MOZ_OVERRIDE
+  {
+    return mCanvasClient;
+  }
+protected:
+  ClientLayerManager* ClientManager()
+  {
+    return static_cast<ClientLayerManager*>(mManager);
+  }
+
+  CanvasClientType GetCanvasClientType()
+  {
+    if (mGLContext) {
+      return CanvasClient::CanvasClientGLContext;
+    }
+    return CanvasClient::CanvasClientSurface;
+  }
+
+  RefPtr<CanvasClient> mCanvasClient;
+
+  gfx::SharedSurface* mTextureSurface;
+  gfx::SurfaceFactory* mFactory;
+
+  friend class DeprecatedCanvasClient2D;
+  friend class CanvasClient2D;
+  friend class DeprecatedCanvasClientSurfaceStream;
+  friend class CanvasClientSurfaceStream;
+};
+}
+}
+
+#endif