Plumb CanvasColorParams to canvas image classes

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

 /*
  * Copyright (C) 2012 Google 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
@@ skipping 75 matching lines @@
     kDisableAcceleration,
     kEnableAcceleration,
     kForceAccelerationForTesting,
   };
 
   Canvas2DLayerBridge(std::unique_ptr<WebGraphicsContext3DProvider>,
                       const IntSize&,
                       int msaa_sample_count,
                       OpacityMode,
                       AccelerationMode,
-                      const gfx::ColorSpace&,
-                      bool sk_surfaces_use_color_space,
-                      SkColorType);
+                      const CanvasColorParams&);
 
   ~Canvas2DLayerBridge() override;
 
   // cc::TextureLayerClient implementation.
   bool PrepareTextureMailbox(cc::TextureMailbox* out_mailbox,
                              std::unique_ptr<cc::SingleReleaseCallback>*
                                  out_release_callback) override;
 
   // Callback for mailboxes given to the compositor from PrepareTextureMailbox.
   void MailboxReleased(const gpu::Mailbox&,
@@ skipping 25 matching lines @@
   void FlushGpu();
   bool IsHidden() { return is_hidden_; }
   OpacityMode GetOpacityMode() { return opacity_mode_; }
   void DontUseIdleSchedulingForTesting() {
     dont_use_idle_scheduling_for_testing_ = true;
   }
 
   void BeginDestruction();
   void Hibernate();
   bool IsHibernating() const { return hibernation_image_.get(); }
-  sk_sp<SkColorSpace> SkSurfaceColorSpace() const;
-  SkColorType ColorType() const { return color_type_; }
+  const CanvasColorParams& color_params() const { return color_params_; }
 
   bool HasRecordedDrawCommands() { return have_recorded_draw_commands_; }
 
   sk_sp<SkImage> NewImageSnapshot(AccelerationHint, SnapshotReason);
 
   // The values of the enum entries must not change because they are used for
   // usage metrics histograms. New values can be added to the end.
   enum HibernationEvent {
     kHibernationScheduled = 0,
     kHibernationAbortedDueToDestructionWhileHibernatePending = 1,
@@ skipping 123 matching lines @@
     // but sometimes we may have three due to the async nature of mailbox
     // handling.
     kMaxActiveMailboxes = 3,
   };
 
   Deque<MailboxInfo, kMaxActiveMailboxes> mailboxes_;
   GLenum last_filter_;
   AccelerationMode acceleration_mode_;
   OpacityMode opacity_mode_;
   const IntSize size_;
-  // The color space that the compositor is to use. This will always be
-  // defined.
-  gfx::ColorSpace color_space_;
-  bool sk_surfaces_use_color_space_ = false;
-  SkColorType color_type_;
+  CanvasColorParams color_params_;
   int recording_pixel_count_;
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
   // Each element in this vector represents an IOSurface backed texture that
   // is ready to be reused.
   // Elements in this vector can safely be purged in low memory conditions.
   Vector<RefPtr<ImageInfo>> image_info_cache_;
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 };
 
 }  // namespace blink
 
 #endif