Bug 938970 - 2/5. Add more namespace qualifiers in gfx/layers code to avoid ambiguous namespace resolution - r=mattwoodrow

gfx/layers/ipc/ISurfaceAllocator.cpp

@@ -29,9 +29,9 @@ namespace layers {
 
 mozilla::Atomic<int32_t> GfxMemoryImageReporter::sAmount(0);
 
-SharedMemory::SharedMemoryType OptimalShmemType()
+mozilla::ipc::SharedMemory::SharedMemoryType OptimalShmemType()
 {
-  return SharedMemory::TYPE_BASIC;
+  return mozilla::ipc::SharedMemory::TYPE_BASIC;
 }
 
 bool
@@ -46,7 +46,7 @@ ISurfaceAllocator::AllocSharedImageSurface(const gfxIntSize& aSize,
                                gfxContentType aContent,
                                gfxSharedImageSurface** aBuffer)
 {
-  SharedMemory::SharedMemoryType shmemType = OptimalShmemType();
+  mozilla::ipc::SharedMemory::SharedMemoryType shmemType = OptimalShmemType();
   gfxImageFormat format = gfxPlatform::GetPlatform()->OptimalFormatForContent(aContent);
 
   nsRefPtr<gfxSharedImageSurface> back =

gfx/layers/ipc/ISurfaceAllocator.h

@@ -60,7 +60,7 @@ enum BufferCapabilities {
 class SurfaceDescriptor;
 
 
-ipc::SharedMemory::SharedMemoryType OptimalShmemType();
+mozilla::ipc::SharedMemory::SharedMemoryType OptimalShmemType();
 bool IsSurfaceDescriptorValid(const SurfaceDescriptor& aSurface);
 bool IsSurfaceDescriptorOwned(const SurfaceDescriptor& aDescriptor);
 bool ReleaseOwnedSurfaceDescriptor(const SurfaceDescriptor& aDescriptor);
@@ -84,20 +84,20 @@ ISurfaceAllocator() {}
    * message.
    */
   virtual bool AllocShmem(size_t aSize,
-                          ipc::SharedMemory::SharedMemoryType aType,
-                          ipc::Shmem* aShmem) = 0;
+                          mozilla::ipc::SharedMemory::SharedMemoryType aType,
+                          mozilla::ipc::Shmem* aShmem) = 0;
 
   /**
    * Allocate shared memory that can be accessed by both processes at the
    * same time. Safety is left for the user of the memory to care about.
    */
   virtual bool AllocUnsafeShmem(size_t aSize,
-                                ipc::SharedMemory::SharedMemoryType aType,
-                                ipc::Shmem* aShmem) = 0;
+                                mozilla::ipc::SharedMemory::SharedMemoryType aType,
+                                mozilla::ipc::Shmem* aShmem) = 0;
   /**
    * Deallocate memory allocated by either AllocShmem or AllocUnsafeShmem.
    */
-  virtual void DeallocShmem(ipc::Shmem& aShmem) = 0;
+  virtual void DeallocShmem(mozilla::ipc::Shmem& aShmem) = 0;
 
   // was AllocBuffer
   virtual bool AllocSharedImageSurface(const gfxIntSize& aSize,

gfx/layers/ipc/ShadowLayers.h

@@ -387,12 +387,12 @@ public:
 
   // ISurfaceAllocator
   virtual bool AllocUnsafeShmem(size_t aSize,
-                                ipc::SharedMemory::SharedMemoryType aType,
-                                ipc::Shmem* aShmem) MOZ_OVERRIDE;
+                                mozilla::ipc::SharedMemory::SharedMemoryType aType,
+                                mozilla::ipc::Shmem* aShmem) MOZ_OVERRIDE;
   virtual bool AllocShmem(size_t aSize,
-                          ipc::SharedMemory::SharedMemoryType aType,
-                          ipc::Shmem* aShmem) MOZ_OVERRIDE;
-  virtual void DeallocShmem(ipc::Shmem& aShmem) MOZ_OVERRIDE;
+                          mozilla::ipc::SharedMemory::SharedMemoryType aType,
+                          mozilla::ipc::Shmem* aShmem) MOZ_OVERRIDE;
+  virtual void DeallocShmem(mozilla::ipc::Shmem& aShmem) MOZ_OVERRIDE;
 
   /**
    * Construct a shadow of |aLayer| on the "other side", at the