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

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
@@ skipping 261 matching lines @@
   if (ContextLostRestoredEventsEnabled()) {
     Event* event(Event::Create(EventTypeNames::contextrestored));
     canvas()->DispatchEvent(event);
   }
 }
 
 void CanvasRenderingContext2D::WillDrawImage(CanvasImageSource* source) const {
   canvas()->WillDrawImageTo2DContext(source);
 }
 
+ImageData* CanvasRenderingContext2D::createImageData(
+    ImageData* image_data,
+    ExceptionState& exception_state) const {
+  return BaseRenderingContext2D::createImageData(image_data, exception_state);
+}
+
+ImageData* CanvasRenderingContext2D::createImageData(
+    int sw,
+    int sh,
+    ExceptionState& exception_state) const {
+  return BaseRenderingContext2D::createImageData(sw, sh, exception_state);
+}
+
+ImageData* CanvasRenderingContext2D::createImageData(
+    unsigned width,
+    unsigned height,
+    ImageDataColorSettings& color_settings,
+    ExceptionState& exception_state) const {
+  return ImageData::createImageData(width, height, color_settings,

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

I'm a bit confused why don't you have to use BaseRenderingContext2D here?
It feels to me that all those functions should disappear and just have a
BaseRenderingContext2D implementation of all of them.

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

Done.

+                                    exception_state);
+}
+
+ImageData* CanvasRenderingContext2D::createImageData(
+    ImageDataArray& data_array,
+    unsigned width,
+    unsigned height,
+    ImageDataColorSettings& color_settings,
+    ExceptionState& exception_state) const {
+  return ImageData::createImageData(data_array, width, height, color_settings,
+                                    exception_state);
+}
+
+CanvasColorSpace CanvasRenderingContext2D::ColorSpace() const {
+  return CanvasRenderingContext::ColorSpace();

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

fyi: Yeah, I'm fixing this on the next refactor. :)

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

:)

+}
+
+String CanvasRenderingContext2D::ColorSpaceAsString() const {
+  return CanvasRenderingContext::ColorSpaceAsString();
+}
+
+CanvasPixelFormat CanvasRenderingContext2D::PixelFormat() const {
+  return CanvasRenderingContext::PixelFormat();
+}
+
 ColorBehavior CanvasRenderingContext2D::DrawImageColorBehavior() const {
   return CanvasRenderingContext::ColorBehaviorForMediaDrawnToCanvas();
 }
 
 void CanvasRenderingContext2D::Reset() {
   // This is a multiple inherritance bootstrap
   BaseRenderingContext2D::Reset();
 }
 
 void CanvasRenderingContext2D::RestoreCanvasMatrixClipStack(
@@ skipping 885 matching lines @@
   }
   return true;
 }
 
 void CanvasRenderingContext2D::ResetUsageTracking() {
   UsageCounters new_counters;
   usage_counters_ = new_counters;
 }
 
 }  // namespace blink