Fix ImageBitmap constructor from ImageData to consider the color space tags

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

 /*
  * Copyright (C) 2008 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 195 matching lines @@
 }
 
 ImageData* ImageData::create(const IntSize& size,
                              DOMUint8ClampedArray* byteArray) {
   if (!ImageData::validateConstructorArguments(kParamSize | kParamData, &size,
                                                0, 0, byteArray))
     return nullptr;
   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) {
   if (!ImageData::validateConstructorArguments(kParamWidth | kParamHeight,
                                                nullptr, width, height, nullptr,
                                                nullptr, &exceptionState))
     return nullptr;
   DOMUint8ClampedArray* byteArray =
       ImageData::allocateAndValidateUint8ClampedArray(4 * width * height,
                                                       &exceptionState);
@@ skipping 15 matching lines @@
                              unsigned width,
                              unsigned height,
                              ExceptionState& exceptionState) {
   if (!ImageData::validateConstructorArguments(
           kParamData | kParamWidth | kParamHeight, nullptr, width, height, data,
           nullptr, &exceptionState))
     return nullptr;
   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,
                                       ExceptionState& exceptionState) {
   if (!ImageData::validateConstructorArguments(
           kParamWidth | kParamHeight | kParamColorSpace, nullptr, width, height,
           nullptr, &colorSpace, &exceptionState))
     return nullptr;
 
   DOMUint8ClampedArray* byteArray =
@@ skipping 21 matching lines @@
                                       unsigned height,
                                       String colorSpace,
                                       ExceptionState& exceptionState) {
   if (!ImageData::validateConstructorArguments(
           kParamData | kParamWidth | kParamHeight | kParamColorSpace, nullptr,
           width, height, data, &colorSpace, &exceptionState))
     return nullptr;
   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,
                                            const ImageBitmapOptions& options,
                                            ExceptionState& exceptionState) {
   if ((cropRect &&
        !ImageBitmap::isSourceSizeValid(cropRect->width(), cropRect->height(),
                                        exceptionState)) ||
       !ImageBitmap::isSourceSizeValid(bitmapSourceSize().width(),
                                       bitmapSourceSize().height(),
@@ skipping 24 matching lines @@
     v8::Local<v8::Value> pixelArray = ToV8(m_data.get(), wrapper, isolate);
     if (pixelArray.IsEmpty() ||
         !v8CallBoolean(wrapper->DefineOwnProperty(
             isolate->GetCurrentContext(), v8AtomicString(isolate, "data"),
             pixelArray, v8::ReadOnly)))
       return v8::Local<v8::Object>();
   }
   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)
     : m_size(size),
       m_colorSpace(getImageDataColorSpace(colorSpaceName)),
       m_data(byteArray) {
   DCHECK_GE(size.width(), 0);
   DCHECK_GE(size.height(), 0);
   SECURITY_CHECK(static_cast<unsigned>(size.width() * size.height() * 4) <=
                  m_data->length());
 }
 
 }  // namespace blink