color: Perform color transform in ImageBufferSurface

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

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/wtf/PassRefPtr.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 namespace blink {
 
 UnacceleratedImageBufferSurface::UnacceleratedImageBufferSurface(
     const IntSize& size,
     OpacityMode opacity_mode,
     ImageInitializationMode initialization_mode,
     const CanvasColorParams& color_params)
     : ImageBufferSurface(size, opacity_mode, color_params) {
   SkAlphaType alpha_type =
       (kOpaque == opacity_mode) ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
   SkImageInfo info = SkImageInfo::Make(
       size.Width(), size.Height(), color_params.GetSkColorType(), alpha_type,
       color_params.GetSkColorSpaceForSkSurfaces());
   SkSurfaceProps disable_lcd_props(0, kUnknown_SkPixelGeometry);
   surface_ = SkSurface::MakeRaster(
       info, kOpaque == opacity_mode ? 0 : &disable_lcd_props);
 
   if (!surface_)
     return;
 
   // Always save an initial frame, to support resetting the top level matrix
   // and clip.
-  canvas_ = WTF::WrapUnique(new SkiaPaintCanvas(surface_->getCanvas()));
+  canvas_ = WTF::WrapUnique(new SkiaPaintCanvas(
+      surface_->getCanvas(),
+      RuntimeEnabledFeatures::colorCorrectRenderingEnabled() &&

[Justin Novosad, 2017/05/29 14:45:35]

Any tests for this?  Does it affect layout tests under
virtual/color_space/fast/canvas/color-space?  If not we probably need an
additional test.

As a drive-by feel free to convert that to a "physical test suite".

[ccameron, 2017/05/29 15:27:17]

This patch is part of the "fix the pile of bugs that are preventing us from
enabling layout tests with --enable-color-correct-rendering".

The CL to enable the tests (which still has lots of bugs like this that are
preventing it from getting committed) is:
https://codereview.chromium.org/2889313002/

The goal of that patch is to have images/
- run with --enable-color-correct-rendering
- run with both CPU and GPU raster (as a virtual test suite for GPU)

+              color_params.UsesOutputSpaceBlending()
+          ? color_params.GetSkColorSpace()
+          : nullptr));
   canvas_->save();
 
   if (initialization_mode == kInitializeImagePixels)
     Clear();
 }
 
 UnacceleratedImageBufferSurface::~UnacceleratedImageBufferSurface() {}
 
 PaintCanvas* UnacceleratedImageBufferSurface::Canvas() {
   return canvas_.get();
@@ skipping 11 matching lines @@
   return surface_->getCanvas()->writePixels(orig_info, pixels, row_bytes, x, y);
 }
 
 sk_sp<SkImage> UnacceleratedImageBufferSurface::NewImageSnapshot(
     AccelerationHint,
     SnapshotReason) {
   return surface_->makeImageSnapshot();
 }
 
 }  // namespace blink