| Index: src/gpu/GrBitmapTextContext.h
|
| diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
|
| index e181fd2b69616befc8a3c08764d3c6b588f189a0..e389f814806ac113e0e746e44d313bcfea055cb9 100644
|
| --- a/src/gpu/GrBitmapTextContext.h
|
| +++ b/src/gpu/GrBitmapTextContext.h
|
| @@ -19,7 +19,7 @@ class GrTextStrike;
|
| */
|
| class GrBitmapTextContext : public GrTextContext {
|
| public:
|
| - static GrBitmapTextContext* Create(GrContext*, const SkDeviceProperties&);
|
| + static GrBitmapTextContext* Create(GrContext*, SkGpuDevice*, const SkDeviceProperties&);
|
|
|
| virtual ~GrBitmapTextContext() {}
|
|
|
| @@ -37,20 +37,21 @@ private:
|
| uint32_t fEffectTextureUniqueID;
|
| SkMatrix fLocalMatrix;
|
|
|
| - GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
|
| + GrBitmapTextContext(GrContext*, SkGpuDevice*, const SkDeviceProperties&);
|
|
|
| bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
|
|
|
| virtual void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
|
| const SkMatrix& viewMatrix, const char text[], size_t byteLength,
|
| - SkScalar x, SkScalar y) SK_OVERRIDE;
|
| + SkScalar x, SkScalar y, const SkIRect& regionClipBounds) SK_OVERRIDE;
|
| virtual void onDrawPosText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
|
| const SkMatrix& viewMatrix,
|
| const char text[], size_t byteLength,
|
| const SkScalar pos[], int scalarsPerPosition,
|
| - const SkPoint& offset) SK_OVERRIDE;
|
| + const SkPoint& offset, const SkIRect& regionClipBounds) SK_OVERRIDE;
|
|
|
| - void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&);
|
| + void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
|
| + const SkIRect& regionClipBounds);
|
| void appendGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*);
|
| bool uploadGlyph(GrGlyph*, GrFontScaler*);
|
| void flush(); // automatically called by destructor
|
|
|