diff -r 000000000000 -r 6474c204b198 gfx/layers/client/ClientContainerLayer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/client/ClientContainerLayer.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,199 @@
+/* -*- 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_CLIENTCONTAINERLAYER_H
+#define GFX_CLIENTCONTAINERLAYER_H
+
+#include <stdint.h>                     // for uint32_t
+#include "ClientLayerManager.h"         // for ClientLayerManager, etc
+#include "Layers.h"                     // for Layer, ContainerLayer, etc
+#include "gfxPrefs.h"                   // for gfxPrefs
+#include "nsDebug.h"                    // for NS_ASSERTION
+#include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
+#include "nsISupportsUtils.h"           // for NS_ADDREF, NS_RELEASE
+#include "nsRegion.h"                   // for nsIntRegion
+#include "nsTArray.h"                   // for nsAutoTArray
+
+namespace mozilla {
+namespace layers {
+
+class ShadowableLayer;
+
+class ClientContainerLayer : public ContainerLayer,
+                             public ClientLayer
+{
+public:
+  ClientContainerLayer(ClientLayerManager* aManager) :
+    ContainerLayer(aManager,
+                   static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
+  {
+    MOZ_COUNT_CTOR(ClientContainerLayer);
+    mSupportsComponentAlphaChildren = true;
+  }
+  virtual ~ClientContainerLayer()
+  {
+    while (mFirstChild) {
+      ContainerLayer::RemoveChild(mFirstChild);
+    }
+
+    MOZ_COUNT_DTOR(ClientContainerLayer);
+  }
+
+  virtual void RenderLayer()
+  {
+    if (GetMaskLayer()) {
+      ToClientLayer(GetMaskLayer())->RenderLayer();
+    }
+    
+    // Setup mSupportsComponentAlphaChildren in the same way 
+    // that ContainerLayerComposite will do.
+    if (UseIntermediateSurface()) {
+      if (GetEffectiveVisibleRegion().GetNumRects() != 1 ||
+          !(GetContentFlags() & Layer::CONTENT_OPAQUE))
+      {
+        gfx::Matrix transform;
+        if (HasOpaqueAncestorLayer(this) &&
+            GetEffectiveTransform().Is2D(&transform) &&
+            !gfx::ThebesMatrix(transform).HasNonIntegerTranslation()) {
+          SetSupportsComponentAlphaChildren(
+            gfxPrefs::ComponentAlphaEnabled());
+        }
+      }
+    } else {
+      SetSupportsComponentAlphaChildren(
+        (GetContentFlags() & Layer::CONTENT_OPAQUE) ||
+        (GetParent() && GetParent()->SupportsComponentAlphaChildren()));
+    }
+
+    nsAutoTArray<Layer*, 12> children;
+    SortChildrenBy3DZOrder(children);
+
+    for (uint32_t i = 0; i < children.Length(); i++) {
+      Layer* child = children.ElementAt(i);
+      if (child->GetEffectiveVisibleRegion().IsEmpty()) {
+        continue;
+      }
+
+      ToClientLayer(child)->RenderLayer();
+
+      if (!ClientManager()->GetRepeatTransaction() &&
+          !child->GetInvalidRegion().IsEmpty()) {
+        child->Mutated();
+      }
+    }
+  }
+
+  virtual void SetVisibleRegion(const nsIntRegion& aRegion)
+  {
+    NS_ASSERTION(ClientManager()->InConstruction(),
+                 "Can only set properties in construction phase");
+    ContainerLayer::SetVisibleRegion(aRegion);
+  }
+  virtual bool InsertAfter(Layer* aChild, Layer* aAfter) MOZ_OVERRIDE
+  {
+    if(!ClientManager()->InConstruction()) {
+      NS_ERROR("Can only set properties in construction phase");
+      return false;
+    }
+
+    if (!ContainerLayer::InsertAfter(aChild, aAfter)) {
+      return false;
+    }
+
+    ClientManager()->AsShadowForwarder()->InsertAfter(ClientManager()->Hold(this),
+                                                      ClientManager()->Hold(aChild),
+                                                      aAfter ? ClientManager()->Hold(aAfter) : nullptr);
+    return true;
+  }
+
+  virtual bool RemoveChild(Layer* aChild) MOZ_OVERRIDE
+  {
+    if (!ClientManager()->InConstruction()) {
+      NS_ERROR("Can only set properties in construction phase");
+      return false;
+    }
+    // hold on to aChild before we remove it!
+    ShadowableLayer *heldChild = ClientManager()->Hold(aChild);
+    if (!ContainerLayer::RemoveChild(aChild)) {
+      return false;
+    }
+    ClientManager()->AsShadowForwarder()->RemoveChild(ClientManager()->Hold(this), heldChild);
+    return true;
+  }
+
+  virtual bool RepositionChild(Layer* aChild, Layer* aAfter) MOZ_OVERRIDE
+  {
+    if (!ClientManager()->InConstruction()) {
+      NS_ERROR("Can only set properties in construction phase");
+      return false;
+    }
+    if (!ContainerLayer::RepositionChild(aChild, aAfter)) {
+      return false;
+    }
+    ClientManager()->AsShadowForwarder()->RepositionChild(ClientManager()->Hold(this),
+                                                          ClientManager()->Hold(aChild),
+                                                          aAfter ? ClientManager()->Hold(aAfter) : nullptr);
+    return true;
+  }
+
+  virtual Layer* AsLayer() { return this; }
+  virtual ShadowableLayer* AsShadowableLayer() { return this; }
+
+  virtual void ComputeEffectiveTransforms(const gfx::Matrix4x4& aTransformToSurface)
+  {
+    DefaultComputeEffectiveTransforms(aTransformToSurface);
+  }
+
+  void ForceIntermediateSurface() { mUseIntermediateSurface = true; }
+
+  void SetSupportsComponentAlphaChildren(bool aSupports) { mSupportsComponentAlphaChildren = aSupports; }
+
+protected:
+  ClientLayerManager* ClientManager()
+  {
+    return static_cast<ClientLayerManager*>(mManager);
+  }
+};
+
+class ClientRefLayer : public RefLayer,
+                       public ClientLayer {
+public:
+  ClientRefLayer(ClientLayerManager* aManager) :
+    RefLayer(aManager,
+             static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()))
+  {
+    MOZ_COUNT_CTOR(ClientRefLayer);
+  }
+  virtual ~ClientRefLayer()
+  {
+    MOZ_COUNT_DTOR(ClientRefLayer);
+  }
+
+  virtual Layer* AsLayer() { return this; }
+  virtual ShadowableLayer* AsShadowableLayer() { return this; }
+
+  virtual void Disconnect()
+  {
+    ClientLayer::Disconnect();
+  }
+
+  virtual void RenderLayer() { }
+
+  virtual void ComputeEffectiveTransforms(const gfx::Matrix4x4& aTransformToSurface)
+  {
+    DefaultComputeEffectiveTransforms(aTransformToSurface);
+  }
+
+private:
+  ClientLayerManager* ClientManager()
+  {
+    return static_cast<ClientLayerManager*>(mManager);
+  }
+};
+
+}
+}
+
+#endif