Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1068)

Unified Diff: include/gpu/SkGpuDevice.h

Issue 6636050: Remove gainFocus() and setMatrixClip() virtuals from SkDevice. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkDevice.h ('k') | src/core/SkCanvas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/SkGpuDevice.h
===================================================================
--- include/gpu/SkGpuDevice.h (revision 5859)
+++ include/gpu/SkGpuDevice.h (working copy)
@@ -51,12 +51,6 @@
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 @@
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 @@
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 @@
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;
« no previous file with comments | « include/core/SkDevice.h ('k') | src/core/SkCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b