Ensure that Pipe does not crash when attempting to draw after endRecording.
Add a test for drawing a bitmap and a bitmapshader after endRecording.
BUG=https://code.google.com/p/skia/issues/detail?id=774&can=3
Test=PipeTest
Review URL: https://codereview.appspot.com/6459088
git-svn-id: http://skia.googlecode.com/svn/trunk@5099 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index e1eaabd9..4f408fd 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -192,7 +192,7 @@
size_t freeMemoryIfPossible(size_t bytesToFree);
size_t storageAllocatedForRecording() {
- return fBitmapHeap->bytesAllocated();
+ return (NULL == fBitmapHeap) ? 0 : fBitmapHeap->bytesAllocated();
}
// overrides from SkCanvas
@@ -348,11 +348,11 @@
// return 0 for NULL (or unflattenable obj), or index-base-1
// return ~(index-base-1) if an old flattenable was replaced
int SkGPipeCanvas::flattenToIndex(SkFlattenable* obj, PaintFlats paintflat) {
+ SkASSERT(!fDone && fBitmapHeap != NULL);
if (NULL == obj) {
return 0;
}
-
fBitmapHeap->deferAddingOwners();
bool added, replaced;
const SkFlatData* flat = fFlatDictionary.findAndReplace(*obj, fFlattenableHeap.flatToReplace(),
@@ -703,15 +703,16 @@
unsigned flags,
size_t opBytesNeeded,
const SkPaint* paint) {
- int32_t bitmapIndex = fBitmapHeap->insert(bm);
- if (SkBitmapHeap::INVALID_SLOT == bitmapIndex) {
- return false;
- }
if (paint != NULL) {
flags |= kDrawBitmap_HasPaint_DrawOpsFlag;
this->writePaint(*paint);
}
if (this->needOpBytes(opBytesNeeded)) {
+ SkASSERT(fBitmapHeap != NULL);
+ int32_t bitmapIndex = fBitmapHeap->insert(bm);
+ if (SkBitmapHeap::INVALID_SLOT == bitmapIndex) {
+ return false;
+ }
this->writeOp(op, flags, bitmapIndex);
return true;
}
@@ -941,7 +942,7 @@
}
size_t SkGPipeCanvas::freeMemoryIfPossible(size_t bytesToFree) {
- return fBitmapHeap->freeMemoryIfPossible(bytesToFree);
+ return (NULL == fBitmapHeap) ? 0 : fBitmapHeap->freeMemoryIfPossible(bytesToFree);
}
///////////////////////////////////////////////////////////////////////////////
@@ -956,6 +957,9 @@
}
void SkGPipeCanvas::writePaint(const SkPaint& paint) {
+ if (fDone) {
+ return;
+ }
SkPaint& base = fPaint;
uint32_t storage[32];
uint32_t* ptr = storage;