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

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

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 73 matching lines @@
                                    Document& document) override {
       return new CanvasRenderingContext2D(canvas, attrs, document);
     }
     CanvasRenderingContext::ContextType GetContextType() const override {
       return CanvasRenderingContext::kContext2d;
     }
   };
 
   ~CanvasRenderingContext2D() override;
 
-  void SetCanvasGetContextResult(RenderingContext&) final;
+  void SetCanvasGetContextResult(blink::RenderingContext&) final;
 
   bool isContextLost() const override;
 
   bool ShouldAntialias() const override;
   void SetShouldAntialias(bool) override;
 
   void scrollPathIntoView();
   void scrollPathIntoView(Path2D*);
 
   void clearRect(double x, double y, double width, double height) override;
@@ skipping 88 matching lines @@
   void ResetUsageTracking();
 
   void FinalizeFrame() override { usage_counters_.num_frames_since_reset++; }
 
   bool IsPaintable() const final { return HasImageBuffer(); }
 
   ColorBehavior DrawImageColorBehavior() const final;
 
   void WillDrawImage(CanvasImageSource*) const final;
 
+  ImageData* createImageData(ImageData*, ExceptionState&) const;

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

do we need those on CanvasRenderingContext2D at all?

[zakerinasab, 2017/04/11 19:53:00]

All moved to BaseRenderingContext2D.

+  ImageData* createImageData(int, int, ExceptionState&) const;
+  ImageData* createImageData(unsigned,
+                             unsigned,
+                             ImageDataColorSettings&,
+                             ExceptionState&) const;
+  ImageData* createImageData(ImageDataArray&,
+                             unsigned,
+                             unsigned,
+                             ImageDataColorSettings&,
+                             ExceptionState&) const;
+
  protected:
   virtual void NeedsFinalizeFrame() {
     CanvasRenderingContext::NeedsFinalizeFrame();
   }
 
  private:
   friend class CanvasRenderingContext2DAutoRestoreSkCanvas;
 
   CanvasRenderingContext2D(HTMLCanvasElement*,
                            const CanvasContextCreationAttributes& attrs,
@@ skipping 17 matching lines @@
   float GetFontBaseline(const FontMetrics&) const;
 
   void DrawFocusIfNeededInternal(const Path&, Element*);
   bool FocusRingCallIsValid(const Path&, Element*);
   void DrawFocusRing(const Path&);
   void UpdateElementAccessibility(const Path&, Element*);
 
   CanvasRenderingContext::ContextType GetContextType() const override {
     return CanvasRenderingContext::kContext2d;
   }
+
+  CanvasColorSpace ColorSpace() const override;
+  String ColorSpaceAsString() const override;
+  CanvasPixelFormat PixelFormat() const override;
+
   bool Is2d() const override { return true; }
   bool IsComposited() const override;
   bool IsAccelerated() const override;
   bool HasAlpha() const override { return CreationAttributes().alpha(); }
   void SetIsHidden(bool) override;
   void Stop() final;
   DECLARE_VIRTUAL_TRACE();
 
   virtual bool IsTransformInvertible() const;
 
@@ skipping 16 matching lines @@
 
 DEFINE_TYPE_CASTS(CanvasRenderingContext2D,
                   CanvasRenderingContext,
                   context,
                   context->Is2d() && context->canvas(),
                   context.Is2d() && context.canvas());
 
 }  // namespace blink
 
 #endif  // CanvasRenderingContext2D_h