Revert of Use SkColorSpaceXform to handle color conversions in decoders

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. 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 24 matching lines @@
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/image-decoders/SegmentReader.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
 
-#if USE(SKCOLORXFORM)
-#include "SkColorSpaceXform.h"
+#if USE(QCMSLIB)
+#include "qcms.h"
 #endif
 
 namespace blink {
 
-#if USE(SKCOLORXFORM)
-#if SK_B32_SHIFT
-inline SkColorSpaceXform::ColorFormat xformColorFormat() {
-  return SkColorSpaceXform::kRGBA_8888_ColorFormat;
-}
-#else
-inline SkColorSpaceXform::ColorFormat xformColorFormat() {
-  return SkColorSpaceXform::kBGRA_8888_ColorFormat;
-}
-#endif
-#endif  // USE(SKCOLORXFORM)
+#if USE(QCMSLIB)
+struct QCMSTransformDeleter {
+  void operator()(qcms_transform* transform) {
+    if (transform)
+      qcms_transform_release(transform);
+  }
+};
+
+using QCMSTransformUniquePtr =
+    std::unique_ptr<qcms_transform, QCMSTransformDeleter>;
+#endif  // USE(QCMSLIB)
 
 // ImagePlanes can be used to decode color components into provided buffers
 // instead of using an ImageFrame.
 class PLATFORM_EXPORT ImagePlanes final {
   USING_FAST_MALLOC(ImagePlanes);
   WTF_MAKE_NONCOPYABLE(ImagePlanes);
 
  public:
   ImagePlanes();
   ImagePlanes(void* planes[3], const size_t rowBytes[3]);
@@ skipping 145 matching lines @@
 
   bool ignoresGammaAndColorProfile() const {
     return m_ignoreGammaAndColorProfile;
   }
   static void setTargetColorProfile(const WebVector<char>&);
 
   // Note that hasColorProfile refers to the existence of a not-ignored
   // embedded color profile, and is independent of whether or not that
   // profile's transform has been baked into the pixel values.
   bool hasColorProfile() const { return m_hasColorProfile; }
-  void setColorSpaceAndComputeTransform(const char* iccData,
-                                        unsigned iccLength,
-                                        bool useSRGB);
+  void setColorProfileAndComputeTransform(const char* iccData,
+                                          unsigned iccLength,
+                                          bool hasAlpha,
+                                          bool useSRGB);
 
-#if USE(SKCOLORXFORM)
-  // Transformation from encoded color space to target color space.
-  SkColorSpaceXform* colorTransform() {
+#if USE(QCMSLIB)
+  // In contrast with hasColorProfile, this refers to the transform that has
+  // been baked into the pixels.
+  qcms_transform* colorTransform() {
     return m_sourceToOutputDeviceColorTransform.get();
   }
 #endif
 
   // Sets the "decode failure" flag.  For caller convenience (since so
   // many callers want to return false after calling this), returns false
   // to enable easy tailcalling.  Subclasses may override this to also
   // clean up any local data.
   virtual bool setFailed() {
     m_failed = true;
@@ skipping 108 matching lines @@
   }
 
   IntSize m_size;
   bool m_sizeAvailable = false;
   bool m_isAllDataReceived = false;
   bool m_failed = false;
 
   bool m_hasColorProfile = false;
   ImageFrame::ICCProfile m_colorProfile;
 
-#if USE(SKCOLORXFORM)
-  std::unique_ptr<SkColorSpaceXform> m_sourceToOutputDeviceColorTransform;
+#if USE(QCMSLIB)
+  QCMSTransformUniquePtr m_sourceToOutputDeviceColorTransform;
 #endif
 };
 
 }  // namespace blink
 
 #endif