diff --git a/include/core/SkSurface.h b/include/core/SkSurface.h index 8e7e148cb9..bb3f719754 100644 --- a/include/core/SkSurface.h +++ b/include/core/SkSurface.h @@ -51,14 +51,10 @@ public: void* context, const SkSurfaceProps* = nullptr); /** - * Return a new surface, with the memory for the pixels automatically allocated but respecting - * the specified rowBytes. If rowBytes==0, then a default value will be chosen. If a non-zero - * rowBytes is specified, then any images snapped off of this surface (via makeImageSnapshot()) - * are guaranteed to have the same rowBytes. - * - * If the requested alpha type is not opaque, then the surface's pixel memory will be - * zero-initialized. If it is opaque, then it will be left uninitialized, and the caller is - * responsible for initially clearing the surface. + * Return a new surface, with the memory for the pixels automatically allocated and + * zero-initialized, but respecting the specified rowBytes. If rowBytes==0, then a default + * value will be chosen. If a non-zero rowBytes is specified, then any images snapped off of + * this surface (via makeImageSnapshot()) are guaranteed to have the same rowBytes. * * If the requested surface cannot be created, or the request is not a * supported configuration, NULL will be returned. diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index 2b2bf64526..f2cb94a04f 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -208,11 +208,7 @@ sk_sp SkSurface::MakeRaster(const SkImageInfo& info, size_t rowBytes, return nullptr; } - // If the requested alpha type is opaque, then leave the pixels uninitialized. - // Alpha formats can be safely initialiezd to zero. - SkAutoTUnref pr(info.isOpaque() - ? SkMallocPixelRef::NewAllocate(info, rowBytes, nullptr) - : SkMallocPixelRef::NewZeroed(info, rowBytes, nullptr)); + SkAutoTUnref pr(SkMallocPixelRef::NewZeroed(info, rowBytes, nullptr)); if (nullptr == pr.get()) { return nullptr; }