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

Unified Diff: src/core/SkPictureData.h

Issue 719113004: Followup: remove unnecessary SkTRefArray (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: count Created 6 years, 1 month 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/SkBitmapHeap.cpp ('k') | src/core/SkPictureData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPictureData.h
diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h
index 9a5a4ca0c13a625eabac94f51bb002b31b78cfbd..667880675bff1b9d5f00e9fd5334ed24bf463dbb 100644
--- a/src/core/SkPictureData.h
+++ b/src/core/SkPictureData.h
@@ -84,12 +84,12 @@ protected:
public:
const SkBitmap& getBitmap(SkReader32* reader) const {
const int index = reader->readInt();
- return (*fBitmaps)[index];
+ return fBitmaps[index];
}
const SkPath& getPath(SkReader32* reader) const {
int index = reader->readInt() - 1;
- return (*fPaths)[index];
+ return fPaths[index];
}
const SkPicture* getPicture(SkReader32* reader) const {
@@ -103,7 +103,7 @@ public:
if (index == 0) {
return NULL;
}
- return &(*fPaints)[index - 1];
+ return &fPaints[index - 1];
}
const SkTextBlob* getTextBlob(SkReader32* reader) const {
@@ -142,9 +142,9 @@ private:
// bitmap allows playback to draw nothing and move on.
SkBitmap fBadBitmap;
- SkTRefArray<SkBitmap>* fBitmaps;
- SkTRefArray<SkPaint>* fPaints;
- SkTRefArray<SkPath>* fPaths;
+ SkTArray<SkBitmap> fBitmaps;
+ SkTArray<SkPaint> fPaints;
+ SkTArray<SkPath> fPaths;
SkData* fOpData; // opcodes and parameters
« no previous file with comments | « src/core/SkBitmapHeap.cpp ('k') | src/core/SkPictureData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698