Support using OpenGL ES context on desktop

tests/SurfaceTest.cpp

Index: tests/SurfaceTest.cpp
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 3f61f89abebd21df1ca23361165a6a3bb52d1b22..9b83bcdb462808e5ffedff06de30a5d4ddffe829 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -168,7 +168,7 @@ static void test_canvaspeek(skiatest::Reporter* reporter,
 
     GrContext* context = NULL;
 #if SK_SUPPORT_GPU
-    context = factory->get(GrContextFactory::kNative_GLContextType);
+    context = factory->get(GrContextFactory::kNative_GLContextType, kNone_GrGLStandard);
 #endif
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
@@ -425,7 +425,7 @@ DEF_GPUTEST(Surface, reporter, factory) {
 #if SK_SUPPORT_GPU
     TestGetTexture(reporter, kRaster_SurfaceType, NULL);
     if (NULL != factory) {

[robertphillips, 2014/06/09 14:31:05]

nit: overlength

[Kimmo Kinnunen, 2014/06/16 12:36:40]

Done.

-        GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
+        GrContext* context = factory->get(GrContextFactory::kNative_GLContextType, kNone_GrGLStandard);
         if (NULL != context) {
             TestSurfaceInCache(reporter, kGpu_SurfaceType, context);
             TestSurfaceInCache(reporter, kGpuScratch_SurfaceType, context);