Plumb CanvasColorParams to canvas image classes

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/RecordingImageBufferSurface.h"
 
 #include <memory>
 #include "platform/WebTaskRunner.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBuffer.h"
@@ skipping 14 matching lines @@
 
 namespace blink {
 
 class MockSurfaceFactory : public RecordingImageBufferFallbackSurfaceFactory {
  public:
   MockSurfaceFactory() : create_surface_count_(0) {}
 
   virtual std::unique_ptr<ImageBufferSurface> CreateSurface(
       const IntSize& size,
       OpacityMode opacity_mode,
-      sk_sp<SkColorSpace> color_space,
-      SkColorType color_type) {
+      const CanvasColorParams& color_params) {
     create_surface_count_++;
     return WTF::WrapUnique(new UnacceleratedImageBufferSurface(
-        size, opacity_mode, kInitializeImagePixels, std::move(color_space),
-        color_type));
+        size, opacity_mode, kInitializeImagePixels, color_params));
   }
 
   virtual ~MockSurfaceFactory() {}
 
   int CreateSurfaceCount() { return create_surface_count_; }
 
  private:
   int create_surface_count_;
 };
 
 class RecordingImageBufferSurfaceTest : public Test {
  protected:
   RecordingImageBufferSurfaceTest() {
     std::unique_ptr<MockSurfaceFactory> surface_factory =
         WTF::MakeUnique<MockSurfaceFactory>();
     surface_factory_ = surface_factory.get();
     std::unique_ptr<RecordingImageBufferSurface> test_surface =
         WTF::WrapUnique(new RecordingImageBufferSurface(
-            IntSize(10, 10), std::move(surface_factory), kNonOpaque, nullptr));
+            IntSize(10, 10), std::move(surface_factory), kNonOpaque));
     test_surface_ = test_surface.get();
     // We create an ImageBuffer in order for the testSurface to be
     // properly initialized with a GraphicsContext
     image_buffer_ = ImageBuffer::Create(std::move(test_surface));
     EXPECT_FALSE(!image_buffer_);
     test_surface_->InitializeCurrentFrame();
   }
 
  public:
   RecordingImageBufferSurface* TestSurface() { return test_surface_; }
@@ skipping 65 matching lines @@
   clear_flags.setBlendMode(SkBlendMode::kClear);
   Canvas()->drawRect(SkRect::MakeWH(TestSurface()->size().Width(),
                                     TestSurface()->size().Height()),
                      clear_flags);
   TestSurface()->DidDraw(FloatRect(0, 0, 1, 1));
   TestSurface()->GetRecord();
   ExpectDisplayListEnabled(true);
 }
 
 }  // namespace blink