Display linear-srgb color managed canvas

third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

 /*
  * Copyright (C) 2009 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/html/canvas/CanvasRenderingContext.h"
-

[Justin Novosad, 2016/11/17 21:37:06]

Please revert this whitespace change

[zakerinasab, 2016/11/18 14:38:27]

Done.

 #include "core/html/canvas/CanvasContextCreationAttributes.h"
 #include "core/html/canvas/CanvasImageSource.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 const char* const kLinearRGBCanvasColorSpaceName = "linear-rgb";
 const char* const kSRGBCanvasColorSpaceName = "srgb";
 const char* const kLegacyCanvasColorSpaceName = "legacy-srgb";
 
 namespace blink {
 
 CanvasRenderingContext::CanvasRenderingContext(
     HTMLCanvasElement* canvas,
     OffscreenCanvas* offscreenCanvas,
     const CanvasContextCreationAttributes& attrs)
     : m_canvas(canvas),
       m_offscreenCanvas(offscreenCanvas),
       m_colorSpace(kLegacyCanvasColorSpace),
       m_creationAttributes(attrs) {
-  if (RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled()) {
+  if (RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled() &&
+      RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
     if (m_creationAttributes.colorSpace() == kSRGBCanvasColorSpaceName)
       m_colorSpace = kSRGBCanvasColorSpace;
     else if (m_creationAttributes.colorSpace() ==
              kLinearRGBCanvasColorSpaceName)
       m_colorSpace = kLinearRGBCanvasColorSpace;
   }
   // Make m_creationAttributes reflect the effective colorSpace rather than the
   // requested one
   m_creationAttributes.setColorSpace(colorSpaceAsString());
 }
@@ skipping 105 matching lines @@
   }
   return taintOrigin;
 }
 
 DEFINE_TRACE(CanvasRenderingContext) {
   visitor->trace(m_canvas);
   visitor->trace(m_offscreenCanvas);
 }
 
 }  // namespace blink