Add some plumbing for the color management of canvases

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 91 matching lines @@
         if (c)
             c->restoreToCount(m_saveCount);
         m_context->validateStateStack();
     }
 private:
     Member<CanvasRenderingContext2D> m_context;
     int m_saveCount;
 };
 
 CanvasRenderingContext2D::CanvasRenderingContext2D(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document& document)
-    : CanvasRenderingContext(canvas)
+    : CanvasRenderingContext(canvas, nullptr, attrs.colorSpace())
     , m_hasAlpha(attrs.alpha())
     , m_contextLostMode(NotLostContext)
     , m_contextRestorable(true)
     , m_tryRestoreContextAttemptCount(0)
     , m_dispatchContextLostEventTimer(this, &CanvasRenderingContext2D::dispatchContextLostEvent)
     , m_dispatchContextRestoredEventTimer(this, &CanvasRenderingContext2D::dispatchContextRestoredEvent)
     , m_tryRestoreContextEventTimer(this, &CanvasRenderingContext2D::tryRestoreContextEvent)
     , m_pruneLocalFontCacheScheduled(false)
 {
     if (document.settings() && document.settings()->antialiasedClips2dCanvasEnabled())
@@ skipping 781 matching lines @@
 }
 
 WebLayer* CanvasRenderingContext2D::platformLayer() const
 {
     return canvas()->buffer() ? canvas()->buffer()->platformLayer() : 0;
 }
 
 void CanvasRenderingContext2D::getContextAttributes(Canvas2DContextAttributes& attrs) const
 {
     attrs.setAlpha(m_hasAlpha);
+    attrs.setColorSpace(colorSpaceAsString());

[Stephen White, 2016/08/11 20:41:27]

Shouldn't the base class be responsible for this? (We'll have to virtualize
getContextAttributes() and call the base class from here, but that seems like
that would be the most scalable way to do it.)

[Justin Novosad, 2016/08/12 17:40:18]

Nope.  The base class is in core, so it can't know about
Canvas2DContextAttributes, it only knows about CanvasContextCreationAttributes
(the non-specific flavor of the attributes).

 }
 
 void CanvasRenderingContext2D::drawFocusIfNeeded(Element* element)
 {
     drawFocusIfNeededInternal(m_path, element);
 }
 
 void CanvasRenderingContext2D::drawFocusIfNeeded(Path2D* path2d, Element* element)
 {
     drawFocusIfNeededInternal(path2d->path(), element);
@@ skipping 165 matching lines @@
     return true;
 }
 
 void CanvasRenderingContext2D::resetUsageTracking()
 {
     UsageCounters newCounters;
     m_usageCounters = newCounters;
 }
 
 } // namespace blink