Fix ANGLE in SampleApp

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 406 matching lines @@
     };
     for (int i = 0; i < 3 && display == EGL_NO_DISPLAY; ++i) {
         display = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,nativeDisplay, attribs[i]);
     }
     return display;
 }
 
 struct ANGLEAssembleContext {
     ANGLEAssembleContext() {
         fEGL = GetModuleHandle("libEGL.dll");
-        fGL = GetModuleHandle("libEGLESv2.dll");
+        fGL = GetModuleHandle("libGLESv2.dll");
     }
 
     bool isValid() const { return SkToBool(fEGL) && SkToBool(fGL); }
 
     HMODULE fEGL;
     HMODULE fGL;
 };
 
 static GrGLFuncPtr angle_get_gl_proc(void* ctx, const char name[]) {
     const ANGLEAssembleContext& context = *reinterpret_cast<const ANGLEAssembleContext*>(ctx);
@@ skipping 122 matching lines @@
             return false;
         }
         fANGLEInterface.reset(get_angle_gl_interface());
         if (!fANGLEInterface) {
             this->detachANGLE();
             return false;
         }
         GL_CALL(fANGLEInterface, ClearStencil(0));
         GL_CALL(fANGLEInterface, ClearColor(0, 0, 0, 0));
         GL_CALL(fANGLEInterface, StencilMask(0xffffffff));
-        GL_CALL(fANGLEInterface, Clear(GL_STENCIL_BUFFER_BIT |GL_COLOR_BUFFER_BIT));
-        if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
-            this->detachANGLE();
-            return false;
-        }
-        eglGetConfigAttrib(fDisplay, fConfig, EGL_STENCIL_SIZE, &info->fStencilBits);
-        eglGetConfigAttrib(fDisplay, fConfig, EGL_SAMPLES, &info->fSampleCount);
+        GL_CALL(fANGLEInterface, Clear(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT));
+    }
+    if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
+        this->detachANGLE();
+        return false;
+    }
+    eglGetConfigAttrib(fDisplay, fConfig, EGL_STENCIL_SIZE, &info->fStencilBits);
+    eglGetConfigAttrib(fDisplay, fConfig, EGL_SAMPLES, &info->fSampleCount);
 
-        GL_CALL(fANGLEInterface, Viewport(0, 0, SkScalarRoundToInt(this->width()),
-                                                SkScalarRoundToInt(this->height())));
-        return true;
-    }
-    return false;
+    GL_CALL(fANGLEInterface, Viewport(0, 0, SkScalarRoundToInt(this->width()),
+                                      SkScalarRoundToInt(this->height())));
+    return true;
 }
 
 void SkOSWindow::detachANGLE() {
     fANGLEInterface.reset(nullptr);
     eglMakeCurrent(fDisplay, EGL_NO_SURFACE , EGL_NO_SURFACE , EGL_NO_CONTEXT);
 
     eglDestroyContext(fDisplay, fContext);
     fContext = EGL_NO_CONTEXT;
 
     eglDestroySurface(fDisplay, fSurface);
@@ skipping 230 matching lines @@
 }
 
 void SkOSWindow::closeWindow() {
     DestroyWindow((HWND)fHWND);
     if (fFullscreen) {
         DestroyWindow((HWND)fSavedWindowState.fHWND);
     }
     gHwndToOSWindowMap.remove(fHWND);
 }
 #endif