Consolidate canvas color params into a single class

third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #ifndef CanvasRenderingContext_h
 #define CanvasRenderingContext_h
 
 #include "core/CoreExport.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/canvas/CanvasContextCreationAttributes.h"
 #include "core/layout/HitTestCanvasResult.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
+#include "platform/graphics/CanvasColorParams.h"
 #include "platform/graphics/ColorBehavior.h"
 #include "platform/wtf/HashSet.h"
 #include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/text/StringHash.h"
 #include "public/platform/WebThread.h"
 #include "third_party/skia/include/core/SkColorSpace.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 
 namespace blink {
 
 class CanvasImageSource;
 class HTMLCanvasElement;
 class ImageData;
 class ImageBitmap;
 class WebLayer;
 
-enum CanvasColorSpace {
-  kLegacyCanvasColorSpace,
-  kSRGBCanvasColorSpace,
-  kRec2020CanvasColorSpace,
-  kP3CanvasColorSpace,
-};
-
-enum CanvasPixelFormat {
-  kRGBA8CanvasPixelFormat,
-  kRGB10A2CanvasPixelFormat,
-  kRGBA12CanvasPixelFormat,
-  kF16CanvasPixelFormat,
-};
-
 constexpr const char* kLegacyCanvasColorSpaceName = "legacy-srgb";
 constexpr const char* kSRGBCanvasColorSpaceName = "srgb";
 constexpr const char* kRec2020CanvasColorSpaceName = "rec2020";
 constexpr const char* kP3CanvasColorSpaceName = "p3";
 
 constexpr const char* kRGBA8CanvasPixelFormatName = "8-8-8-8";
 constexpr const char* kRGB10A2CanvasPixelFormatName = "10-10-10-2";
 constexpr const char* kRGBA12CanvasPixelFormatName = "12-12-12-12";
 constexpr const char* kF16CanvasPixelFormatName = "float16";
 
@@ skipping 21 matching lines @@
     kContextWebgl2 = 4,
     kContextImageBitmap = 5,
     kContextTypeCount,
   };
 
   static ContextType ContextTypeFromId(const String& id);
   static ContextType ResolveContextTypeAliases(ContextType);
 
   HTMLCanvasElement* canvas() const { return canvas_; }
 
-  CanvasColorSpace ColorSpace() const { return color_space_; };
+  CanvasColorSpace ColorSpace() const;
   WTF::String ColorSpaceAsString() const;
-  CanvasPixelFormat PixelFormat() const { return pixel_format_; };
+  CanvasPixelFormat PixelFormat() const;
   WTF::String PixelFormatAsString() const;
-  bool LinearPixelMath() const { return linear_pixel_math_; };
+  bool LinearPixelMath() const;
 
   // The color space in which the the content should be interpreted by the
   // compositor. This is always defined.
   gfx::ColorSpace GfxColorSpace() const;
   // The color space that should be used for SkSurface creation. This may
   // be nullptr.
   sk_sp<SkColorSpace> SkSurfaceColorSpace() const;
   SkColorType ColorType() const;
   ColorBehavior ColorBehaviorForMediaDrawnToCanvas() const;
   bool SkSurfacesUseColorSpace() const;
@@ skipping 105 matching lines @@
   DECLARE_VIRTUAL_TRACE();
   virtual void Stop() = 0;
 
  private:
   void Dispose();
 
   Member<HTMLCanvasElement> canvas_;
   Member<OffscreenCanvas> offscreen_canvas_;
   HashSet<String> clean_urls_;
   HashSet<String> dirty_urls_;
-  CanvasColorSpace color_space_;
-  CanvasPixelFormat pixel_format_;
-  bool linear_pixel_math_ = false;
+  CanvasColorParams color_params_;
   CanvasContextCreationAttributes creation_attributes_;
   bool finalize_frame_scheduled_ = false;
 };
 
 }  // namespace blink
 
 #endif