From c24507a6c0a2fb3cbfbba8079241d712a125fce3 Mon Sep 17 00:00:00 2001
From: sotaro <sotaro.ikeda.g@gmail.com>
Date: Tue, 27 Feb 2018 13:06:03 +0900
Subject: [PATCH] Bug 1441056 - backout because of build failure on MinGW

---
 .../RenderCompositorANGLE.cpp                 | 30 ++-----------------
 .../RenderCompositorANGLE.h                   |  1 -
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/gfx/webrender_bindings/RenderCompositorANGLE.cpp b/gfx/webrender_bindings/RenderCompositorANGLE.cpp
index 3226f181033a..e20d7cab7c6a 100644
--- a/gfx/webrender_bindings/RenderCompositorANGLE.cpp
+++ b/gfx/webrender_bindings/RenderCompositorANGLE.cpp
@@ -45,37 +45,10 @@ RenderCompositorANGLE::~RenderCompositorANGLE()
   MOZ_ASSERT(!mEGLSurface);
 }
 
-ID3D11Device*
-RenderCompositorANGLE::GetDeviceOfEGLDisplay()
-{
-  const auto& egl = &gl::sEGLLibrary;
-
-  // Fetch the D3D11 device.
-  EGLDeviceEXT eglDevice = nullptr;
-  egl->fQueryDisplayAttribEXT(egl->Display(), LOCAL_EGL_DEVICE_EXT, (EGLAttrib*)&eglDevice);
-  MOZ_ASSERT(eglDevice);
-  ID3D11Device* device = nullptr;
-  egl->fQueryDeviceAttribEXT(eglDevice, LOCAL_EGL_D3D11_DEVICE_ANGLE, (EGLAttrib*)&device);
-  if (!device) {
-    gfxCriticalNote << "Failed to get D3D11Device from EGLDisplay";
-    return false;
-  }
-  return device;
-}
-
 bool
 RenderCompositorANGLE::Initialize()
 {
-  const auto& egl = &gl::sEGLLibrary;
-
-  nsCString discardFailureId;
-  if (!egl->EnsureInitialized(/* forceAccel */ true, &discardFailureId)) {
-    gfxCriticalNote << "Failed to load EGL library: " << discardFailureId.get();
-    return false;
-  }
-
-  mDevice = GetDeviceOfEGLDisplay();
-
+  mDevice = gfx::DeviceManagerDx::Get()->GetCompositorDevice();
   if (!mDevice) {
     gfxCriticalNote << "[D3D11] failed to get compositor device.";
     return false;
@@ -169,6 +142,7 @@ RenderCompositorANGLE::Initialize()
 
   // Create GLContext with dummy EGLSurface, the EGLSurface is not used.
   // Instread we override it with EGLSurface of SwapChain's back buffer.
+  nsCString discardFailureId;
   mGL = gl::GLContextProviderEGL::CreateHeadless(flags, &discardFailureId);
   if (!mGL || !mGL->IsANGLE()) {
     gfxCriticalNote << "Failed ANGLE GL context creation for WebRender: " << gfx::hexa(mGL.get());
diff --git a/gfx/webrender_bindings/RenderCompositorANGLE.h b/gfx/webrender_bindings/RenderCompositorANGLE.h
index 0d811fc03958..880a81ecb2bc 100644
--- a/gfx/webrender_bindings/RenderCompositorANGLE.h
+++ b/gfx/webrender_bindings/RenderCompositorANGLE.h
@@ -44,7 +44,6 @@ protected:
   void WaitForPreviousPresentQuery();
   bool ResizeBufferIfNeeded();
   void DestroyEGLSurface();
-  ID3D11Device* GetDeviceOfEGLDisplay();
 
   RefPtr<gl::GLContext> mGL;
   EGLConfig mEGLConfig;