Refactor ImageBitmap constructor from ImageData to be color managed

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 615 matching lines @@
 DOMArrayBufferBase* ImageData::BufferBase() const {
   if (data_)
     return data_->BufferBase();
   if (data_u16_)
     return data_u16_->BufferBase();
   if (data_f32_)
     return data_f32_->BufferBase();
   return nullptr;
 }
 
-// For ImageData, the color space is only specified by color settings.
-// It cannot have a SkColorSpace. This doesn't mean anything. Fix this.
-sk_sp<SkColorSpace> ImageData::GetSkColorSpace() {
-  if (!RuntimeEnabledFeatures::colorCanvasExtensionsEnabled())
-    return nullptr;
+CanvasColorParams ImageData::GetCanvasColorParams() {
+  if (!RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled() ||
+      !RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
+    return CanvasColorParams();
 
-  return SkColorSpace::MakeSRGB();
+  CanvasColorSpace color_space =
+      ImageData::GetCanvasColorSpace(color_settings_.colorSpace());
+  CanvasPixelFormat pixel_format = kRGBA8CanvasPixelFormat;
+  if (color_settings_.storageFormat() != kUint8ClampedArrayStorageFormatName)
+    pixel_format = kF16CanvasPixelFormat;
+  return CanvasColorParams(color_space, pixel_format);
 }
 
 bool ImageData::ImageDataInCanvasColorSettings(
     const CanvasColorSpace& canvas_color_space,
     const CanvasPixelFormat& canvas_pixel_format,
     std::unique_ptr<uint8_t[]>& converted_pixels) {
   if (!data_ && !data_u16_ && !data_f32_)
     return false;
 
   // If canvas and image data are both in the same color space and pixel format
@@ skipping 70 matching lines @@
 
   std::unique_ptr<SkColorSpaceXform> xform =
       SkColorSpaceXform::New(src_color_space.get(), dst_color_space.get());
 
   if (!xform->apply(dst_color_format, converted_pixels.get(), src_color_format,
                     src_data, num_pixels, SkAlphaType::kUnpremul_SkAlphaType))
     return false;
   return true;
 }
 
+bool ImageData::ImageDataInCanvasColorSettings(
+    const CanvasColorParams& canvas_color_params,
+    std::unique_ptr<uint8_t[]>& converted_pixels) {
+  return ImageDataInCanvasColorSettings(canvas_color_params.color_space(),
+                                        canvas_color_params.pixel_format(),
+                                        converted_pixels);
+}
+
 void ImageData::Trace(Visitor* visitor) {
   visitor->Trace(data_);
   visitor->Trace(data_u16_);
   visitor->Trace(data_f32_);
   visitor->Trace(data_union_);
 }
 
 ImageData::ImageData(const IntSize& size,
                      DOMArrayBufferView* data,
                      const ImageDataColorSettings* color_settings)
@@ skipping 45 matching lines @@
       SECURITY_CHECK(static_cast<unsigned>(size.Width() * size.Height() * 4) <=
                      data_f32_->length());
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace blink