From a12225bd32d5172d0d07a7b6c75652f758dbb001 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 15 Apr 2015 18:05:47 -0700 Subject: [PATCH] Revert of make blitAntiH2 virtual, to prep for larger change (patchset #1 id:1 of https://codereview.chromium.org/1048323005/) Reason for revert: end of test Original issue's description: > make blitAntiH2 virtual, to prep for larger change > > testing... > > BUG=skia: > TBR= > > Committed: https://skia.googlesource.com/skia/+/33afdaa5213cf118b3ca290bb343253c8593756d TBR= NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1086293002 --- src/core/SkBlitter.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h index 8d9f7bcbed..2d4a0defbf 100644 --- a/src/core/SkBlitter.h +++ b/src/core/SkBlitter.h @@ -8,12 +8,6 @@ #ifndef SkBlitter_DEFINED #define SkBlitter_DEFINED -#ifdef SK_SUPPORT_LEGACY_BLITANTIH2V2 - #define SK_BLITANTIH2V2_VIRTUAL -#else - #define SK_BLITANTIH2V2_VIRTUAL virtual -#endif - #include "SkBitmap.h" #include "SkBitmapProcShader.h" #include "SkMask.h" @@ -60,7 +54,7 @@ public: virtual const SkBitmap* justAnOpaqueColor(uint32_t* value); // (x, y), (x + 1, y) - SK_BLITANTIH2V2_VIRTUAL void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) { + void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) { int16_t runs[3]; uint8_t aa[2]; @@ -73,7 +67,7 @@ public: } // (x, y), (x, y + 1) - SK_BLITANTIH2V2_VIRTUAL void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { + void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { int16_t runs[2]; uint8_t aa[1];