Plumb CanvasColorParams to canvas image classes

third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h

Index: third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
index 9ac1b57d4c86335c6e1ce6e8be13abac2cf8e7d6..bc4af9dd749b095a65c5f4d22f07043030d70317 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageBufferSurface.h
@@ -33,6 +33,7 @@
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntSize.h"
+#include "platform/graphics/CanvasColorParams.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/paint/PaintCanvas.h"
 #include "platform/graphics/paint/PaintFlags.h"
@@ -43,7 +44,6 @@
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
-class SkColorSpace;
 class SkImage;
 struct SkImageInfo;
 
@@ -104,22 +104,17 @@ class PLATFORM_EXPORT ImageBufferSurface {
 
   OpacityMode GetOpacityMode() const { return opacity_mode_; }
   const IntSize& size() const { return size_; }
-  const sk_sp<SkColorSpace> ColorSpace() const { return color_space_; }
-  SkColorType ColorType() const { return color_type_; }
+  const CanvasColorParams& color_params() const { return color_params_; }
   void NotifyIsValidChanged(bool is_valid) const;
 
  protected:
-  ImageBufferSurface(const IntSize&,
-                     OpacityMode,
-                     sk_sp<SkColorSpace>,
-                     SkColorType);
+  ImageBufferSurface(const IntSize&, OpacityMode, const CanvasColorParams&);
   void Clear();
 
  private:
   OpacityMode opacity_mode_;
   IntSize size_;
-  sk_sp<SkColorSpace> color_space_;
-  SkColorType color_type_;
+  CanvasColorParams color_params_;
 };
 
 }  // namespace blink