Support using OpenGL ES context on desktop

tests/ImageFilterTest.cpp

Index: tests/ImageFilterTest.cpp
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index cd6d235dc59d4e5638cbb1291b31dcb08da12d10..311cb4a26f05051f0a943095d6bc9df94a8b52e6 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -737,7 +737,8 @@ DEF_TEST(XfermodeImageFilterCroppedInput, 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));
@@ -745,7 +746,7 @@ DEF_GPUTEST(ImageFilterCropRectGPU, reporter, factory) {
 }
 
 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));
@@ -753,7 +754,7 @@ DEF_GPUTEST(HugeBlurImageFilterGPU, reporter, factory) {
 }
 
 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));