From 950e37c5e79c750ea35d5cecd0e2176538deb23c Mon Sep 17 00:00:00 2001
From: Attila Craciun <acraciun@mozilla.com>
Date: Thu, 26 Oct 2017 16:40:41 +0300
Subject: [PATCH] Backed out 1 changesets (bug 1410766) for failing Reftest in
 reftest/tests/layout/reftests/bugs/409084-1a.html r=backout on a CLOSED TREE.

Backed out changeset 6eac731d5c33 (bug 1410766)
---
 gfx/ipc/GPUParent.cpp         | 11 -----------
 gfx/ipc/GPUParent.h           |  1 -
 gfx/ipc/GPUProcessManager.cpp |  4 ----
 gfx/ipc/PGPU.ipdl             |  4 ----
 ipc/ipdl/sync-messages.ini    |  2 --
 5 files changed, 22 deletions(-)

diff --git a/gfx/ipc/GPUParent.cpp b/gfx/ipc/GPUParent.cpp
index 81672b0682b3..1a60cd23adbe 100644
--- a/gfx/ipc/GPUParent.cpp
+++ b/gfx/ipc/GPUParent.cpp
@@ -330,17 +330,6 @@ GPUParent::RecvGetDeviceStatus(GPUDeviceData* aOut)
   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)
 {
diff --git a/gfx/ipc/GPUParent.h b/gfx/ipc/GPUParent.h
index cee283cf1195..50d71cd1086c 100644
--- a/gfx/ipc/GPUParent.h
+++ b/gfx/ipc/GPUParent.h
@@ -48,7 +48,6 @@ public:
   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;
diff --git a/gfx/ipc/GPUProcessManager.cpp b/gfx/ipc/GPUProcessManager.cpp
index 0a3dd42f240f..f6ab6cc4e4e0 100644
--- a/gfx/ipc/GPUProcessManager.cpp
+++ b/gfx/ipc/GPUProcessManager.cpp
@@ -421,10 +421,6 @@ GPUProcessManager::SimulateDeviceReset()
   gfxPlatform::GetPlatform()->CompositorUpdated();
 
   if (mProcess) {
-    GPUDeviceData data;
-    if (mGPUChild->SendSimulateDeviceReset(&data)) {
-      gfxPlatform::GetPlatform()->ImportGPUDeviceData(data);
-    }
     OnRemoteProcessDeviceReset(mProcess);
   } else {
     OnInProcessDeviceReset();
diff --git a/gfx/ipc/PGPU.ipdl b/gfx/ipc/PGPU.ipdl
index cd0464d5f1a3..2527aa3ac0a4 100644
--- a/gfx/ipc/PGPU.ipdl
+++ b/gfx/ipc/PGPU.ipdl
@@ -80,10 +80,6 @@ parent:
   // 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);
diff --git a/ipc/ipdl/sync-messages.ini b/ipc/ipdl/sync-messages.ini
index c47a7f845610..0483c0fc1f93 100644
--- a/ipc/ipdl/sync-messages.ini
+++ b/ipc/ipdl/sync-messages.ini
@@ -930,8 +930,6 @@ description =
 description =
 [PGPU::GetDeviceStatus]
 description =
-[PGPU::SimulateDeviceReset]
-description =
 [PAPZCTreeManager::ReceiveMultiTouchInputEvent]
 description =
 [PAPZCTreeManager::ReceiveMouseInputEvent]