Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 08:42:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 997367 - fix crash at CrossProcessCompositorParent::GetCompositionManager. r=roc

Browse Source
This commit is contained in:
Peter Chang 2014-04-22 19:07:00 +02:00
parent e621efc2fa
commit 98ef025ea5
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/ipc/CompositorParent.cpp
View File

@ -979,19 +979,11 @@ CompositorParent::AllocateLayerTreeId()
}
static void
EraseLayerState(uint64_t aId)
RemoveIndirectTree(uint64_t aId)
{
sIndirectLayerTrees.erase(aId);
}
/*static*/ void
CompositorParent::DeallocateLayerTreeId(uint64_t aId)
{
MOZ_ASSERT(NS_IsMainThread());
CompositorLoop()->PostTask(FROM_HERE,
NewRunnableFunction(&EraseLayerState, aId));
}
static void
UpdateControllerForLayersId(uint64_t aLayersId,
GeckoContentController* aController)
@ -1185,12 +1177,6 @@ CompositorParent::GetIndirectShadowTree(uint64_t aId)
return &cit->second;
}
static void
RemoveIndirectTree(uint64_t aId)
{
sIndirectLayerTrees.erase(aId);
}
void
CrossProcessCompositorParent::ActorDestroy(ActorDestroyReason aWhy)
{

6
gfx/layers/ipc/CompositorParent.h
View File

@ -164,12 +164,6 @@ public:
* Must run on the content main thread.
*/
static uint64_t AllocateLayerTreeId();
/**
* Release compositor-thread resources referred to by |aID|.
*
* Must run on the content main thread.
*/
static void DeallocateLayerTreeId(uint64_t aId);
/**
* Set aController as the pan/zoom callback for the subtree referred

1
layout/ipc/RenderFrameParent.cpp
View File

@ -942,7 +942,6 @@ void
RenderFrameParent::ActorDestroy(ActorDestroyReason why)
{
if (mLayersId != 0) {
CompositorParent::DeallocateLayerTreeId(mLayersId);
if (mContentController) {
// Stop our content controller from requesting repaints of our
// content.