Move SkSurface factories to SkSurfaces namespace
* SkSurface::MakeFromAHardwareBuffer -> SkSurfaces::WrapAndroidHardwareBuffer
* SkSurface::MakeFromBackendRenderTarget -> SkSurfaces::WrapBackendRenderTarget
* SkSurface::MakeFromBackendTexture -> SkSurfaces::WrapBackendTexture
* SkSurface::MakeFromCAMetalLayer -> SkSurfaces::WrapCAMetalLayer
* SkSurface::MakeFromMTKView -> SkSurfaces::WrapMTKView
* SkSurface::MakeGraphite -> SkSurfaces::RenderTarget
* SkSurface::MakeGraphiteFromBackendTexture -> SkSurfaces::WrapBackendTexture
* SkSurface::MakeRaster -> SkSurfaces::Raster
* SkSurface::MakeRasterDirect -> SkSurfaces::WrapPixels
* SkSurface::MakeRasterDirectReleaseProc -> SkSurfaces::WrapPixels
* SkSurface::MakeRasterN32Premul -> SkSurfaces::Raster
* SkSurface::MakeRenderTarget -> SkSurfaces::RenderTarget
Suggested review order:
- include/*
- src/gpu/ganesh/surface/SkSurface_Ganesh.cpp
- src/image/SkSurface_Raster.cpp
- src/image/SkSurface.cpp
- All other changes which were mostly find-replace followed
by `git clang-format origin/main`
Change-Id: Idb18ab5c2beb12d8b4ec6712e9abee286646424f
Bug: skia:13983
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/687639
Commit-Queue: Kevin Lubick <[email protected]>
Reviewed-by: Brian Osman <[email protected]>
diff --git a/fuzz/FuzzGradients.cpp b/fuzz/FuzzGradients.cpp
index 4732954..93bc1e0 100644
--- a/fuzz/FuzzGradients.cpp
+++ b/fuzz/FuzzGradients.cpp
@@ -124,7 +124,7 @@
p.setShader(SkGradientShader::MakeLinear(pts, colors.data(), pos.data(),
colors.size(), mode, flags, localMatrix.getMaybeNull()));
- sk_sp<SkSurface> surface(SkSurface::MakeRasterN32Premul(50, 50));
+ sk_sp<SkSurface> surface(SkSurfaces::Raster(SkImageInfo::MakeN32Premul(50, 50)));
if (useGlobalMatrix) {
SkMatrix gm;
makeMatrix(fuzz, &gm);
@@ -162,8 +162,7 @@
p.setShader(SkGradientShader::MakeRadial(center, radius, colors.data(),
pos.data(), colors.size(), mode, flags, localMatrix.getMaybeNull()));
-
- sk_sp<SkSurface> surface(SkSurface::MakeRasterN32Premul(50, 50));
+ sk_sp<SkSurface> surface(SkSurfaces::Raster(SkImageInfo::MakeN32Premul(50, 50)));
if (useGlobalMatrix) {
SkMatrix gm;
makeMatrix(fuzz, &gm);
@@ -201,7 +200,7 @@
end, endRadius, colors.data(), pos.data(), colors.size(), mode,
flags, localMatrix.getMaybeNull()));
- sk_sp<SkSurface> surface(SkSurface::MakeRasterN32Premul(50, 50));
+ sk_sp<SkSurface> surface(SkSurfaces::Raster(SkImageInfo::MakeN32Premul(50, 50)));
if (useGlobalMatrix) {
SkMatrix gm;
makeMatrix(fuzz, &gm);
@@ -237,7 +236,7 @@
pos.data(), colors.size()));
}
- sk_sp<SkSurface> surface(SkSurface::MakeRasterN32Premul(50, 50));
+ sk_sp<SkSurface> surface(SkSurfaces::Raster(SkImageInfo::MakeN32Premul(50, 50)));
if (useGlobalMatrix) {
SkMatrix gm;
makeMatrix(fuzz, &gm);