Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: src/core/SkPicturePlayback.cpp

Issue 203333005: Revert of r13836 due to Chromium cc_unittests failures (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkPicturePlayback.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPicturePlayback.cpp
===================================================================
--- src/core/SkPicturePlayback.cpp (revision 13849)
+++ src/core/SkPicturePlayback.cpp (working copy)
@@ -69,7 +69,7 @@
record.validate(record.writeStream().bytesWritten(), 0);
const SkWriter32& writer = record.writeStream();
- this->init();
+ init();
SkASSERT(!fOpData);
if (writer.bytesWritten() == 0) {
fOpData = SkData::NewEmpty();
@@ -261,7 +261,6 @@
fFactoryPlayback = NULL;
fBoundingHierarchy = NULL;
fStateTree = NULL;
- fCachedActiveOps = NULL;
}
SkPicturePlayback::~SkPicturePlayback() {
@@ -272,8 +271,6 @@
SkSafeUnref(fBoundingHierarchy);
SkSafeUnref(fStateTree);
- SkDELETE(fCachedActiveOps);
-
for (int i = 0; i < fPictureCount; i++) {
fPictureRefs[i]->unref();
}
@@ -757,16 +754,11 @@
// 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 ((NULL != activeOps && 0 == activeOps->count()) || NULL == fBitmapUseOffsets) {
+void SkPicturePlayback::preLoadBitmaps(const SkTDArray<void*>& activeOps) {
+ if (0 == activeOps.count() || NULL == fBitmapUseOffsets) {
return;
}
- if (NULL == activeOps) {
- // going to need everything
- return;
- }
-
SkTDArray<int> active;
SkAutoTDeleteArray<bool> needToCheck(new bool[fBitmapUseOffsets->numIDs()]);
@@ -774,10 +766,10 @@
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]) {
@@ -803,41 +795,6 @@
}
}
-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));
-
- 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);
@@ -858,29 +815,26 @@
SkReader32 reader(fOpData->bytes(), fOpData->size());
TextContainer text;
- const SkTDArray<void*>* activeOps = NULL;
+ SkTDArray<void*> activeOps;
if (NULL != fStateTree && NULL != fBoundingHierarchy) {
SkRect clipBounds;
if (canvas.getClipBounds(&clipBounds)) {
SkIRect query;
clipBounds.roundOut(&query);
-
- 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;
+ fBoundingHierarchy->search(query, &activeOps);
+ if (activeOps.count() == 0) {
+ return;
}
+ SkTQSort<SkPictureStateTree::Draw>(
+ reinterpret_cast<SkPictureStateTree::Draw**>(activeOps.begin()),
+ reinterpret_cast<SkPictureStateTree::Draw**>(activeOps.end()-1));
}
}
- SkPictureStateTree::Iterator it = (NULL == activeOps) ?
+ SkPictureStateTree::Iterator it = (NULL == fStateTree) ?
SkPictureStateTree::Iterator() :
- fStateTree->getIterator(*activeOps, &canvas);
+ fStateTree->getIterator(activeOps, &canvas);
if (it.isValid()) {
uint32_t skipTo = it.draw();
« no previous file with comments | « src/core/SkPicturePlayback.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698