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
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index 95ca5ad..868a825 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -1756,11 +1756,11 @@
}
static int lsurface_newImageSnapshot(lua_State* L) {
- SkImage* image = get_ref<SkSurface>(L, 1)->newImageSnapshot();
- if (nullptr == image) {
+ sk_sp<SkImage> image = get_ref<SkSurface>(L, 1)->makeImageSnapshot();
+ if (!image) {
lua_pushnil(L);
} else {
- push_ref(L, image)->unref();
+ push_ref(L, image);
}
return 1;
}
@@ -2075,11 +2075,11 @@
static int lsk_loadImage(lua_State* L) {
if (lua_gettop(L) > 0 && lua_isstring(L, 1)) {
const char* name = lua_tolstring(L, 1, nullptr);
- SkAutoDataUnref data(SkData::NewFromFileName(name));
- if (data.get()) {
- SkImage* image = SkImage::NewFromEncoded(data);
+ sk_sp<SkData> data(SkData::MakeFromFileName(name));
+ if (data) {
+ auto image = SkImage::MakeFromEncoded(std::move(data));
if (image) {
- push_ref(L, image)->unref();
+ push_ref(L, std::move(image));
return 1;
}
}