Fix ImageBitmap constructor from ImageData to consider the color space tags

third_party/WebKit/Source/core/html/ImageData.cpp

Index: third_party/WebKit/Source/core/html/ImageData.cpp
diff --git a/third_party/WebKit/Source/core/html/ImageData.cpp b/third_party/WebKit/Source/core/html/ImageData.cpp
index 3cca1f6759ee7e67df9f50bd7d5853ef9427b76e..6bf23f6831e5f7e81a64648ecc773109e00a18c9 100644
--- a/third_party/WebKit/Source/core/html/ImageData.cpp
+++ b/third_party/WebKit/Source/core/html/ImageData.cpp
@@ -213,6 +213,16 @@ ImageData* ImageData::create(const IntSize& size,
   return new ImageData(size, byteArray);
 }
 
+ImageData* ImageData::create(const IntSize& size,
+                             DOMUint8ClampedArray* byteArray,
+                             const String& colorSpace) {
+  if (!ImageData::validateConstructorArguments(
+          kParamSize | kParamData | kParamColorSpace, &size, 0, 0, byteArray,
+          &colorSpace))
+    return nullptr;
+  return new ImageData(size, byteArray, colorSpace);
+}
+
 ImageData* ImageData::create(unsigned width,
                              unsigned height,
                              ExceptionState& exceptionState) {
@@ -248,30 +258,6 @@ ImageData* ImageData::create(DOMUint8ClampedArray* data,
   return new ImageData(IntSize(width, height), data);
 }
 
-ImageDataColorSpace ImageData::getImageDataColorSpace(String colorSpaceName) {
-  if (colorSpaceName == kLegacyImageDataColorSpaceName)
-    return kLegacyImageDataColorSpace;
-  if (colorSpaceName == kSRGBImageDataColorSpaceName)
-    return kSRGBImageDataColorSpace;
-  if (colorSpaceName == kLinearRGBImageDataColorSpaceName)
-    return kLinearRGBImageDataColorSpace;
-  NOTREACHED();
-  return kLegacyImageDataColorSpace;
-}
-
-String ImageData::getImageDataColorSpaceName(ImageDataColorSpace colorSpace) {
-  switch (colorSpace) {
-    case kLegacyImageDataColorSpace:
-      return kLegacyImageDataColorSpaceName;
-    case kSRGBImageDataColorSpace:
-      return kSRGBImageDataColorSpaceName;
-    case kLinearRGBImageDataColorSpace:
-      return kLinearRGBImageDataColorSpaceName;
-  }
-  NOTREACHED();
-  return String();
-}
-
 ImageData* ImageData::createImageData(unsigned width,
                                       unsigned height,
                                       String colorSpace,
@@ -313,9 +299,6 @@ ImageData* ImageData::createImageData(DOMUint8ClampedArray* data,
   return new ImageData(IntSize(width, height), data, colorSpace);
 }
 
-// TODO(zakerinasab): Fix this when ImageBitmap color correction code is landed.
-// Tip: If the source Image Data has a color space, createImageBitmap must
-// respect this color space even when no color space tag is passed to it.
 ScriptPromise ImageData::createImageBitmap(ScriptState* scriptState,
                                            EventTarget& eventTarget,
                                            Optional<IntRect> cropRect,
@@ -360,6 +343,51 @@ v8::Local<v8::Object> ImageData::associateWithWrapper(
   return wrapper;
 }
 
+ImageDataColorSpace ImageData::getImageDataColorSpace(String colorSpaceName) {
+  if (colorSpaceName == kLegacyImageDataColorSpaceName)
+    return kLegacyImageDataColorSpace;
+  if (colorSpaceName == kSRGBImageDataColorSpaceName)
+    return kSRGBImageDataColorSpace;
+  if (colorSpaceName == kLinearRGBImageDataColorSpaceName)
+    return kLinearRGBImageDataColorSpace;
+  NOTREACHED();
+  return kLegacyImageDataColorSpace;
+}
+
+String ImageData::getImageDataColorSpaceName(ImageDataColorSpace colorSpace) {
+  switch (colorSpace) {
+    case kLegacyImageDataColorSpace:
+      return kLegacyImageDataColorSpaceName;
+    case kSRGBImageDataColorSpace:
+      return kSRGBImageDataColorSpaceName;
+    case kLinearRGBImageDataColorSpace:
+      return kLinearRGBImageDataColorSpaceName;
+  }
+  NOTREACHED();
+  return String();
+}
+
+sk_sp<SkColorSpace> ImageData::imageDataColorSpaceToSkColorSpace(
+    ImageDataColorSpace colorSpace) {
+  switch (colorSpace) {
+    case kLegacyImageDataColorSpace:
+      return ColorBehavior::globalTargetColorSpace();
+    case kSRGBImageDataColorSpace:
+      return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+    case kLinearRGBImageDataColorSpace:
+      return SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+  }
+  NOTREACHED();
+  return nullptr;
+}
+
+sk_sp<SkColorSpace> ImageData::getSkColorSpace() {
+  if (!RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled() ||
+      !RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
+    return nullptr;
+  return ImageData::imageDataColorSpaceToSkColorSpace(m_colorSpace);
+}
+
 ImageData::ImageData(const IntSize& size,
                      DOMUint8ClampedArray* byteArray,
                      String colorSpaceName)