Revert "Ensure our transaction arrives at the compositor before asking the parent to paint"

This reverts commit e0ec2a72700f.
This commit is contained in:
Jeff Muizelaar 2017-05-17 10:44:33 -04:00
Родитель b2c7a3fec1
Коммит 0ed20eff4a
11 изменённых файлов: 1 добавлений и 39 удалений

Просмотреть файл

@ -338,7 +338,6 @@ nsDOMWindowUtils::UpdateLayerTree()
if (view) {
presShell->Paint(view, view->GetBounds(),
nsIPresShell::PAINT_LAYERS | nsIPresShell::PAINT_SYNC_DECODE_IMAGES);
presShell->GetLayerManager()->WaitOnTransactionProcessed();
}
}
return NS_OK;

Просмотреть файл

@ -596,11 +596,6 @@ public:
*/
virtual void FlushRendering() { }
/**
* Make sure that the previous transaction has been
* received. This will synchronsly wait on a remote compositor. */
virtual void WaitOnTransactionProcessed() { }
virtual void SendInvalidRegion(const nsIntRegion& aRegion) {}
/**

Просмотреть файл

@ -656,14 +656,6 @@ ClientLayerManager::FlushRendering()
}
}
void
ClientLayerManager::WaitOnTransactionProcessed()
{
CompositorBridgeChild* remoteRenderer = GetCompositorBridgeChild();
if (remoteRenderer) {
remoteRenderer->SendWaitOnTransactionProcessed();
}
}
void
ClientLayerManager::UpdateTextureFactoryIdentifier(const TextureFactoryIdentifier& aNewIdentifier,
uint64_t aDeviceResetSeqNo)

Просмотреть файл

@ -114,7 +114,6 @@ public:
}
virtual void FlushRendering() override;
virtual void WaitOnTransactionProcessed() override;
virtual void SendInvalidRegion(const nsIntRegion& aRegion) override;
virtual uint32_t StartFrameTimeRecording(int32_t aBufferSize) override;

Просмотреть файл

@ -523,12 +523,6 @@ CompositorBridgeParent::RecvMakeSnapshot(const SurfaceDescriptor& aInSnapshot,
return IPC_OK();
}
mozilla::ipc::IPCResult
CompositorBridgeParent::RecvWaitOnTransactionProcessed()
{
return IPC_OK();
}
mozilla::ipc::IPCResult
CompositorBridgeParent::RecvFlushRendering()
{

Просмотреть файл

@ -199,7 +199,6 @@ public:
const gfx::IntRect& aRect) override;
virtual mozilla::ipc::IPCResult RecvFlushRendering() override;
virtual mozilla::ipc::IPCResult RecvFlushRenderingAsync() override;
virtual mozilla::ipc::IPCResult RecvWaitOnTransactionProcessed() override;
virtual mozilla::ipc::IPCResult RecvForcePresent() override;
virtual mozilla::ipc::IPCResult RecvNotifyRegionInvalidated(const nsIntRegion& aRegion) override;

Просмотреть файл

@ -60,7 +60,6 @@ public:
virtual mozilla::ipc::IPCResult RecvFlushRendering() override { return IPC_OK(); }
virtual mozilla::ipc::IPCResult RecvFlushRenderingAsync() override { return IPC_OK(); }
virtual mozilla::ipc::IPCResult RecvForcePresent() override { return IPC_OK(); }
virtual mozilla::ipc::IPCResult RecvWaitOnTransactionProcessed() override { return IPC_OK(); }
virtual mozilla::ipc::IPCResult RecvNotifyRegionInvalidated(const nsIntRegion& aRegion) override { return IPC_OK(); }
virtual mozilla::ipc::IPCResult RecvStartFrameTimeRecording(const int32_t& aBufferSize, uint32_t* aOutStartIndex) override { return IPC_OK(); }
virtual mozilla::ipc::IPCResult RecvStopFrameTimeRecording(const uint32_t& aStartIndex, InfallibleTArray<float>* intervals) override { return IPC_OK(); }

Просмотреть файл

@ -194,9 +194,6 @@ parent:
// synchronous repaints on resize.
async FlushRenderingAsync();
// Make sure any pending composites have been received.
sync WaitOnTransactionProcessed();
// Force an additional frame presentation to be executed. This is used to
// work around a windows presentation bug (See Bug 1232042)
async ForcePresent();

Просмотреть файл

@ -107,7 +107,7 @@ WebRenderLayerManager::~WebRenderLayerManager()
CompositorBridgeChild*
WebRenderLayerManager::GetCompositorBridgeChild()
{
return WrBridge()->GetCompositorBridgeChild();
return mWidget ? mWidget->GetRemoteRenderer() : nullptr;
}
int32_t
@ -472,15 +472,6 @@ WebRenderLayerManager::FlushRendering()
}
}
void
WebRenderLayerManager::WaitOnTransactionProcessed()
{
CompositorBridgeChild* bridge = GetCompositorBridgeChild();
if (bridge) {
bridge->SendWaitOnTransactionProcessed();
}
}
void
WebRenderLayerManager::SendInvalidRegion(const nsIntRegion& aRegion)
{

Просмотреть файл

@ -88,7 +88,6 @@ public:
virtual void RemoveDidCompositeObserver(DidCompositeObserver* aObserver) override;
virtual void FlushRendering() override;
virtual void WaitOnTransactionProcessed() override;
virtual void SendInvalidRegion(const nsIntRegion& aRegion) override;

Просмотреть файл

@ -995,8 +995,6 @@ description =
description =
[PCompositorBridge::FlushRendering]
description =
[PCompositorBridge::WaitOnTransactionProcessed]
description = bug 1364626
[PCompositorBridge::StartFrameTimeRecording]
description =
[PCompositorBridge::StopFrameTimeRecording]