Support using OpenGL ES context on desktop

tests/SurfaceTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkImageEncoder.h"
@@ skipping 150 matching lines @@
         { kGpu_SurfaceType,             false   },
         { kGpuScratch_SurfaceType,      false   },
 #endif
     };
 
     const SkColor color = SK_ColorRED;
     const SkPMColor pmcolor = SkPreMultiplyColor(color);
 
     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) {
         SkImageInfo info, requestInfo;
         size_t rowBytes;
 
         SkAutoTUnref<SkSurface> surface(createSurface(gRec[i].fType, context,
                                                       &requestInfo));
         surface->getCanvas()->clear(color);
 
@@ skipping 235 matching lines @@
     TestSurfaceCopyOnWrite(reporter, kRaster_SurfaceType, NULL);
     TestSurfaceWritableAfterSnapshotRelease(reporter, kRaster_SurfaceType, NULL);
     TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kDiscard_ContentChangeMode);
     TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kRetain_ContentChangeMode);
 
     test_imagepeek(reporter);
     test_canvaspeek(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);
             Test_crbug263329(reporter, kGpu_SurfaceType, context);
             Test_crbug263329(reporter, kGpuScratch_SurfaceType, context);
             TestSurfaceCopyOnWrite(reporter, kGpu_SurfaceType, context);
             TestSurfaceCopyOnWrite(reporter, kGpuScratch_SurfaceType, context);
             TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, context);
             TestSurfaceWritableAfterSnapshotRelease(reporter, kGpuScratch_SurfaceType, context);
             TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kDiscard_ContentChangeMode);
             TestSurfaceNoCanvas(reporter, kGpuScratch_SurfaceType, context, SkSurface::kDiscard_ContentChangeMode);
             TestSurfaceNoCanvas(reporter, kGpu_SurfaceType, context, SkSurface::kRetain_ContentChangeMode);
             TestSurfaceNoCanvas(reporter, kGpuScratch_SurfaceType, context, SkSurface::kRetain_ContentChangeMode);
             TestGetTexture(reporter, kGpu_SurfaceType, context);
             TestGetTexture(reporter, kGpuScratch_SurfaceType, context);
         }
     }
 #endif
 }