Support using OpenGL ES context on desktop

tests/ImageFilterTest.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 "SkBicubicImageFilter.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
@@ skipping 719 matching lines @@
 
 DEF_TEST(XfermodeImageFilterCroppedInput, reporter) {
     SkBitmap temp;
     temp.allocN32Pixels(100, 100);
     SkBitmapDevice device(temp);
     test_xfermode_cropped_input(&device, reporter);
 }
 
 #if SK_SUPPORT_GPU
 DEF_GPUTEST(ImageFilterCropRectGPU, reporter, factory) {
-    GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
+    GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0),
+                                      kNone_GrGLStandard);
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkImageInfo::MakeN32Premul(100, 100),
                                                          0));
     test_crop_rects(device, reporter);
 }
 
 DEF_GPUTEST(HugeBlurImageFilterGPU, reporter, factory) {

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

nits: this and the next are overlength

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

Done.

-    GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
+    GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0), kNone_GrGLStandard);
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkImageInfo::MakeN32Premul(100, 100),
                                                          0));
     test_huge_blur(device, reporter);
 }
 
 DEF_GPUTEST(XfermodeImageFilterCroppedInputGPU, reporter, factory) {
-    GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
+    GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0), kNone_GrGLStandard);
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkImageInfo::MakeN32Premul(1, 1),
                                                          0));
     test_xfermode_cropped_input(device, reporter);
 }
 #endif