Support using OpenGL ES context on desktop

tests/DeferredCanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "../src/image/SkImagePriv.h"
 #include "../src/image/SkSurface_Base.h"
 #include "SkBitmap.h"
@@ skipping 674 matching lines @@
     return useGpu ? surface->getCanvas()->getDevice()->accessBitmap(false).getTexture() :
         surface->getCanvas()->getDevice()->accessBitmap(false).getPixels();
 }
 
 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
     SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10);
     SkSurface* surface;
     bool useGpu = NULL != factory;
 #if SK_SUPPORT_GPU
     if (useGpu) {
-        GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
+        GrContext* context = factory->get(GrContextFactory::kNative_GLContextType,
+                                          kNone_GrGLStandard);
         if (NULL == context) {
             return;
         }
 
         surface = SkSurface::NewRenderTarget(context, imageSpec);
     } else {
         surface = SkSurface::NewRaster(imageSpec);
     }
 #else
     SkASSERT(!useGpu);
@@ skipping 45 matching lines @@
     PixelPtr pixels5 = getSurfacePixelPtr(surface, useGpu);
     REPORTER_ASSERT(reporter, pixels4 == pixels5);
 }
 
 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
     SkImageInfo imageSpec = SkImageInfo::MakeN32Premul(10, 10);
     SkSurface* surface;
     SkSurface* alternateSurface;
     bool useGpu = NULL != factory;
 #if SK_SUPPORT_GPU
     if (useGpu) {

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

nit: overlength

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

Done. (reverted)

-        GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
+        GrContext* context = factory->get(GrContextFactory::kNative_GLContextType, kNone_GrGLStandard);
         if (NULL == context) {
             return;
         }
         surface = SkSurface::NewRenderTarget(context, imageSpec);
         alternateSurface = SkSurface::NewRenderTarget(context, imageSpec);
     } else {
         surface = SkSurface::NewRaster(imageSpec);
         alternateSurface = SkSurface::NewRaster(imageSpec);
     }
 #else
@@ skipping 58 matching lines @@
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
 }
 
 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) {
     if (factory != NULL) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }
 }