diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-17 23:35:06 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-17 23:35:06 +0000 |
| commit | 5fb2ce38b3dcb8e60e9e112df23c9d42456d7069 (patch) | |
| tree | 521360e38040e661934a07f7fe1c2c49f520940b /samplecode/SamplePictFile.cpp | |
| parent | d24a130c1217873d0744d35722005516a0acb774 (diff) | |
Staged removal of SkPicture-derived classes
This CL removes the SkPicture-derived classes (with a flag to keeps clients working). In the process it also lightens the recording factory function so it is no longer ref counted).
The only interesting bits are in SkPicture* and Sk*Picture.*
R=reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/238273012
git-svn-id: http://skia.googlecode.com/svn/trunk@14251 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SamplePictFile.cpp')
| -rw-r--r-- | samplecode/SamplePictFile.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index 11bd1f057b..59a7f4b55a 100644 --- a/samplecode/SamplePictFile.cpp +++ b/samplecode/SamplePictFile.cpp @@ -129,7 +129,7 @@ private: if (SkImageDecoder::DecodeFile(path, &bm)) { bm.setImmutable(); SkPictureRecorder recorder; - SkCanvas* can = recorder.beginRecording(bm.width(), bm.height()); + SkCanvas* can = recorder.beginRecording(bm.width(), bm.height(), NULL, 0); can->drawBitmap(bm, 0, 0, NULL); pic.reset(recorder.endRecording()); } else { @@ -147,7 +147,7 @@ private: } if (false) { // re-record SkPictureRecorder recorder; - pic->draw(recorder.beginRecording(pic->width(), pic->height())); + pic->draw(recorder.beginRecording(pic->width(), pic->height(), NULL, 0)); SkAutoTUnref<SkPicture> p2(recorder.endRecording()); SkString path2(path); @@ -161,32 +161,32 @@ private: return NULL; } - SkAutoTUnref<SkPictureFactory> factory; + SkAutoTDelete<SkBBHFactory> factory; switch (bbox) { case kNo_BBoxType: // no bbox playback necessary return pic.detach(); case kRTree_BBoxType: - factory.reset(SkNEW(SkRTreePictureFactory)); + factory.reset(SkNEW(SkRTreeFactory)); break; case kQuadTree_BBoxType: - factory.reset(SkNEW(SkQuadTreePictureFactory)); + factory.reset(SkNEW(SkQuadTreeFactory)); break; case kTileGrid_BBoxType: { SkASSERT(!fTileSize.isEmpty()); - SkTileGridPicture::TileGridInfo gridInfo; + SkTileGridFactory::TileGridInfo gridInfo; gridInfo.fMargin = SkISize::Make(0, 0); gridInfo.fOffset = SkIPoint::Make(0, 0); gridInfo.fTileInterval = fTileSize.toRound(); - factory.reset(SkNEW_ARGS(SkTileGridPictureFactory, (gridInfo))); + factory.reset(SkNEW_ARGS(SkTileGridFactory, (gridInfo))); break; } default: SkASSERT(false); } - SkPictureRecorder recorder(factory); - pic->draw(recorder.beginRecording(pic->width(), pic->height())); + SkPictureRecorder recorder; + pic->draw(recorder.beginRecording(pic->width(), pic->height(), factory.get(), 0)); return recorder.endRecording(); } |