Revert of Lots of progress switching to SkColorSpace rather than SkColorProfileType

tools/viewer/sk_app/GLWindowContext.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 #include "SkSurface.h"
@@ skipping 29 matching lines @@
 
     SkASSERT(nullptr == fContext);
     fContext = GrContext::Create(kOpenGL_GrBackend, (GrBackendContext)fBackendContext.get());
 
     // We may not have real sRGB support (ANGLE, in particular), so check for
     // that, and fall back to L32:
     //
     // ... and, if we're using a 10-bit/channel FB0, it doesn't do sRGB conversion on write,
     // so pretend that it's non-sRGB 8888:
     fPixelConfig = fContext->caps()->srgbSupport() &&
-                   SkColorAndColorSpaceAreGammaCorrect(fDisplayParams.fColorType,
-                                                       fDisplayParams.fColorSpace.get()) &&
+                   SkColorAndProfileAreGammaCorrect(fDisplayParams.fColorType,
+                                                    fDisplayParams.fProfileType) &&
                    (fColorBits != 30) ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig;
 }
 
 void GLWindowContext::destroyContext() {
     fSurface.reset(nullptr);
     fRenderTarget.reset(nullptr);
 
     if (fContext) {
         // in case we have outstanding refs to this guy (lua?)
         fContext->abandonContext();
@@ skipping 41 matching lines @@
     this->initializeContext(nullptr, fDisplayParams);
 }
 
 void GLWindowContext::setDisplayParams(const DisplayParams& params) {
     this->destroyContext();
 
     this->initializeContext(nullptr, params);
 }
 
 }   //namespace sk_app