AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fNextIndex is redundant. Remove it.

Browse Source 
This is warmup for removing the NULL at the front.

Testing: out/Debug/tests && out/Debug/dm && echo ok

BUG=skia:1979
R=dominikg@chromium.org, tomhudson@chromium.org, halcanary@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/134223002

git-svn-id: http://skia.googlecode.com/svn/trunk@13026 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-01-10 19:37:00 +00:00
parent 1066f08378
commit f85251c74d
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/SkPictureFlat.h
View File

@ -392,7 +392,6 @@ public:
// TODO(mtklein): There's no reason to have the index start from 1. Clean this up.
// index 0 is always empty since it is used as a signal that find failed
fIndexedData.push(NULL);
fNextIndex = 1;
}
~SkFlatDictionary() {
@ -400,9 +399,8 @@ public:
}
int count() const {
SkASSERT(fIndexedData.count() == fNextIndex);
SkASSERT(fHash.count() == fNextIndex - 1);
return fNextIndex - 1;
SkASSERT(fHash.count() == fIndexedData.count() - 1);
return fHash.count();
}
// For testing only. Index is zero-based.
@ -450,11 +448,11 @@ public:
return flat;
}
// findAndReturnMutableFlat gave us index (fNextIndex-1), but we'll use the old one.
fIndexedData.remove(flat->index());
fNextIndex--;
// findAndReturnMutableFlat put flat at the back. Swap it into found->index() instead.
SkASSERT(flat->index() == this->count());
flat->setIndex(found->index());
fIndexedData[flat->index()] = flat;
fIndexedData.removeShuffle(found->index());
SkASSERT(flat == fIndexedData[found->index()]);
// findAndReturnMutableFlat already called fHash.add(), so we just clean up the old entry.
fHash.remove(*found);
@ -538,15 +536,15 @@ private:
// As findAndReturnFlat, but returns a mutable pointer for internal use.
SkFlatData* findAndReturnMutableFlat(const T& element) {
// Only valid until the next call to resetScratch().
const SkFlatData& scratch = this->resetScratch(element, fNextIndex);
const SkFlatData& scratch = this->resetScratch(element, this->count()+1);
SkFlatData* candidate = fHash.find(scratch);
if (candidate != NULL) return candidate;
SkFlatData* detached = this->detachScratch();
fHash.add(detached);
*fIndexedData.insert(fNextIndex) = detached;
fNextIndex++;
*fIndexedData.append() = detached;
SkASSERT(fIndexedData.top()->index() == this->count());
return detached;
}
@ -607,9 +605,6 @@ private:
SkOrderedWriteBuffer fWriteBuffer;
bool fReady;
// We map between SkFlatData and a 1-based integer index.
int fNextIndex;
// For index -> SkFlatData. fIndexedData[0] is always NULL.
SkTDArray<const SkFlatData*> fIndexedData;