Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't attach shadowable layers if IPDL fails to construct an actor. (bug 1314349, r=mattwoodrow)

Browse Source
This commit is contained in:
David Anderson 2016-11-06 18:50:15 -08:00
parent 4558802c65
commit 718c1c97fe
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/layers/ipc/ShadowLayerChild.cpp
View File

@ -12,20 +12,27 @@
namespace mozilla {
namespace layers {
ShadowLayerChild::ShadowLayerChild(ShadowableLayer* aLayer)
: mLayer(aLayer)
ShadowLayerChild::ShadowLayerChild()
: mLayer(nullptr)
{ }
ShadowLayerChild::~ShadowLayerChild()
{ }
void
ShadowLayerChild::SetShadowableLayer(ShadowableLayer* aLayer)
{
MOZ_ASSERT(!mLayer);
mLayer = aLayer;
}
void
ShadowLayerChild::ActorDestroy(ActorDestroyReason why)
{
MOZ_ASSERT(AncestorDeletion != why,
"shadowable layer should have been cleaned up by now");
if (AbnormalShutdown == why) {
if (AbnormalShutdown == why && mLayer) {
// This is last-ditch emergency shutdown. Just have the layer
// forget its IPDL resources; IPDL-generated code will clean up
// automatically in this case.

3
gfx/layers/ipc/ShadowLayerChild.h
View File

@ -20,9 +20,10 @@ class ShadowableLayer;
class ShadowLayerChild : public PLayerChild
{
public:
explicit ShadowLayerChild(ShadowableLayer* aLayer);
ShadowLayerChild();
virtual ~ShadowLayerChild();
void SetShadowableLayer(ShadowableLayer* aLayer);
ShadowableLayer* layer() const { return mLayer; }
protected:

9
gfx/layers/ipc/ShadowLayers.cpp
View File

@ -749,7 +749,14 @@ ShadowLayerForwarder::ConstructShadowFor(ShadowableLayer* aLayer)
if (!IPCOpen()) {
return nullptr;
}
return mShadowManager->SendPLayerConstructor(new ShadowLayerChild(aLayer));
ShadowLayerChild* child = new ShadowLayerChild();
if (!mShadowManager->SendPLayerConstructor(child)) {
return nullptr;
}
child->SetShadowableLayer(aLayer);
return child;
}
#if !defined(MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS)