diff options
| author |  reed <reed@google.com> | 2016-03-17 10:51:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-17 10:51:11 -0700 |
| commit | 9ce9d6772df650ceb0511f275e1a83dffa78ff72 (patch) | |
| tree | 1c0d54a75945863947490ec45cccf7c30eaa2ca4 /gm/imagefromyuvtextures.cpp | |
| parent | 42d95a0afb26560586232961445ba36de387ca37 (diff) | |
update callsites for Make image factories
not forced yet, as we still have the build-guard. waiting on chrome CL
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003
TBR=
Review URL: https://codereview.chromium.org/1810813003
Diffstat (limited to 'gm/imagefromyuvtextures.cpp')
| -rw-r--r-- | gm/imagefromyuvtextures.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp index 6280ae740b..0d2637cabe 100644 --- a/gm/imagefromyuvtextures.cpp +++ b/gm/imagefromyuvtextures.cpp @@ -90,7 +90,7 @@ protected: ((112 * rgb[0] - 94 * rgb[1] - 18 * rgb[2] + 128) >> 8) + 128); } } - fRGBImage.reset(SkImage::NewRasterCopy(rgbBmp.info(), rgbColors, rgbBmp.rowBytes())); + fRGBImage = SkImage::MakeRasterCopy(SkPixmap(rgbBmp.info(), rgbColors, rgbBmp.rowBytes())); } void createYUVTextures(GrContext* context, GrBackendObject yuvHandles[3]) { @@ -141,28 +141,26 @@ protected: { fYUVBmps[1].width(), fYUVBmps[1].height()}, { fYUVBmps[2].width(), fYUVBmps[2].height()}, }; - SkTArray<SkImage*> images; - images.push_back(SkRef(fRGBImage.get())); + SkTArray<sk_sp<SkImage>> images; + images.push_back(fRGBImage); for (int space = kJPEG_SkYUVColorSpace; space <= kLastEnum_SkYUVColorSpace; ++space) { - images.push_back(SkImage::NewFromYUVTexturesCopy(context, - static_cast<SkYUVColorSpace>(space), - yuvHandles, sizes, - kTopLeft_GrSurfaceOrigin)); + images.push_back(SkImage::MakeFromYUVTexturesCopy(context, + static_cast<SkYUVColorSpace>(space), + yuvHandles, sizes, + kTopLeft_GrSurfaceOrigin)); } this->deleteYUVTextures(context, yuvHandles); for (int i = 0; i < images.count(); ++ i) { SkScalar y = (i + 1) * kPad + i * fYUVBmps[0].height(); SkScalar x = kPad; - canvas->drawImage(images[i], x, y); - images[i]->unref(); - images[i] = nullptr; + canvas->drawImage(images[i].get(), x, y); } } private: - SkAutoTUnref<SkImage> fRGBImage; - SkBitmap fYUVBmps[3]; + sk_sp<SkImage> fRGBImage; + SkBitmap fYUVBmps[3]; static const int kBmpSize = 32; |