AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up TODO

Browse Source 
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>
This commit is contained in:
Mike Klein 2018-12-03 11:53:09 -05:00 committed by Skia Commit-Bot
parent 45723ac931
commit a8a5cee2f6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkBlitter.cpp
View File

@ -842,16 +842,14 @@ SkBlitter* SkBlitter::Choose(const SkPixmap& device,
return blitter; 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 || SkASSERT(device.colorType() == kN32_SkColorType ||
device.colorType() == kRGB_565_SkColorType); device.colorType() == kRGB_565_SkColorType);
// And we should either have a shader, be blending with SrcOver, or both. // And we should either have a shader, be blending with SrcOver, or both.
SkASSERT(paint->getShader() || paint->getBlendMode() == SkBlendMode::kSrcOver); 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. // Legacy blitters keep their shader state on a shader context.
SkShaderBase::Context* shaderContext = nullptr; SkShaderBase::Context* shaderContext = nullptr;
if (paint->getShader()) { if (paint->getShader()) {