Skip to content

Commit

Permalink
Bug 1322633 - Don't initialize APZ protocols unless PLayerTransaction…
Browse files Browse the repository at this point in the history
… was successfully set up. r=dvander

MozReview-Commit-ID: Ja8TsCeGZ9
staktrace committed Jan 30, 2017
1 parent 86d6d89 commit d492ef8
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions dom/ipc/TabChild.cpp
Original file line number Diff line number Diff line change
@@ -2581,6 +2581,16 @@ TabChild::InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIden
Unused << compositorChild->SendGetCompositorOptions(aLayersId, &options);
mCompositorOptions = Some(options);

mRemoteFrame = static_cast<RenderFrameChild*>(aRenderFrame);
if (aLayersId != 0) {
if (!sTabChildren) {
sTabChildren = new TabChildMap;
}
MOZ_ASSERT(!sTabChildren->Get(aLayersId));
sTabChildren->Put(aLayersId, this);
mLayersId = aLayersId;
}

ShadowLayerForwarder* lf =
mPuppetWidget->GetLayerManager(
nullptr, mTextureFactoryIdentifier.mParentBackend)
@@ -2601,21 +2611,10 @@ TabChild::InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIden
lf->IdentifyTextureHost(mTextureFactoryIdentifier);
ImageBridgeChild::IdentifyCompositorTextureHost(mTextureFactoryIdentifier);
gfx::VRManagerChild::IdentifyTextureHost(mTextureFactoryIdentifier);
InitAPZState();
}
}

mRemoteFrame = static_cast<RenderFrameChild*>(aRenderFrame);
if (aLayersId != 0) {
if (!sTabChildren) {
sTabChildren = new TabChildMap;
}
MOZ_ASSERT(!sTabChildren->Get(aLayersId));
sTabChildren->Put(aLayersId, this);
mLayersId = aLayersId;
}

InitAPZState();

nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();

0 comments on commit d492ef8

Please sign in to comment.