Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

Issue 2496913003: Display linear-srgb color managed canvas (Closed)
Patch Set: Removing Failure lines from TestExpectations Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorSpace-attribute.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9f9e9f10d9a0bfd913ecbf9edf33f3e9e11ad9e4 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
@@ -44,7 +44,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() ==
« no previous file with comments | « third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorSpace-attribute.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698