Back out d393cfeb5dbf:9f82224bb8a3 (bug 903816) for Android reftest failures

CLOSED TREE

gfx/layers/client/ClientContainerLayer.cpp

@@ -1,17 +1,5 @@
-/* -*- 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/. */
-
 #include "ClientContainerLayer.h"
-#include "ClientLayerManager.h"         // for ClientLayerManager, etc
-#include "mozilla/mozalloc.h"           // for operator new
-#include "nsAutoPtr.h"                  // for nsRefPtr
-#include "nsCOMPtr.h"                   // for already_AddRefed
-#include "nsISupportsImpl.h"            // for Layer::AddRef, etc
-
-namespace mozilla {
-namespace layers {
+#include "BasicLayersImpl.h"
 
 already_AddRefed<ContainerLayer>
 ClientLayerManager::CreateContainerLayer()
@@ -32,6 +20,3 @@ ClientLayerManager::CreateRefLayer()
   CREATE_SHADOW(Ref);
   return layer.forget();
 }
-
-}
-}