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

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 258 matching lines @@
                              unsigned height,
                              ExceptionState& exception_state) {
   if (!ImageData::ValidateConstructorArguments(
           kParamData | kParamWidth | kParamHeight, nullptr, width, height,
           data.View(), nullptr, &exception_state))
     return nullptr;
 
   return new ImageData(IntSize(width, height), data.View());
 }
 
-ImageData* ImageData::createImageData(
+ImageData* ImageData::CreateImageData(
     unsigned width,
     unsigned height,
     const ImageDataColorSettings& color_settings,
     ExceptionState& exception_state) {
+  if (!RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled() ||
+      !RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
+    return nullptr;
+
   if (!ImageData::ValidateConstructorArguments(
           kParamWidth | kParamHeight, nullptr, width, height, nullptr,
           &color_settings, &exception_state))
     return nullptr;
 
   ImageDataStorageFormat storage_format =
       ImageData::GetImageDataStorageFormat(color_settings.storageFormat());
   DOMArrayBufferView* buffer_view = AllocateAndValidateDataArray(
       4 * width * height, storage_format, &exception_state);
 
   if (!buffer_view)
     return nullptr;
 
   return new ImageData(IntSize(width, height), buffer_view, &color_settings);
 }
 
-ImageData* ImageData::createImageData(ImageDataArray& data,
+ImageData* ImageData::CreateImageData(ImageDataArray& data,
                                       unsigned width,
                                       unsigned height,
                                       ImageDataColorSettings& color_settings,
                                       ExceptionState& exception_state) {
+  if (!RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled() ||
+      !RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
+    return nullptr;
+
   DOMArrayBufferView* buffer_view = nullptr;
+
   // When pixels data is provided, we need to override the storage format of
   // ImageDataColorSettings with the one that matches the data type of the
   // pixels.
   String storage_format_name;
 
   if (data.isUint8ClampedArray()) {
     buffer_view = data.getAsUint8ClampedArray().View();
     storage_format_name = kUint8ClampedArrayStorageFormatName;
   } else if (data.isUint16Array()) {
     buffer_view = data.getAsUint16Array().View();
@@ skipping 251 matching lines @@
           NOTREACHED();
       }
       break;
 
     default:
       NOTREACHED();
   }
   return nullptr;
 }
 
+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::experimentalCanvasFeaturesEnabled() ||
       !RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
     return nullptr;
 
   return SkColorSpace::MakeSRGB();
 }
 
@@ skipping 173 matching lines @@
       SECURITY_CHECK(static_cast<unsigned>(size.Width() * size.Height() * 4) <=
                      data_f32_->length());
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace blink