diff options
author | 2010-10-26 19:44:10 +0000 | |
---|---|---|
committer | 2010-10-26 19:44:10 +0000 | |
commit | 99a45d3b5a2f492b3ee3d5d8c8baa52745c4b2fa (patch) | |
tree | 416b89aaba8864c51c0c62d4b9d00f7c25bd5358 /src/core/SkDraw.cpp | |
parent | ad11495e3d0809e4cc264f7302e399a7a5f430d0 (diff) |
Fix SkDraw::validate to work with vector Devices.
Vector devices don't have a (valid) fBitmap, so pass in width and height.
Review URL: http://codereview.appspot.com/2718041
git-svn-id: http://skia.googlecode.com/svn/trunk@616 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkDraw.cpp')
-rw-r--r-- | src/core/SkDraw.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index b3ce8139a5..8671d74d70 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -275,7 +275,7 @@ static void CallBitmapXferProc(const SkBitmap& bitmap, const SkIRect& rect, } void SkDraw::drawPaint(const SkPaint& paint) const { - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) if (fClip->isEmpty()) { return; @@ -562,7 +562,7 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count, } SkASSERT(pts != NULL); - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (fClip->isEmpty() || @@ -656,7 +656,7 @@ static inline SkPoint* as_rightbottom(SkRect* r) { } void SkDraw::drawRect(const SkRect& rect, const SkPaint& paint) const { - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (fClip->isEmpty() || @@ -798,7 +798,7 @@ static bool map_radius(const SkMatrix& matrix, SkScalar* value) { void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& paint, const SkMatrix* prePathMatrix, bool pathIsMutable) const { - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (fClip->isEmpty() || @@ -1023,7 +1023,7 @@ static bool clipped_out(const SkMatrix& matrix, const SkRegion& clip, void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix, const SkPaint& paint) const { - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (fClip->isEmpty() || @@ -1115,7 +1115,7 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix, void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint& paint) const { - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (fClip->isEmpty() || @@ -1206,7 +1206,7 @@ static void measure_text(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc, void SkDraw::drawText_asPaths(const char text[], size_t byteLength, SkScalar x, SkScalar y, const SkPaint& paint) const { - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) SkTextToPathIter iter(text, byteLength, paint, true, true); @@ -1438,7 +1438,7 @@ void SkDraw::drawText(const char text[], size_t byteLength, SkScalar x, SkScalar y, const SkPaint& paint) const { SkASSERT(byteLength == 0 || text != NULL); - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (text == NULL || byteLength == 0 || @@ -1639,7 +1639,7 @@ void SkDraw::drawPosText(const char text[], size_t byteLength, SkASSERT(byteLength == 0 || text != NULL); SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition); - SkDEBUGCODE(this->validate();) + SkDEBUGCODE(this->validate(fBitmap->width(), fBitmap->height());) // nothing to draw if (text == NULL || byteLength == 0 || @@ -2235,7 +2235,7 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count, #ifdef SK_DEBUG -void SkDraw::validate() const { +void SkDraw::validate(int width, int height) const { SkASSERT(fBitmap != NULL); SkASSERT(fMatrix != NULL); SkASSERT(fClip != NULL); @@ -2243,7 +2243,7 @@ void SkDraw::validate() const { const SkIRect& cr = fClip->getBounds(); SkIRect br; - br.set(0, 0, fBitmap->width(), fBitmap->height()); + br.set(0, 0, width, height); SkASSERT(cr.isEmpty() || br.contains(cr)); } |