Fix BaseRenderingContext2D create/put/get-ImageData() for color managed canvas

third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h

 // Copyright 2016 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.
 
 #ifndef BaseRenderingContext2D_h
 #define BaseRenderingContext2D_h
 
 #include "bindings/modules/v8/CSSImageValueOrHTMLImageElementOrSVGImageElementOrHTMLVideoElementOrHTMLCanvasElementOrImageBitmapOrOffscreenCanvas.h"
 #include "bindings/modules/v8/StringOrCanvasGradientOrCanvasPattern.h"
 #include "core/html/ImageData.h"
+#include "core/html/canvas/CanvasRenderingContext.h"
 #include "modules/ModulesExport.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPathMethods.h"
 #include "modules/canvas2d/CanvasRenderingContext2DState.h"
 #include "modules/canvas2d/CanvasStyle.h"
 #include "platform/graphics/ColorBehavior.h"
 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"
 #include "platform/graphics/paint/PaintCanvas.h"
 #include "third_party/skia/include/effects/SkComposeImageFilter.h"
 
@@ skipping 346 matching lines @@
   static bool isFullCanvasCompositeMode(SkBlendMode);
 
   template <typename DrawFunc>
   void compositedDraw(const DrawFunc&,
                       PaintCanvas*,
                       CanvasRenderingContext2DState::PaintType,
                       CanvasRenderingContext2DState::ImageType);
 
   void clearCanvas();
   bool rectContainsTransformedRect(const FloatRect&, const SkIRect&) const;
+
+  virtual const CanvasRenderingContext* renderingContext() const {

[fserb, 2017/04/07 20:03:33]

talking to junov@ offline, I don't think we should do this.
The current inheritance situation is a bit messy, and we are thinking of ways to
solve this, but I think adding a renderingContext() here is going to make it
messier.

Could you please add the virtual methods you need (colorSpaceAsString() and
pixelFormat() with reasonable defaults) instead and implement them on the
*Context2D classes?

That way, we keep BaseRenderingContext2D independent of CanvasRenderingContext
and then, once we solve the bigger inheritance issue (i.e., having a proper base
class for Canvas and OffscreenCanvas), we can move it all there. 

+    return nullptr;
+  }
+
+  bool colorSettingsAsImageDataColorSettings(ImageDataColorSettings&) const;
+
+  bool m_isColorManaged;
 };
 
 template <typename DrawFunc, typename ContainsFunc>
 bool BaseRenderingContext2D::draw(
     const DrawFunc& drawFunc,
     const ContainsFunc& drawCoversClipBounds,
     const SkRect& bounds,
     CanvasRenderingContext2DState::PaintType paintType,
     CanvasRenderingContext2DState::ImageType imageType) {
   if (!state().isTransformInvertible())
@@ skipping 79 matching lines @@
   foregroundFlags.setBlendMode(SkBlendMode::kSrcOver);
   c->setMatrix(ctm);
   drawFunc(c, &foregroundFlags);
   c->restore();
   c->setMatrix(ctm);
 }
 
 }  // namespace blink
 
 #endif  // BaseRenderingContext2D_h