Don't try to map HDR to SDR if the output is 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 910 matching lines @@
         case ColorSpace::TransferID::SMPTE170M:
           // SMPTE 1886 suggests that we should be using gamma 2.4 for BT709
           // content. However, most displays actually use a gamma of 2.2, and
           // user studies shows that users don't really care. Using the same
           // gamma as the display will let us optimize a lot more, so lets stick
           // with using the SRGB transfer function.
           from.transfer_ = ColorSpace::TransferID::IEC61966_2_1;
           break;
 
         case ColorSpace::TransferID::SMPTEST2084:
-          // We don't have an HDR display, so replace SMPTE 2084 with something
-          // that returns ranges more or less suitable for a normal display.
-          from.transfer_ = ColorSpace::TransferID::SMPTEST2084_NON_HDR;
+          if (!to.IsHDR()) {
+            // We don't have an HDR display, so replace SMPTE 2084 with
+            // something that returns ranges more or less suitable for a normal
+            // display.
+            from.transfer_ = ColorSpace::TransferID::SMPTEST2084_NON_HDR;
+          }
           break;
 
         case ColorSpace::TransferID::ARIB_STD_B67:
-          // Interpreting HLG using a gamma 2.4 works reasonably well for SDR
-          // displays. Once we have HDR output capabilies, we'll need to
-          // change this.
-          from.transfer_ = ColorSpace::TransferID::GAMMA24;
+          if (!to.IsHDR()) {
+            // Interpreting HLG using a gamma 2.4 works reasonably well for SDR
+            // displays.
+            from.transfer_ = ColorSpace::TransferID::GAMMA24;
+          }
           break;
 
         default:  // Do nothing
           break;
       }
 
       // TODO(hubbe): shrink gamuts here (never stretch gamuts)
     }
     builder->Append(base::MakeUnique<ColorTransformMatrix>(
         GetRangeAdjustMatrix(from.range_, from.matrix_)));
@@ skipping 106 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