update callers to not use SkColorProfileType

src/core/SkBlitter_Sprite.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "SkColorSpacePriv.h"
 #include "SkOpts.h"
 #include "SkSmallAllocator.h"
 #include "SkSpriteBlitter.h"
 
 SkSpriteBlitter::SkSpriteBlitter(const SkPixmap& source)
     : fSource(source) {}
 
 void SkSpriteBlitter::setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) {
     fDst = dst;
     fLeft = left;
@@ skipping 34 matching lines @@
 //      1. src == dst format
 //      2. paint has no modifiers (i.e. alpha, colorfilter, etc.)
 //      3. xfermode needs no blending: e.g. kSrc_Mode or kSrcOver_Mode + opaque src
 //
 class SkSpriteBlitter_Src_SrcOver final : public SkSpriteBlitter {
 public:
     static bool Supports(const SkPixmap& dst, const SkPixmap& src, const SkPaint& paint) {
         if (dst.colorType() != src.colorType()) {
             return false;
         }
-        if (dst.info().profileType() != src.info().profileType()) {
+        if (SkColorSpacePriv::EQ(dst.info().colorSpace(), src.info().colorSpace())) {

[Brian Osman, 2016/06/20 20:09:19]

Should this be !EQ ?

[reed1, 2016/06/20 21:05:52]

Done.

             return false;
         }
         if (paint.getMaskFilter() || paint.getColorFilter() || paint.getImageFilter()) {
             return false;
         }
         if (0xFF != paint.getAlpha()) {
             return false;
         }
         SkXfermode::Mode mode;
         if (!SkXfermode::AsMode(paint.getXfermode(), &mode)) {
             return false;
         }
         if (SkXfermode::kSrc_Mode == mode) {
             return true;
         }
         if (SkXfermode::kSrcOver_Mode == mode && src.isOpaque()) {
             return true;
         }
 
         // At this point memcpy can't be used. The following check for using SrcOver.
 
-        if (dst.colorType() != kN32_SkColorType
-            || dst.info().profileType() != kSRGB_SkColorProfileType) {
+        if (dst.colorType() != kN32_SkColorType || nullptr == dst.info().colorSpace()) {

[Brian Osman, 2016/06/20 20:09:19]

What exactly was this checking for before? I don't think these conditions are
the same (need to check the pointer, and then check if it's linear, or sRGB, or
something).

[reed1, 2016/06/20 21:05:52]

Not sure :) Seems like this class wants to be SRGB specific. I will investigate
more.

             return false;
         }
 
         return SkXfermode::kSrcOver_Mode == mode;
     }
 
     SkSpriteBlitter_Src_SrcOver(const SkPixmap& src)
         : INHERITED(src) {}
 
     void setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) override {
         SkASSERT(Supports(dst, fSource, paint));
         this->INHERITED::setup(dst, left, top, paint);
         SkXfermode::Mode mode;
         if (!SkXfermode::AsMode(paint.getXfermode(), &mode)) {
             SkFAIL("Should never happen.");
         }
 
         SkASSERT(mode == SkXfermode::kSrcOver_Mode || mode == SkXfermode::kSrc_Mode);
 
         if (mode == SkXfermode::kSrcOver_Mode && !fSource.isOpaque()) {
             fUseMemcpy = false;
         }
     }
 
     void blitRect(int x, int y, int width, int height) override {
         SkASSERT(fDst.colorType() == fSource.colorType());
-        SkASSERT(fDst.info().profileType() == fSource.info().profileType());
+        SkASSERT(SkColorSpacePriv::EQ(fDst.info().colorSpace(), fSource.info().colorSpace()));
         SkASSERT(width > 0 && height > 0);
 
         if (fUseMemcpy) {
             char* dst = (char*)fDst.writable_addr(x, y);
             const char* src = (const char*)fSource.addr(x - fLeft, y - fTop);
             const size_t dstRB = fDst.rowBytes();
             const size_t srcRB = fSource.rowBytes();
             const size_t bytesToCopy = width << fSource.shiftPerPixel();
 
             while (height --> 0) {
@@ skipping 45 matching lines @@
     SkSpriteBlitter* blitter = nullptr;
 
     if (SkSpriteBlitter_Src_SrcOver::Supports(dst, source, paint)) {
         blitter = allocator->createT<SkSpriteBlitter_Src_SrcOver>(source);
     } else {
         switch (dst.colorType()) {
             case kRGB_565_SkColorType:
                 blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
                 break;
             case kN32_SkColorType:
-                if (dst.info().isSRGB()) {
+                if (dst.info().gammaCloseToSRGB()) {
                     blitter = SkSpriteBlitter::ChooseS32(source, paint, allocator);
                 } else {
                     blitter = SkSpriteBlitter::ChooseL32(source, paint, allocator);
                 }
                 break;
             case kRGBA_F16_SkColorType:
                 blitter = SkSpriteBlitter::ChooseF16(source, paint, allocator);
                 break;
             default:
                 break;
         }
     }
 
     if (blitter) {
         blitter->setup(dst, left, top, paint);
     }
     return blitter;
 }