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

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

Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
index 3b2703f77018436063a8469e49b4f5ce5279dba3..dae7dd3a4fd4c4a1a83028c9a7b6db4480eb14a8 100644
--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
@@ -8,6 +8,7 @@
 #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"
@@ -238,6 +239,16 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
 
   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();
@@ -372,6 +383,10 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin,
 
   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>