// SkBBoxHierarchy implementation
virtual SkBBoxHierarchy* createBBoxHierarchy() const;
private:
+ // An OperationList encapsulates a set of operation offsets into the picture byte
+ // stream along with the CTMs needed for those operation.
+ class OperationList : public SkNoncopyable {
+ public:
+ virtual ~OperationList() {}
+
+ // If valid returns false then there is no optimization data
+ // present. All the draw operations need to be issued.
+ virtual bool valid() const { return false; }
+
+ // The following three entry points should only be accessed if
+ // 'valid' returns true.
+ virtual int numOps() const { SkASSERT(false); return 0; };
+ // The offset in the picture of the operation to execute.
+ virtual uint32_t offset(int index) const { SkASSERT(false); return 0; };
+ // The CTM that must be installed for the operation to behave correctly
+ virtual const SkMatrix& matrix(int index) const { SkASSERT(false); return SkMatrix::I(); }
+
+ static const OperationList& InvalidList();
+
+ private:
+ typedef SkNoncopyable INHERITED;
+ };
+
+ /** PRIVATE / EXPERIMENTAL -- do not call
+ Return the operations required to render the content inside 'queryRect'.
+ */
+ const OperationList& EXPERIMENTAL_getActiveOps(const SkIRect& queryRect);
+
void createHeader(SkPictInfo* info) const;
static bool IsValidPictInfo(const SkPictInfo& info);
friend class SkFlatPicture;
friend class SkPicturePlayback;
+ friend class SkGpuDevice;
typedef SkRefCnt INHERITED;
};
SkASSERT(NULL == fRecord);
}
+const SkPicture::OperationList& SkPicture::OperationList::InvalidList() {
+ static OperationList gInvalid;
+ return gInvalid;
+}
+
+const SkPicture::OperationList& SkPicture::EXPERIMENTAL_getActiveOps(const SkIRect& queryRect) {
+ this->endRecording();
+ if (NULL != fPlayback) {
+ return fPlayback->getActiveOps(queryRect);
+ }
+ return OperationList::InvalidList();
+}
+
void SkPicture::draw(SkCanvas* surface, SkDrawPictureCallback* callback) {
this->endRecording();
if (NULL != fPlayback) {
-
/*
* Copyright 2011 Google Inc.
*
record.validate(record.writeStream().bytesWritten(), 0);
const SkWriter32& writer = record.writeStream();
- init();
+ this->init();
SkASSERT(!fOpData);
if (writer.bytesWritten() == 0) {
fOpData = SkData::NewEmpty();
fFactoryPlayback = NULL;
fBoundingHierarchy = NULL;
fStateTree = NULL;
+ fCachedActiveOps = NULL;
}
SkPicturePlayback::~SkPicturePlayback() {
SkSafeUnref(fBoundingHierarchy);
SkSafeUnref(fStateTree);
+ SkDELETE(fCachedActiveOps);
+
for (int i = 0; i < fPictureCount; i++) {
fPictureRefs[i]->unref();
}
// The activeOps parameter is actually "const SkTDArray<SkPictureStateTree::Draw*>&".
// It represents the operations about to be drawn, as generated by some spatial
// subdivision helper class. It should already be in 'fOffset' sorted order.
-void SkPicturePlayback::preLoadBitmaps(const SkTDArray<void*>& activeOps) {
- if (0 == activeOps.count() || NULL == fBitmapUseOffsets) {
+void SkPicturePlayback::preLoadBitmaps(const SkTDArray<void*>* activeOps) {
+ if ((NULL != activeOps && 0 == activeOps->count()) || NULL == fBitmapUseOffsets) {
+ return;
+ }
+
+ if (NULL == activeOps) {
+ // going to need everything
return;
}
needToCheck.get()[i] = true;
}
- uint32_t max = ((SkPictureStateTree::Draw*)activeOps[activeOps.count()-1])->fOffset;
+ uint32_t max = ((SkPictureStateTree::Draw*)(*activeOps)[(*activeOps).count()-1])->fOffset;
- for (int i = 0; i < activeOps.count(); ++i) {
- SkPictureStateTree::Draw* draw = (SkPictureStateTree::Draw*) activeOps[i];
+ for (int i = 0; i < activeOps->count(); ++i) {
+ SkPictureStateTree::Draw* draw = (SkPictureStateTree::Draw*) (*activeOps)[i];
for (int j = 0; j < fBitmapUseOffsets->numIDs(); ++j) {
if (!needToCheck.get()[j]) {
}
}
+uint32_t SkPicturePlayback::CachedOperationList::offset(int index) const {
+ SkASSERT(index < fOps.count());
+ return ((SkPictureStateTree::Draw*)fOps[index])->fOffset;
+}
+
+const SkMatrix& SkPicturePlayback::CachedOperationList::matrix(int index) const {
+ SkASSERT(index < fOps.count());
+ return *((SkPictureStateTree::Draw*)fOps[index])->fMatrix;
+}
+
+const SkPicture::OperationList& SkPicturePlayback::getActiveOps(const SkIRect& query) {
+ if (NULL == fStateTree || NULL == fBoundingHierarchy) {
+ return SkPicture::OperationList::InvalidList();
+ }
+
+ if (NULL == fCachedActiveOps) {
+ fCachedActiveOps = SkNEW(CachedOperationList);
+ }
+
+ if (query == fCachedActiveOps->fCacheQueryRect) {
+ return *fCachedActiveOps;
+ }
+
+ fCachedActiveOps->fOps.rewind();
+
+ fBoundingHierarchy->search(query, &(fCachedActiveOps->fOps));
+ if (0 != fCachedActiveOps->fOps.count()) {
+ SkTQSort<SkPictureStateTree::Draw>(
+ reinterpret_cast<SkPictureStateTree::Draw**>(fCachedActiveOps->fOps.begin()),
+ reinterpret_cast<SkPictureStateTree::Draw**>(fCachedActiveOps->fOps.end()-1));
+ }
+
+ fCachedActiveOps->fCacheQueryRect = query;
+ return *fCachedActiveOps;
+}
+
void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) {
#ifdef ENABLE_TIME_DRAW
SkAutoTime at("SkPicture::draw", 50);
SkReader32 reader(fOpData->bytes(), fOpData->size());
TextContainer text;
- SkTDArray<void*> activeOps;
+ const SkTDArray<void*>* activeOps = NULL;
if (NULL != fStateTree && NULL != fBoundingHierarchy) {
SkRect clipBounds;
if (canvas.getClipBounds(&clipBounds)) {
SkIRect query;
clipBounds.roundOut(&query);
- fBoundingHierarchy->search(query, &activeOps);
- if (activeOps.count() == 0) {
- return;
+
+ const SkPicture::OperationList& activeOpsList = this->getActiveOps(query);
+ if (activeOpsList.valid()) {
+ if (0 == activeOpsList.numOps()) {
+ return; // nothing to draw
+ }
+
+ // Since the opList is valid we know it is our derived class
+ activeOps = &((const CachedOperationList&)activeOpsList).fOps;
}
- SkTQSort<SkPictureStateTree::Draw>(
- reinterpret_cast<SkPictureStateTree::Draw**>(activeOps.begin()),
- reinterpret_cast<SkPictureStateTree::Draw**>(activeOps.end()-1));
}
}
- SkPictureStateTree::Iterator it = (NULL == fStateTree) ?
+ SkPictureStateTree::Iterator it = (NULL == activeOps) ?
SkPictureStateTree::Iterator() :
- fStateTree->getIterator(activeOps, &canvas);
+ fStateTree->getIterator(*activeOps, &canvas);
if (it.isValid()) {
uint32_t skipTo = it.draw();
virtual ~SkPicturePlayback();
+ const SkPicture::OperationList& getActiveOps(const SkIRect& queryRect);
+
void draw(SkCanvas& canvas, SkDrawPictureCallback*);
void serialize(SkWStream*, SkPicture::EncodeBitmap) const;
virtual void postDraw(int opIndex);
#endif
- void preLoadBitmaps(const SkTDArray<void*>& results);
+ void preLoadBitmaps(const SkTDArray<void*>* results);
private:
class TextContainer {
SkBBoxHierarchy* fBoundingHierarchy;
SkPictureStateTree* fStateTree;
+ class CachedOperationList : public SkPicture::OperationList {
+ public:
+ CachedOperationList() {
+ fCacheQueryRect.setEmpty();
+ }
+
+ virtual bool valid() const { return true; }
+ virtual int numOps() const SK_OVERRIDE { return fOps.count(); }
+ virtual uint32_t offset(int index) const SK_OVERRIDE;
+ virtual const SkMatrix& matrix(int index) const SK_OVERRIDE;
+
+ // The query rect for which the cached active ops are valid
+ SkIRect fCacheQueryRect;
+
+ // The operations which are active within 'fCachedQueryRect'
+ SkTDArray<void*> fOps;
+
+ private:
+ typedef SkPicture::OperationList INHERITED;
+ };
+
+ CachedOperationList* fCachedActiveOps;
+
SkTypefacePlayback fTFPlayback;
SkFactoryPlayback* fFactoryPlayback;
#ifdef SK_BUILD_FOR_ANDROID
#include "SkPaint.h"
#include "SkPicture.h"
#include "SkPictureUtils.h"
+#include "SkQuadTreePicture.h"
#include "SkRRect.h"
#include "SkRandom.h"
#include "SkShader.h"
#include "SkStream.h"
+#include "SkTileGrid.h"
#include "Test.h"
static const int gColorScale = 30;
}
}
+static void test_draw_empty(skiatest::Reporter* reporter) {
+ SkBitmap result;
+ make_bm(&result, 2, 2, SK_ColorBLACK, false);
+
+ SkCanvas canvas(result);
+
+ {
+ // stock SkPicture
+ SkPicture picture;
+ picture.beginRecording(1, 1);
+ picture.endRecording();
+
+ canvas.drawPicture(picture);
+ }
+
+ {
+ // tile grid
+ SkTileGridPicture::TileGridInfo gridInfo;
+ gridInfo.fMargin.setEmpty();
+ gridInfo.fOffset.setZero();
+ gridInfo.fTileInterval.set(1, 1);
+
+ SkTileGridPicture picture(1, 1, gridInfo);
+ picture.beginRecording(1, 1, SkPicture::kOptimizeForClippedPlayback_RecordingFlag);
+ picture.endRecording();
+
+ canvas.drawPicture(picture);
+ }
+
+ {
+ // RTree
+ SkPicture picture;
+ picture.beginRecording(1, 1, SkPicture::kOptimizeForClippedPlayback_RecordingFlag);
+ picture.endRecording();
+
+ canvas.drawPicture(picture);
+ }
+
+ {
+ // quad tree
+ SkQuadTreePicture picture(SkIRect::MakeWH(1, 1));
+ picture.beginRecording(1, 1, SkPicture::kOptimizeForClippedPlayback_RecordingFlag);
+ picture.endRecording();
+
+ canvas.drawPicture(picture);
+ }
+}
+
static void test_clip_bound_opt(skiatest::Reporter* reporter) {
// Test for crbug.com/229011
SkRect rect1 = SkRect::MakeXYWH(SkIntToScalar(4), SkIntToScalar(4),
test_gatherpixelrefsandrects(reporter);
test_bitmap_with_encoded_data(reporter);
test_clone_empty(reporter);
+ test_draw_empty(reporter);
test_clip_bound_opt(reporter);
test_clip_expansion(reporter);
test_hierarchical(reporter);
int recordingFlags = FLAGS_flags;
SkAutoTUnref<SkPicture> dst(pictureFactory(width, height, &recordingFlags));
SkCanvas* canvas = dst->beginRecording(width, height, recordingFlags);
- if (src) src->draw(canvas);
- if (FLAGS_endRecording) dst->endRecording();
+ if (NULL != src) {
+ src->draw(canvas);
+ }
+ if (FLAGS_endRecording) {
+ dst->endRecording();
+ }
}
const SkMSec elapsed = SkTime::GetMSecs() - start;
return 1;
}
bench_record(NULL, "NULL", pictureFactory);
- if (FLAGS_skps.isEmpty()) return 0;
+ if (FLAGS_skps.isEmpty()) {
+ return 0;
+ }
SkOSFile::Iter it(FLAGS_skps[0], ".skp");
SkString filename;