aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkBlitter.h
diff options
context:
space:
mode:
authorGravatar jcgregorio <jcgregorio@google.com>2015-04-15 06:17:10 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-04-15 06:17:10 -0700
commitf91e676f941c7e9ec91ac298eaa32e4bf8f52762 (patch)
tree484750ff00d2efbb0f4754ff54e54a5d44c0bded /src/core/SkBlitter.h
parent7f00acbda6d35d2ba445a1e2909bb599b156cc5c (diff)
Revert of add new blit2 methods in support of antialiased hairlines guard flag SK_SUPPORT_LEGACY_BLITANTIH2V2 (patchset #2 id:20001 of https://codereview.chromium.org/1060153003/)
Reason for revert: DEPS roll is failing, one such example: http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_rel/builds/73847/steps/ash_unittests%20%28with%20patch%29/logs/stdio More here: https://codereview.chromium.org/1091483003 This CL was the only CL in the roll when things started to fail. Original issue's description: > add new blit2 methods in support of antialiased hairlines > > before: > 9M 1 528µs 530µs 539µs 607µs 5% ▁▁▁▁▁▁▁▁█▂ 8888 path_hairline_small_AA_quad > > after: > 9M 1 355µs 356µs 358µs 375µs 2% ▂▁▁▁▁▁▁▁▁█ 8888 path_hairline_small_AA_quad > > BUG=skia: > > does require new baselines (bug chrome is guarded) > > Committed: https://skia.googlesource.com/skia/+/dd83031b98db4c6d3d0de2353bf115152a7d1464 TBR=caryclark@google.com,reed@chromium.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1085013003
Diffstat (limited to 'src/core/SkBlitter.h')
-rw-r--r--src/core/SkBlitter.h37
1 files changed, 2 insertions, 35 deletions
diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h
index 51d60a4576..9447bf1b51 100644
--- a/src/core/SkBlitter.h
+++ b/src/core/SkBlitter.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2006 The Android Open Source Project
*
@@ -5,15 +6,10 @@
* found in the LICENSE file.
*/
+
#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"
@@ -59,35 +55,6 @@ 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) {
- int16_t runs[3];
- uint8_t aa[2];
-
- runs[0] = 1;
- runs[1] = 1;
- runs[2] = 0;
- aa[0] = SkToU8(a0);
- aa[1] = SkToU8(a1);
- this->blitAntiH(x, y, aa, runs);
- }
-
- // (x, y), (x, y + 1)
- SK_BLITANTIH2V2_VIRTUAL void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
- int16_t runs[2];
- uint8_t aa[1];
-
- runs[0] = 1;
- runs[1] = 0;
- aa[0] = SkToU8(a0);
- this->blitAntiH(x, y, aa, runs);
- // reset in case the clipping blitter modified runs
- runs[0] = 1;
- runs[1] = 0;
- aa[0] = SkToU8(a1);
- this->blitAntiH(x, y + 1, aa, runs);
- }
-
/**
* Special method just to identify the null blitter, which is returned
* from Choose() if the request cannot be fulfilled. Default impl