author | George Wright <george@mozilla.com> |
Wed, 07 Sep 2016 14:09:36 -0400 | |
changeset 313765 | deaaf8536e8cdd46c7a464db586be20b5f8d3ef1 |
parent 313764 | 178a264a42febf49062cf19eebcdb046378462ce |
child 313766 | 0e86a4830af98020d503358094034baee6b8ad67 |
push id | 30697 |
push user | cbook@mozilla.com |
push date | Wed, 14 Sep 2016 10:04:12 +0000 |
treeherder | mozilla-central@de96dcebba86 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mattwoodrow |
bugs | 1297565 |
milestone | 51.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/ipc/RenderFrameParent.cpp +++ b/layout/ipc/RenderFrameParent.cpp @@ -115,21 +115,25 @@ RenderFrameParent::Init(nsFrameLoader* a mAsyncPanZoomEnabled = lm && lm->AsyncPanZoomEnabled(); TabParent* browser = TabParent::GetFrom(mFrameLoader); if (XRE_IsParentProcess()) { // Our remote frame will push layers updates to the compositor, // and we'll keep an indirect reference to that tree. browser->Manager()->AsContentParent()->AllocateLayerTreeId(browser, &mLayersId); if (lm && lm->AsClientLayerManager()) { - lm->AsClientLayerManager()->GetRemoteRenderer()->SendNotifyChildCreated(mLayersId); + if (!lm->AsClientLayerManager()->GetRemoteRenderer()->SendNotifyChildCreated(mLayersId)) { + return false; + } } } else if (XRE_IsContentProcess()) { ContentChild::GetSingleton()->SendAllocateLayerTreeId(browser->Manager()->ChildID(), browser->GetTabId(), &mLayersId); - CompositorBridgeChild::Get()->SendNotifyChildCreated(mLayersId); + if (!CompositorBridgeChild::Get()->SendNotifyChildCreated(mLayersId)) { + return false; + } } mInitted = true; return true; } bool RenderFrameParent::IsInitted()