Lots of progress switching to SkColorSpace rather than SkColorProfileType

tools/viewer/sk_app/android/GLWindowContext_android.cpp

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <GLES/gl.h> 
 
@@ skipping 81 matching lines @@
 
     // These values are the same as the corresponding VG colorspace attributes,
     // which were accepted starting in EGL 1.2. For some reason in 1.4, sRGB
     // became hidden behind an extension, but it looks like devices aren't
     // advertising that extension (including Nexus 5X). So just check version?
     const EGLint srgbWindowAttribs[] = {
         /*EGL_GL_COLORSPACE_KHR*/ 0x309D, /*EGL_GL_COLORSPACE_SRGB_KHR*/ 0x3089,
         EGL_NONE,
     };
     const EGLint* windowAttribs = nullptr;
-    if (kSRGB_SkColorProfileType == params.fProfileType && majorVersion == 1 && minorVersion >= 2) {
+    auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+    if (srgbColorSpace == params.fColorSpace && majorVersion == 1 && minorVersion >= 2) {
         windowAttribs = srgbWindowAttribs;
     }
 
     fSurface = eglCreateWindowSurface(fDisplay, surfaceConfig, fNativeWindow, windowAttribs);
     if (EGL_NO_SURFACE == fSurface && windowAttribs) {
         // Try again without sRGB
         fSurface = eglCreateWindowSurface(fDisplay, surfaceConfig, fNativeWindow, nullptr);
     }
     SkASSERT(EGL_NO_SURFACE != fSurface);
 
@@ skipping 26 matching lines @@
     fSurface = EGL_NO_SURFACE;
 }
 
 void GLWindowContext_android::onSwapBuffers() {
     if (fDisplay && fEGLContext && fSurface) {
         eglSwapBuffers(fDisplay, fSurface);
     }
 }
 
 }