Add LINEAR_HDR so that the linear scRGB colorspace will be HDR

ui/gfx/color_transform.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/color_transform.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 183 matching lines @@
       float a = 1.11157219592173128753f;
       float b = 0.02282158552944503135f;
       if (v <= b) {
         return 4.0f * v;
       } else {
         return a * powf(v, 0.45f) - (a - 1.0f);
       }
     }
 
     case ColorSpace::TransferID::LINEAR:
+    case ColorSpace::TransferID::LINEAR_HDR:
       return v;
 
     case ColorSpace::TransferID::LOG:
       if (v < 0.01f)
         return 0.0f;
       return 1.0f + log(v) / log(10.0f) / 2.0f;
 
     case ColorSpace::TransferID::LOG_SQRT:
       if (v < sqrt(10.0f) / 1000.0f)
         return 0.0f;
@@ skipping 109 matching lines @@
       float a = 1.11157219592173128753f;
       float b = 0.02282158552944503135f;
       if (v <= FromLinear(ColorSpace::TransferID::SMPTE240M, b)) {
         return v / 4.0f;
       } else {
         return powf((v + a - 1.0f) / a, 1.0f / 0.45f);
       }
     }
 
     case ColorSpace::TransferID::LINEAR:
+    case ColorSpace::TransferID::LINEAR_HDR:
       return v;
 
     case ColorSpace::TransferID::LOG:
       if (v < 0.0f)
         return 0.0f;
       return powf(10.0f, (v - 1.0f) * 2.0f);
 
     case ColorSpace::TransferID::LOG_SQRT:
       if (v < 0.0f)
         return 0.0f;
@@ skipping 268 matching lines @@
       matrix_.TransformPoint(colors + i);
   }
 
  private:
   Transform matrix_;
 };
 
 class ColorTransformFromLinear : public ColorTransformInternal {
  public:
   explicit ColorTransformFromLinear(ColorSpace::TransferID transfer)
-      : transfer_(transfer) {}
+      : transfer_(transfer) {
+    // Map LINEAR_HDR to LINEAR for optimizations.
+    if (transfer_ == ColorSpace::TransferID::LINEAR_HDR) {
+      transfer_ = ColorSpace::TransferID::LINEAR;
+    }
+  }
   bool Prepend(ColorTransformInternal* prev) override {
     return prev->Join(*this);
   }
 
   bool IsNull() override { return transfer_ == ColorSpace::TransferID::LINEAR; }
 
   void transform(ColorTransform::TriStim* colors, size_t num) override {
     for (size_t i = 0; i < num; i++) {
       colors[i].set_x(FromLinear(transfer_, colors[i].x()));
       colors[i].set_y(FromLinear(transfer_, colors[i].y()));
       colors[i].set_z(FromLinear(transfer_, colors[i].z()));
     }
   }
 
  private:
   friend class ColorTransformToLinear;
   ColorSpace::TransferID transfer_;
 };
 
 class ColorTransformToLinear : public ColorTransformInternal {
  public:
   explicit ColorTransformToLinear(ColorSpace::TransferID transfer)
-      : transfer_(transfer) {}
+      : transfer_(transfer) {
+    // Map LINEAR_HDR to LINEAR for optimizations.
+    if (transfer_ == ColorSpace::TransferID::LINEAR_HDR) {
+      transfer_ = ColorSpace::TransferID::LINEAR;
+    }
+  }
 
   bool Prepend(ColorTransformInternal* prev) override {
     return prev->Join(*this);
   }
 
   static bool IsGamma22(ColorSpace::TransferID transfer) {
     switch (transfer) {
       // We don't need to check BT709 here because it's been translated into
       // SRGB in ColorSpaceToColorSpaceTransform::ColorSpaceToLinear below.
       case ColorSpace::TransferID::GAMMA22:
@@ skipping 367 matching lines @@
       to_profile ? ColorSpace::CreateXYZD50() : to, intent, &builder);
   if (to_profile) {
     builder.Append(std::unique_ptr<ColorTransformInternal>(
         new QCMSColorTransform(GetXYZD50Profile(), to_profile)));
   }
 
   return builder.GetTransform();
 }
 
 }  // namespace gfx