color: Perform color transform in ImageBufferSurface

third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.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/gpu/AcceleratedImageBufferSurface.h"
 
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/gpu/SharedGpuContext.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/RefPtr.h"
 #include "skia/ext/texture_handle.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 namespace blink {
 
 AcceleratedImageBufferSurface::AcceleratedImageBufferSurface(
@@ skipping 12 matching lines @@
   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::MakeRenderTarget(
       gr_context, SkBudgeted::kYes, info, 0 /* sampleCount */,
       kOpaque == opacity_mode ? nullptr : &disable_lcd_props);
   if (!surface_)
     return;
 
-  canvas_ = WTF::WrapUnique(new SkiaPaintCanvas(surface_->getCanvas()));
+  canvas_ = WTF::WrapUnique(new SkiaPaintCanvas(
+      surface_->getCanvas(),
+      RuntimeEnabledFeatures::colorCorrectRenderingEnabled() &&

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

Why is this needed? This calss is not used for rastering. It is only used as a
vehicle for WebGL snapshots.  If you are looking for the place where accelerated
2D canvases are rasterized, that place is Canvas2DLayerBridge.  IMHO, you should
create a gpu-accelerated variant of the color_space virtual test suite.

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

This looked like the right behavior for offscreen canvas:
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/offscreen...

I don't remember offhand if this was required to fix a particular layout test,
or if this was speculative. Given the SkSurface creation properties, this
definitely feels right.

+              color_params.UsesOutputSpaceBlending()
+          ? color_params.GetSkColorSpace()
+          : nullptr));
   Clear();
 
   // Always save an initial frame, to support resetting the top level matrix
   // and clip.
   canvas_->save();
 }
 
 bool AcceleratedImageBufferSurface::IsValid() const {
   return surface_ && SharedGpuContext::IsValid() &&
          context_id_ == SharedGpuContext::ContextId();
@@ skipping 15 matching lines @@
 
 bool AcceleratedImageBufferSurface::WritePixels(const SkImageInfo& orig_info,
                                                 const void* pixels,
                                                 size_t row_bytes,
                                                 int x,
                                                 int y) {
   return surface_->getCanvas()->writePixels(orig_info, pixels, row_bytes, x, y);
 }
 
 }  // namespace blink