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"

[fserb, 2017/04/11 03:21:44]

no need for this anymore.

[zakerinasab, 2017/04/11 19:52:59]

Done.

 #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 210 matching lines @@
   virtual void ValidateStateStack() const = 0;
 
   virtual bool HasAlpha() const = 0;
 
   virtual bool isContextLost() const = 0;
 
   virtual ColorBehavior DrawImageColorBehavior() const = 0;
 
   virtual void WillDrawImage(CanvasImageSource*) const {}
 
+  virtual CanvasColorSpace ColorSpace() const {
+    return kLegacyCanvasColorSpace;
+  };
+  virtual String ColorSpaceAsString() const {
+    return kLegacyCanvasColorSpaceName;
+  }
+  virtual CanvasPixelFormat PixelFormat() const {
+    return kRGBA8CanvasPixelFormat;
+  }
+
   void RestoreMatrixClipStack(PaintCanvas*) const;
 
   DECLARE_VIRTUAL_TRACE();
 
   enum DrawCallType {
     kStrokePath = 0,
     kFillPath,
     kDrawVectorImage,
     kDrawBitmapImage,
     kFillText,
@@ skipping 114 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;
+
+  bool ColorSettingsAsImageDataColorSettings(ImageDataColorSettings&) const;

[fserb, 2017/04/11 03:21:44]

can we name this with a verb? Do you mean something like
"(Update|Set)ImageDataColorSetting"?
Also, the semantic of this return is very weird. And you are just doing the
is_color_managed_ check twice when you call it. 
If the semantics is "has the settings changed", then the function needs to be
updated. Maybe return void here?

[zakerinasab, 2017/04/11 19:52:59]

This method converts the canvas color settings (if valid) to an image data color
settings. is_color_managed_ must be called on the call site, but it's checked
again to be safe. I'll remove it. On another thought, we can assume that if
something is wrong with canvas color settings, we can continue with the default
color space settings for image data. I'll simplify the method to reflect this
behavior.

+
+  bool is_color_managed_;
 };
 
 template <typename DrawFunc, typename ContainsFunc>
 bool BaseRenderingContext2D::Draw(
     const DrawFunc& draw_func,
     const ContainsFunc& draw_covers_clip_bounds,
     const SkRect& bounds,
     CanvasRenderingContext2DState::PaintType paint_type,
     CanvasRenderingContext2DState::ImageType image_type) {
   if (!GetState().IsTransformInvertible())
@@ skipping 79 matching lines @@
   foreground_flags.setBlendMode(SkBlendMode::kSrcOver);
   c->setMatrix(ctm);
   draw_func(c, &foreground_flags);
   c->restore();
   c->setMatrix(ctm);
 }
 
 }  // namespace blink
 
 #endif  // BaseRenderingContext2D_h