diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-09 14:20:37 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-09 14:20:37 +0000 |
| commit | a1c3d78f224874833920c8017f4287a3ec538779 (patch) | |
| tree | 5ae1ea87edd530f8ef8597f594fcb072e02f8379 /include/gpu | |
| parent | 6aea33f92c611d6fdc88bc2352c5c966168af83b (diff) | |
Remove gainFocus() and setMatrixClip() virtuals from SkDevice.
R=reed@google.com,robertphillips@google.com
Review URL: https://codereview.appspot.com/6636050
git-svn-id: http://skia.googlecode.com/svn/trunk@5861 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 790d4a9ca1..b941894221 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -51,12 +51,6 @@ public: GrContext* context() const { return fContext; } - /** - * Override from SkGpuDevice, so we can set our FBO to be the render target - * The canvas parameter must be a SkGpuCanvas - */ - virtual void gainFocus(const SkMatrix&, const SkRegion&) SK_OVERRIDE; - virtual SkGpuRenderTarget* accessRenderTarget() SK_OVERRIDE; // overrides from SkDevice @@ -65,9 +59,6 @@ public: virtual void writePixels(const SkBitmap& bitmap, int x, int y, SkCanvas::Config8888 config8888) SK_OVERRIDE; - virtual void setMatrixClip(const SkMatrix& matrix, const SkRegion& clip, - const SkClipStack&) SK_OVERRIDE; - virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) SK_OVERRIDE; @@ -134,10 +125,9 @@ private: GrClipData fClipData; - // state for our offscreen render-target + // state for our render-target GrRenderTarget* fRenderTarget; bool fNeedClear; - bool fNeedPrepareRenderTarget; // called from rt and tex cons void initFromRenderTarget(GrContext*, GrRenderTarget*, bool cached); @@ -154,7 +144,7 @@ private: SkDrawProcs* initDrawForText(GrTextContext*); bool bindDeviceAsTexture(GrPaint* paint); - void prepareRenderTarget(const SkDraw&); + void prepareDraw(const SkDraw&); // sets the render target, clip, and matrix on GrContext. bool shouldTileBitmap(const SkBitmap& bitmap, const GrTextureParams& sampler, const SkRect* srcRectPtr) const; |