Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

src/views/win/SkOSWindow_win.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkTypes.h"
 
 #if defined(SK_BUILD_FOR_WIN)
 
@@ skipping 377 matching lines @@
 }
 
 void SkOSWindow::presentGL() {
     HDC dc = GetDC((HWND)fHWND);
     SwapBuffers(dc);
     ReleaseDC((HWND)fHWND, dc);
 }
 
 #if SK_ANGLE
 
-void* get_angle_egl_display(void* nativeDisplay) {
-    PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT;
-    eglGetPlatformDisplayEXT =
-        (PFNEGLGETPLATFORMDISPLAYEXTPROC)eglGetProcAddress("eglGetPlatformDisplayEXT");
-
-    // We expect ANGLE to support this extension
-    if (!eglGetPlatformDisplayEXT) {
-        return EGL_NO_DISPLAY;
-    }
-
-    EGLDisplay display = EGL_NO_DISPLAY;
-    // Try for an ANGLE D3D11 context, fall back to D3D9, and finally GL.
-    EGLint attribs[3][3] = {
-        {
-            EGL_PLATFORM_ANGLE_TYPE_ANGLE,
-            EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
-            EGL_NONE
-        },
-        {
-            EGL_PLATFORM_ANGLE_TYPE_ANGLE,
-            EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE,
-            EGL_NONE
-        },
-    };
-    for (int i = 0; i < 3 && display == EGL_NO_DISPLAY; ++i) {
-        display = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,nativeDisplay, attribs[i]);
-    }
-    return display;
-}
-
 bool create_ANGLE(EGLNativeWindowType hWnd,
                   int msaaSampleCount,
                   EGLDisplay* eglDisplay,
                   EGLContext* eglContext,
                   EGLSurface* eglSurface,
                   EGLConfig* eglConfig) {
     static const EGLint contextAttribs[] = {
         EGL_CONTEXT_CLIENT_VERSION, 2,
         EGL_NONE, EGL_NONE
     };
     static const EGLint configAttribList[] = {
         EGL_RED_SIZE,       8,
         EGL_GREEN_SIZE,     8,
         EGL_BLUE_SIZE,      8,
         EGL_ALPHA_SIZE,     8,
         EGL_DEPTH_SIZE,     8,
         EGL_STENCIL_SIZE,   8,
         EGL_NONE
     };
     static const EGLint surfaceAttribList[] = {
         EGL_NONE, EGL_NONE
     };
 
-    EGLDisplay display = get_angle_egl_display(GetDC(hWnd), false);
+    EGLDisplay display = SkANGLEGLContext::GetD3DEGLDisplay(GetDC(hWnd), false);
 
     if (EGL_NO_DISPLAY == display) {
         SkDebugf("Could not create ANGLE egl display!\n");
         return false;
     }
 
     // Initialize EGL
     EGLint majorVersion, minorVersion;
     if (!eglInitialize(display, &majorVersion, &minorVersion)) {
        return false;
@@ skipping 338 matching lines @@
 }
 
 void SkOSWindow::closeWindow() {
     DestroyWindow((HWND)fHWND);
     if (fFullscreen) {
         DestroyWindow((HWND)fSavedWindowState.fHWND);
     }
     gHwndToOSWindowMap.remove(fHWND);
 }
 #endif