Index: src/core/SkDrawProcs.h |
diff --git a/src/core/SkDrawProcs.h b/src/core/SkDrawProcs.h |
index 0a188235d2dbc165f10737f7d2498f11ded3cd48..a861a0ad86688fc6b357e4862cc5a8fe4f7a5c22 100644 |
--- a/src/core/SkDrawProcs.h |
+++ b/src/core/SkDrawProcs.h |
@@ -8,57 +8,9 @@ |
#ifndef SkDrawProcs_DEFINED |
#define SkDrawProcs_DEFINED |
-#include "SkBlitter.h" |
#include "SkDraw.h" |
#include "SkGlyph.h" |
-class SkAAClip; |
-class SkBlitter; |
- |
-struct SkDraw1Glyph { |
- const SkDraw* fDraw; |
- const SkRegion* fClip; |
- const SkAAClip* fAAClip; |
- SkBlitter* fBlitter; |
- SkGlyphCache* fCache; |
- const SkPaint* fPaint; |
- SkIRect fClipBounds; |
- /** Half the sampling frequency of the rasterized glyph in x. */ |
- SkScalar fHalfSampleX; |
- /** Half the sampling frequency of the rasterized glyph in y. */ |
- SkScalar fHalfSampleY; |
- |
- /** Draws one glyph. |
- * |
- * The x and y are pre-biased, so implementations may just truncate them. |
- * i.e. half the sampling frequency has been added. |
- * e.g. 1/2 or 1/(2^(SkGlyph::kSubBits+1)) has already been added. |
- * This added bias can be found in fHalfSampleX,Y. |
- */ |
- typedef void (*Proc)(const SkDraw1Glyph&, Sk48Dot16 x, Sk48Dot16 y, const SkGlyph&); |
- |
- Proc init(const SkDraw* draw, SkBlitter* blitter, SkGlyphCache* cache, |
- const SkPaint&); |
- |
- // call this instead of fBlitter->blitMask() since this wrapper will handle |
- // the case when the mask is ARGB32_Format |
- // |
- void blitMask(const SkMask& mask, const SkIRect& clip) const { |
- if (SkMask::kARGB32_Format == mask.fFormat) { |
- this->blitMaskAsSprite(mask); |
- } else { |
- fBlitter->blitMask(mask, clip); |
- } |
- } |
- |
- // mask must be kARGB32_Format |
- void blitMaskAsSprite(const SkMask& mask) const; |
-}; |
- |
-struct SkDrawProcs { |
- SkDraw1Glyph::Proc fD1GProc; |
-}; |
- |
bool SkDrawTreatAAStrokeAsHairline(SkScalar strokeWidth, const SkMatrix&, |
SkScalar* coverage); |