commit a8a5cee2f6692530e31f45b54ce792076a5000c9
author Mike Klein <mtklein@google.com> Mon Dec 03 11:53:09 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 03 17:22:43 2018 +0000
tree 39497ccce9ee5470417bf1ff16e914b7442b2ca7
parent 45723ac931492d7fb2bfa9e205e65a140425d686

clean up TODO

The premise of the TODO here is somewhat wrong.  There are other places
where we do pass the destination color space through the ContextRec to
shaders that care... just not here when chosing the top-level blitter.

Change-Id: Ie32cfff5af0328c1280721246194a9eb1f0a5874
Reviewed-on: https://skia-review.googlesource.com/c/174040
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkBlitter.cpp

diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index 2ef0da6..3992b14 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -842,16 +842,14 @@
         return blitter;
     }
 
-    // Everything but kN32_SkColorType and kRGB_565_SkColorType should already be handled.
+    // Everything but legacy kN32_SkColorType and kRGB_565_SkColorType should already be handled.
+    SkASSERT(!device.colorSpace());
     SkASSERT(device.colorType() == kN32_SkColorType ||
              device.colorType() == kRGB_565_SkColorType);
 
     // And we should either have a shader, be blending with SrcOver, or both.
     SkASSERT(paint->getShader() || paint->getBlendMode() == SkBlendMode::kSrcOver);
 
-    // TODO: remove SkColorSpace from makeContext() arguments.  It's always nullptr.
-    SkASSERT(!device.colorSpace());
-
     // Legacy blitters keep their shader state on a shader context.
     SkShaderBase::Context* shaderContext = nullptr;
     if (paint->getShader()) {