Revert of Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix…

dm/DMSrcSink.h

Index: dm/DMSrcSink.h
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index babe14d135760f08db88af3ad8b26d4a41bce115..bbf47cffd8f4871dbf05f867861314a154a4878b 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -213,8 +213,7 @@
 class GPUSink : public Sink {
 public:
     GPUSink(GrContextFactory::GLContextType, GrContextFactory::GLContextOptions,
-            int samples, bool diText, SkColorType colorType, SkColorProfileType profileType,
-            bool threaded);
+            int samples, bool diText, bool threaded);
 
     Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
     bool serial() const override { return !fThreaded; }
@@ -225,8 +224,6 @@
     GrContextFactory::GLContextOptions fContextOptions;
     int                                fSampleCount;
     bool                               fUseDIText;
-    SkColorType                        fColorType;
-    SkColorProfileType                 fProfileType;
     bool                               fThreaded;
 };