Add legacy++ to viewer (sRGB w/nonlinear blending)

BUG=skia:6242

Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277
Reviewed-on: https://skia-review.googlesource.com/9299
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

1 files changed, 9 insertions, 3 deletions

diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index fc094fcbe8..c50f75073b 100644
--- a/tools/viewer/Viewer.h
+++ b/tools/viewer/Viewer.h
@@ -32,10 +32,17 @@ public:
     bool onChar(SkUnichar c, uint32_t modifiers);
 
 private:
+    enum class ColorMode {
+        kLegacy,                                 // N32, no color management
+        kColorManagedSRGB8888_NonLinearBlending, // N32, sRGB transfer function, nonlinear blending
+        kColorManagedSRGB8888,                   // N32, sRGB transfer function, linear blending
+        kColorManagedLinearF16,                  // F16, linear transfer function, linear blending
+    };
+
     void initSlides();
     void updateTitle();
     void setBackend(sk_app::Window::BackendType);
-    void setColorMode(SkColorType, bool colorManaged);
+    void setColorMode(ColorMode);
     void setStartupSlide();
     void setupCurrentSlide(int previousSlide);
     void listNames();
@@ -75,8 +82,7 @@ private:
     sk_app::Window::BackendType fBackendType;
 
     // Color properties for slide rendering
-    SkColorType            fColorType;
-    bool                   fColorManaged;
+    ColorMode              fColorMode;
     SkColorSpacePrimaries  fColorSpacePrimaries;
 
     // transform data