Revert of add new blit2 methods in support of antialiased hairlines guard flag SK_SUPPORT_LEGACY_BLITANTIH2V2

src/core/SkBlitter_ARGB32.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 "SkCoreBlitters.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
@@ skipping 88 matching lines @@
                 uint32_t sc = SkAlphaMulQ(color, SkAlpha255To256(aa));
                 fColor32Proc(device, device, count, sc);
             }
         }
         runs += count;
         antialias += count;
         device += count;
     }
 }
 
-#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2
-void SkARGB32_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
-    uint32_t* device = fDevice.getAddr32(x, y);
-    SkDEBUGCODE((void)fDevice.getAddr32(x + 1, y);)
-    
-    device[0] = SkBlendARGB32(fPMColor, device[0], a0);
-    device[1] = SkBlendARGB32(fPMColor, device[1], a1);
-}
-
-void SkARGB32_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
-    uint32_t* device = fDevice.getAddr32(x, y);
-    SkDEBUGCODE((void)fDevice.getAddr32(x, y + 1);)
-    
-    device[0] = SkBlendARGB32(fPMColor, device[0], a0);
-    device = (uint32_t*)((char*)device + fDevice.rowBytes());
-    device[0] = SkBlendARGB32(fPMColor, device[0], a1);
-}
-#endif
-
 //////////////////////////////////////////////////////////////////////////////////////
 
 #define solid_8_pixels(mask, dst, color)    \
     do {                                    \
         if (mask & 0x80) dst[0] = color;    \
         if (mask & 0x40) dst[1] = color;    \
         if (mask & 0x20) dst[2] = color;    \
         if (mask & 0x10) dst[3] = color;    \
         if (mask & 0x08) dst[4] = color;    \
         if (mask & 0x04) dst[5] = color;    \
@@ skipping 54 matching lines @@
         return;
     }
 
     if (mask.fFormat == SkMask::kBW_Format) {
         SkARGB32_BlitBW(fDevice, mask, clip, fPMColor);
     } else if (SkMask::kARGB32_Format == mask.fFormat) {
         SkARGB32_Blit32(fDevice, mask, clip, fPMColor);
     }
 }
 
-#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2
-void SkARGB32_Opaque_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
-    uint32_t* device = fDevice.getAddr32(x, y);
-    SkDEBUGCODE((void)fDevice.getAddr32(x + 1, y);)
-
-    device[0] = SkFastFourByteInterp(fPMColor, device[0], a0);
-    device[1] = SkFastFourByteInterp(fPMColor, device[1], a1);
-}
-
-void SkARGB32_Opaque_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
-    uint32_t* device = fDevice.getAddr32(x, y);
-    SkDEBUGCODE((void)fDevice.getAddr32(x, y + 1);)
-
-    device[0] = SkFastFourByteInterp(fPMColor, device[0], a0);
-    device = (uint32_t*)((char*)device + fDevice.rowBytes());
-    device[0] = SkFastFourByteInterp(fPMColor, device[0], a1);
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkARGB32_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
     if (alpha == 0 || fSrcA == 0) {
         return;
     }
 
     uint32_t* device = fDevice.getAddr32(x, y);
     uint32_t  color = fPMColor;
 
@@ skipping 56 matching lines @@
                     device[n] = src + SkAlphaMulQ(device[n], dst_scale);
                 } while (n > 0);
             }
         }
         runs += count;
         antialias += count;
         device += count;
     }
 }
 
-#ifndef SK_SUPPORT_LEGACY_BLITANTIH2V2
-void SkARGB32_Black_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
-    uint32_t* device = fDevice.getAddr32(x, y);
-    SkDEBUGCODE((void)fDevice.getAddr32(x + 1, y);)
-
-    device[0] = (a0 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a0);
-    device[1] = (a1 << SK_A32_SHIFT) + SkAlphaMulQ(device[1], 256 - a1);
-}
-
-void SkARGB32_Black_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
-    uint32_t* device = fDevice.getAddr32(x, y);
-    SkDEBUGCODE((void)fDevice.getAddr32(x, y + 1);)
-    
-    device[0] = (a0 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a0);
-    device = (uint32_t*)((char*)device + fDevice.rowBytes());
-    device[0] = (a1 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a1);
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 // Special version of SkBlitRow::Factory32 that knows we're in kSrc_Mode,
 // instead of kSrcOver_Mode
 static void blend_srcmode(SkPMColor* SK_RESTRICT device,
                           const SkPMColor* SK_RESTRICT span,
                           int count, U8CPU aa) {
     int aa256 = SkAlpha255To256(aa);
     for (int i = 0; i < count; ++i) {
         device[i] = SkFourByteInterp256(span[i], device[i], aa256);
@@ skipping 357 matching lines @@
             SkBlitRow::Proc32 proc = (255 == alpha) ? fProc32 : fProc32Blend;
             do {
                 shaderContext->shadeSpan(x, y, span, 1);
                 proc(device, span, 1, alpha);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
         }
     }
 }