Display linear-srgb color managed canvas

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

Index: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
index d046474e2cc69a1f60d911a39aab9485c0c3f00c..541644f71c1b99a65f3bdc534caac0db8ccc5f94 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
@@ -24,7 +24,6 @@
  */
 
 #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"
@@ -44,7 +43,8 @@ CanvasRenderingContext::CanvasRenderingContext(
       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() ==