author | George Wright <george@mozilla.com> |
Tue, 06 Sep 2016 17:27:26 -0400 | |
changeset 313854 | 178a264a42febf49062cf19eebcdb046378462ce |
parent 313853 | 24a5b1c8243ef6d36ef0196ee10eae78f26856b4 |
child 313855 | deaaf8536e8cdd46c7a464db586be20b5f8d3ef1 |
push id | 32264 |
push user | cbook@mozilla.com |
push date | Wed, 14 Sep 2016 10:18:20 +0000 |
treeherder | autoland@b9c4a0402a0a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dvander |
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/gfx/layers/ipc/CompositorBridgeChild.cpp +++ b/gfx/layers/ipc/CompositorBridgeChild.cpp @@ -249,17 +249,16 @@ CompositorBridgeChild::ChildProcessHasCo } PLayerTransactionChild* CompositorBridgeChild::AllocPLayerTransactionChild(const nsTArray<LayersBackend>& aBackendHints, const uint64_t& aId, TextureFactoryIdentifier*, bool*) { - MOZ_ASSERT(mCanSend); LayerTransactionChild* c = new LayerTransactionChild(aId); c->AddIPDLReference(); return c; } bool CompositorBridgeChild::DeallocPLayerTransactionChild(PLayerTransactionChild* actor) { @@ -689,142 +688,127 @@ CompositorBridgeChild::CancelNotifyAfter if (tabChild == aTabChild) { mWeakTabChild = nullptr; } } bool CompositorBridgeChild::SendWillClose() { - MOZ_ASSERT(mCanSend); - if (!mCanSend) { - return true; - } + MOZ_RELEASE_ASSERT(mCanSend); return PCompositorBridgeChild::SendWillClose(); } bool CompositorBridgeChild::SendPause() { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendPause(); } bool CompositorBridgeChild::SendResume() { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendResume(); } bool CompositorBridgeChild::SendNotifyChildCreated(const uint64_t& id) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendNotifyChildCreated(id); } bool CompositorBridgeChild::SendAdoptChild(const uint64_t& id) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendAdoptChild(id); } bool CompositorBridgeChild::SendMakeSnapshot(const SurfaceDescriptor& inSnapshot, const gfx::IntRect& dirtyRect) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendMakeSnapshot(inSnapshot, dirtyRect); } bool CompositorBridgeChild::SendFlushRendering() { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendFlushRendering(); } bool CompositorBridgeChild::SendStartFrameTimeRecording(const int32_t& bufferSize, uint32_t* startIndex) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendStartFrameTimeRecording(bufferSize, startIndex); } bool CompositorBridgeChild::SendStopFrameTimeRecording(const uint32_t& startIndex, nsTArray<float>* intervals) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendStopFrameTimeRecording(startIndex, intervals); } bool CompositorBridgeChild::SendNotifyRegionInvalidated(const nsIntRegion& region) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendNotifyRegionInvalidated(region); } bool CompositorBridgeChild::SendRequestNotifyAfterRemotePaint() { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendRequestNotifyAfterRemotePaint(); } bool CompositorBridgeChild::SendClearApproximatelyVisibleRegions(uint64_t aLayersId, uint32_t aPresShellId) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendClearApproximatelyVisibleRegions(aLayersId, aPresShellId); } bool CompositorBridgeChild::SendNotifyApproximatelyVisibleRegion(const ScrollableLayerGuid& aGuid, const CSSIntRegion& aRegion) { - MOZ_ASSERT(mCanSend); if (!mCanSend) { - return true; + return false; } return PCompositorBridgeChild::SendNotifyApproximatelyVisibleRegion(aGuid, aRegion); } PTextureChild* CompositorBridgeChild::AllocPTextureChild(const SurfaceDescriptor&, const LayersBackend&, const TextureFlags&,