diff --git a/gfx/layers/ipc/CompositorBridgeChild.cpp b/gfx/layers/ipc/CompositorBridgeChild.cpp index dc6abe4090a6..1df19ca0f789 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.cpp +++ b/gfx/layers/ipc/CompositorBridgeChild.cpp @@ -89,8 +89,6 @@ CompositorBridgeChild::CompositorBridgeChild(CompositorManagerChild* aManager) mSectionAllocator(nullptr), mPaintLock("CompositorBridgeChild.mPaintLock"), mTotalAsyncPaints(0), - mOutstandingAsyncPaints(0), - mOutstandingAsyncEndTransaction(false), mIsDelayingForAsyncPaints(false), mSlowFlushCount(0), mTotalFlushCount(0) { @@ -757,16 +755,5 @@ wr::PipelineId CompositorBridgeChild::GetNextPipelineId() { return wr::AsPipelineId(GetNextResourceId()); } -bool CompositorBridgeChild::NotifyBeginAsyncEndLayerTransaction( - SyncObjectClient* aSyncObject) { - MOZ_ASSERT(NS_IsMainThread()); - MonitorAutoLock lock(mPaintLock); - - MOZ_ASSERT(!mOutstandingAsyncEndTransaction); - mOutstandingAsyncEndTransaction = true; - mOutstandingAsyncSyncObject = aSyncObject; - return mOutstandingAsyncPaints == 0; -} - } // namespace layers } // namespace mozilla diff --git a/gfx/layers/ipc/CompositorBridgeChild.h b/gfx/layers/ipc/CompositorBridgeChild.h index 6e72565eaffd..b6ae32260cfd 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.h +++ b/gfx/layers/ipc/CompositorBridgeChild.h @@ -200,14 +200,6 @@ class CompositorBridgeChild final : public PCompositorBridgeChild, wr::PipelineId GetNextPipelineId(); - // Must only be called from the main thread. Notifies the CompositorBridge - // that all work has been submitted to the paint thread or paint worker - // threads, and returns whether all paints are completed. If this returns - // true, then an AsyncEndLayerTransaction must be queued, otherwise once - // NotifyFinishedAsyncWorkerPaint returns true, an AsyncEndLayerTransaction - // must be executed. - bool NotifyBeginAsyncEndLayerTransaction(SyncObjectClient* aSyncObject); - private: // Private destructor, to discourage deletion outside of Release(): virtual ~CompositorBridgeChild(); @@ -286,15 +278,6 @@ class CompositorBridgeChild final : public PCompositorBridgeChild, size_t mTotalAsyncPaints; TimeStamp mAsyncTransactionBegin; - // Contains the number of outstanding asynchronous paints tied to a - // PLayerTransaction on this bridge. This is R/W on both the main and paint - // threads, and must be accessed within the paint lock. - size_t mOutstandingAsyncPaints; - - // Whether we are waiting for an async paint end transaction - bool mOutstandingAsyncEndTransaction; - RefPtr mOutstandingAsyncSyncObject; - // True if this CompositorBridge is currently delaying its messages until the // paint thread completes. This is R/W on both the main and paint threads, and // must be accessed within the paint lock.