Backed out changeset dbd3759d9489 (bug 1281775)

gfx/layers/TextureDIB.cpp

@@ -281,7 +281,7 @@ DIBTextureData*
 ShmemDIBTextureData::Create(gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
                             ClientIPCAllocator* aAllocator)
 {
-  MOZ_ASSERT(aAllocator->GetParentPid() != base::ProcessId());
+  MOZ_ASSERT(aAllocator->AsLayerForwarder()->GetParentPid() != base::ProcessId());
 
   DWORD mapSize = aSize.width * aSize.height * BytesPerPixel(aFormat);
   HANDLE fileMapping = ::CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, mapSize, NULL);
@@ -343,7 +343,7 @@ ShmemDIBTextureData::Create(gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
 
   HANDLE hostHandle = NULL;
 
-  if (!ipc::DuplicateHandle(fileMapping, aAllocator->GetParentPid(),
+  if (!ipc::DuplicateHandle(fileMapping, aAllocator->AsLayerForwarder()->GetParentPid(),
                             &hostHandle, 0, DUPLICATE_SAME_ACCESS)) {
     gfxCriticalError() << "Failed to duplicate handle to parent process for surface.";
     ::DeleteObject(bitmap);

gfx/layers/ipc/CompositorBridgeChild.h

@@ -183,8 +183,6 @@ public:
 
   virtual MessageLoop* GetMessageLoop() const override { return mMessageLoop; }
 
-  virtual base::ProcessId GetParentPid() const override { return OtherPid(); }
-
   virtual bool AllocUnsafeShmem(size_t aSize,
                                 mozilla::ipc::SharedMemory::SharedMemoryType aShmType,
                                 mozilla::ipc::Shmem* aShmem) override;

gfx/layers/ipc/ISurfaceAllocator.h

@@ -127,8 +127,6 @@ public:
 
   virtual ClientIPCAllocator* AsClientAllocator() override { return this; }
 
-  virtual base::ProcessId GetParentPid() const = 0;
-
   virtual MessageLoop * GetMessageLoop() const = 0;
 
   virtual int32_t GetMaxTextureSize() const { return gfxPrefs::MaxTextureSize(); }

gfx/layers/ipc/ImageBridgeChild.h

@@ -189,8 +189,6 @@ public:
    */
   virtual MessageLoop * GetMessageLoop() const override;
 
-  virtual base::ProcessId GetParentPid() const override { return OtherPid(); }
-
   PCompositableChild* AllocPCompositableChild(const TextureInfo& aInfo,
                                               PImageContainerChild* aChild, uint64_t* aID) override;
   bool DeallocPCompositableChild(PCompositableChild* aActor) override;

gfx/layers/ipc/ShadowLayers.h

@@ -356,7 +356,7 @@ public:
 
   virtual void CancelWaitForRecycle(uint64_t aTextureId) override;
 
-  virtual base::ProcessId GetParentPid() const override;
+  base::ProcessId GetParentPid() const;
 
   /**
    * Construct a shadow of |aLayer| on the "other side", at the