author | Sebastian Hengst <archaeopteryx@coole-files.de> |
Thu, 26 Oct 2017 23:39:23 +0200 | |
changeset 388490 | d7d02c88c7ba1d210364d296162f3ac2740672c4 |
parent 388489 | a0871b1ac380a3a3f39ad1484e2e7ce75e965453 |
child 388564 | 2a4d68ea7350a2aa6a3723065d5d338215e34e9e |
push id | 96656 |
push user | archaeopteryx@coole-files.de |
push date | Thu, 26 Oct 2017 21:40:14 +0000 |
treeherder | mozilla-inbound@d7d02c88c7ba [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | backout |
bugs | 1410766 |
milestone | 58.0a1 |
backs out | 817727beee91be77dec6f11791b6f126d3cdf17c |
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/ipc/GPUParent.cpp +++ b/gfx/ipc/GPUParent.cpp @@ -326,27 +326,16 @@ GPUParent::RecvGetDeviceStatus(GPUDevice #else aOut->gpuDevice() = null_t(); #endif return IPC_OK(); } mozilla::ipc::IPCResult -GPUParent::RecvSimulateDeviceReset(GPUDeviceData* aOut) -{ -#if defined(XP_WIN) - DeviceManagerDx::Get()->ForceDeviceReset(ForcedDeviceResetReason::COMPOSITOR_UPDATED); - DeviceManagerDx::Get()->MaybeResetAndReacquireDevices(); -#endif - RecvGetDeviceStatus(aOut); - return IPC_OK(); -} - -mozilla::ipc::IPCResult GPUParent::RecvNewContentCompositorManager(Endpoint<PCompositorManagerParent>&& aEndpoint) { CompositorManagerParent::Create(Move(aEndpoint)); return IPC_OK(); } mozilla::ipc::IPCResult GPUParent::RecvNewContentImageBridge(Endpoint<PImageBridgeParent>&& aEndpoint)
--- a/gfx/ipc/GPUParent.h +++ b/gfx/ipc/GPUParent.h @@ -43,17 +43,16 @@ public: mozilla::ipc::IPCResult RecvInitProfiler(Endpoint<PProfilerChild>&& aEndpoint) override; mozilla::ipc::IPCResult RecvUpdatePref(const GfxPrefSetting& pref) override; mozilla::ipc::IPCResult RecvUpdateVar(const GfxVarUpdate& pref) override; mozilla::ipc::IPCResult RecvNewContentCompositorManager(Endpoint<PCompositorManagerParent>&& aEndpoint) override; mozilla::ipc::IPCResult RecvNewContentImageBridge(Endpoint<PImageBridgeParent>&& aEndpoint) override; mozilla::ipc::IPCResult RecvNewContentVRManager(Endpoint<PVRManagerParent>&& aEndpoint) override; mozilla::ipc::IPCResult RecvNewContentVideoDecoderManager(Endpoint<PVideoDecoderManagerParent>&& aEndpoint) override; mozilla::ipc::IPCResult RecvGetDeviceStatus(GPUDeviceData* aOutStatus) override; - mozilla::ipc::IPCResult RecvSimulateDeviceReset(GPUDeviceData* aOutStatus) override; mozilla::ipc::IPCResult RecvAddLayerTreeIdMapping(const LayerTreeIdMapping& aMapping) override; mozilla::ipc::IPCResult RecvRemoveLayerTreeIdMapping(const LayerTreeIdMapping& aMapping) override; mozilla::ipc::IPCResult RecvNotifyGpuObservers(const nsCString& aTopic) override; mozilla::ipc::IPCResult RecvRequestMemoryReport( const uint32_t& generation, const bool& anonymize, const bool& minimizeMemoryUsage, const MaybeFileDesc& DMDFile) override;
--- a/gfx/ipc/GPUProcessManager.cpp +++ b/gfx/ipc/GPUProcessManager.cpp @@ -416,20 +416,16 @@ GPUProcessManager::ResetCompositors() void GPUProcessManager::SimulateDeviceReset() { // Make sure we rebuild environment and configuration for accelerated features. gfxPlatform::GetPlatform()->CompositorUpdated(); if (mProcess) { - GPUDeviceData data; - if (mGPUChild->SendSimulateDeviceReset(&data)) { - gfxPlatform::GetPlatform()->ImportGPUDeviceData(data); - } OnRemoteProcessDeviceReset(mProcess); } else { OnInProcessDeviceReset(); } } void GPUProcessManager::DisableWebRender(wr::WebRenderError aError)
--- a/gfx/ipc/PGPU.ipdl +++ b/gfx/ipc/PGPU.ipdl @@ -75,20 +75,16 @@ parent: // Called to notify the GPU process of who owns a layersId. sync AddLayerTreeIdMapping(LayerTreeIdMapping mapping); async RemoveLayerTreeIdMapping(LayerTreeIdMapping mapping); // Request the current DeviceStatus from the GPU process. This blocks until // one is available (i.e., Init has completed). sync GetDeviceStatus() returns (GPUDeviceData status); - // Request to simulate device reset and to get the updated DeviceStatus from - // the GPU process. This blocks until one is available (i.e., Init has completed). - sync SimulateDeviceReset() returns (GPUDeviceData status); - // Have a message be broadcasted to the GPU process by the GPU process // observer service. async NotifyGpuObservers(nsCString aTopic); async RequestMemoryReport(uint32_t generation, bool anonymize, bool minimizeMemoryUsage, MaybeFileDesc DMDFile);
--- a/ipc/ipdl/sync-messages.ini +++ b/ipc/ipdl/sync-messages.ini @@ -925,18 +925,16 @@ description = [PRemoteSpellcheckEngine::CheckAndSuggest] description = [PRemoteSpellcheckEngine::SetDictionary] description = [PGPU::AddLayerTreeIdMapping] description = [PGPU::GetDeviceStatus] description = -[PGPU::SimulateDeviceReset] -description = [PAPZCTreeManager::ReceiveMultiTouchInputEvent] description = [PAPZCTreeManager::ReceiveMouseInputEvent] description = [PAPZCTreeManager::ReceivePanGestureInputEvent] description = [PAPZCTreeManager::ReceivePinchGestureInputEvent] description =