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

third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 380 matching lines @@
   WTF::ArrayBufferContents::InitializationPolicy initialization_policy =
       may_have_stray_area ? WTF::ArrayBufferContents::kZeroInitialize
                           : WTF::ArrayBufferContents::kDontInitialize;
   auto data = WTF::ArrayBufferContents::CreateDataHandle(alloc_size_in_bytes,
                                                          initialization_policy);
   if (!data)
     return false;
   WTF::ArrayBufferContents result(std::move(data), alloc_size_in_bytes,
                                   WTF::ArrayBufferContents::kNotShared);
 
-  // Skia does not support unpremultiplied read with an F16 to 8888 conversion
-  bool use_f16_workaround = surface_->ColorType() == kRGBA_F16_SkColorType;
-
-  SkAlphaType alpha_type = (multiplied == kPremultiplied || use_f16_workaround)
+  SkAlphaType alpha_type = (multiplied == kPremultiplied)
                                ? kPremul_SkAlphaType
                                : kUnpremul_SkAlphaType;
-  // The workaround path use a canvas draw under the hood, which can only
-  // use N32 at this time.
-  SkColorType color_type =
-      use_f16_workaround ? kN32_SkColorType : kRGBA_8888_SkColorType;
-
-  // Only use sRGB when the surface has a color space.  Converting untagged
-  // pixels to a particular color space is not well-defined in Skia.
-  sk_sp<SkColorSpace> color_space = nullptr;
-  if (surface_->ColorSpace()) {
-    color_space = SkColorSpace::MakeSRGB();
-  }
+  SkColorType color_type = (surface_->ColorType() == kRGBA_F16_SkColorType)
+                               ? kRGBA_F16_SkColorType
+                               : kRGBA_8888_SkColorType;
 
   SkImageInfo info = SkImageInfo::Make(rect.Width(), rect.Height(), color_type,
-                                       alpha_type, std::move(color_space));
+                                       alpha_type, surface_->ColorSpace());
 
   snapshot->readPixels(info, result.Data(), bytes_per_pixel * rect.Width(),
                        rect.X(), rect.Y());
   gpu_readback_invoked_in_current_frame_ = true;
-
-  if (use_f16_workaround) {
-    uint32_t* pixel = (uint32_t*)result.Data();
-    size_t pixel_count = alloc_size_in_bytes / sizeof(uint32_t);
-    // TODO(skbug.com/5853): make readPixels support RGBA output so that we no
-    // longer
-    // have to do this.
-    if (kN32_SkColorType == kBGRA_8888_SkColorType) {
-      // Convert BGRA to RGBA if necessary on this platform.
-      SkSwapRB(pixel, pixel, pixel_count);
-    }
-    // TODO(skbug.com/5853): We should really be doing the unpremultiply in
-    // linear space
-    // and skia should provide that service.
-    if (multiplied == kUnmultiplied) {
-      for (; pixel_count; --pixel_count) {
-        *pixel = SkUnPreMultiply::UnPreMultiplyPreservingByteOrder(*pixel);
-        ++pixel;
-      }
-    }
-  }
-
   result.Transfer(contents);
   return true;
 }
 
 void ImageBuffer::PutByteArray(Multiply multiplied,
                                const unsigned char* source,
                                const IntSize& source_size,
                                const IntRect& source_rect,
                                const IntPoint& dest_point) {
   if (!IsSurfaceValid())
@@ skipping 168 matching lines @@
   DCHECK(MIMETypeRegistry::IsSupportedImageMIMETypeForEncoding(mime_type));
 
   Vector<unsigned char> result;
   if (!EncodeImage(mime_type, quality, &result))
     return "data:,";
 
   return "data:" + mime_type + ";base64," + Base64Encode(result);
 }
 
 }  // namespace blink