Issue #80- De-unify gfx/layers

Excludes layers/ipc/CompositorBridgeParent and CrossProcessCompositorBridgeParent
because the latter purposely uses functions implemented in the former.
See also code comment in CrossProcessCompositorBridgeParent.cpp

Note: likely dead code for us anyway; likely not worth investing in to solve.

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -28,6 +28,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/gfx/2D.h"          // for DrawTarget
+#include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/Point.h"          // for IntSize
 #include "mozilla/gfx/Rect.h"          // for IntSize
 #include "mozilla/ipc/Transport.h"      // for Transport

gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp

@@ -84,9 +84,10 @@
 #include "LayerScope.h"
 
 namespace mozilla {
-
 namespace layers {
 
+using namespace std;
+
 // defined in CompositorBridgeParent.cpp
 typedef map<uint64_t, CompositorBridgeParent::LayerTreeState> LayerTreeMap;
 extern LayerTreeMap sIndirectLayerTrees;

gfx/layers/ipc/CrossProcessCompositorBridgeParent.h

@@ -8,6 +8,7 @@
 #define mozilla_layers_CrossProcessCompositorBridgeParent_h
 
 #include "mozilla/layers/CompositorBridgeParent.h"
+#include "mozilla/layers/CompositorThread.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/ipc/VideoBridgeParent.cpp

@@ -12,7 +12,6 @@ namespace layers {
 
 using namespace mozilla::ipc;
 using namespace mozilla::gfx;
-using namespace mozilla::media;
 
 
 static VideoBridgeParent* sVideoBridgeSingleton;

gfx/layers/ipc/VideoBridgeParent.h

@@ -7,6 +7,7 @@
 #define gfx_layers_ipc_VideoBridgeParent_h_
 
 #include "mozilla/layers/PVideoBridgeParent.h"
+#include "mozilla/layers/ISurfaceAllocator.h"
 
 namespace mozilla {
 namespace layers {