From deec79b3c61b4444c54e0b159a517920ab841658 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 24 Jul 2021 17:00:28 +0200 Subject: [PATCH] LibGfx: Add try_ prefix to Bitmap::try_allocate_backing_store() --- Userland/Libraries/LibGfx/Bitmap.cpp | 6 +++--- Userland/Libraries/LibGfx/Bitmap.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp index a9c43dfed9..355941cd58 100644 --- a/Userland/Libraries/LibGfx/Bitmap.cpp +++ b/Userland/Libraries/LibGfx/Bitmap.cpp @@ -67,7 +67,7 @@ static bool size_would_overflow(BitmapFormat format, const IntSize& size, int sc RefPtr Bitmap::try_create(BitmapFormat format, const IntSize& size, int scale_factor) { - auto backing_store = Bitmap::allocate_backing_store(format, size, scale_factor, Purgeable::No); + auto backing_store = Bitmap::try_allocate_backing_store(format, size, scale_factor, Purgeable::No); if (!backing_store.has_value()) return nullptr; return adopt_ref(*new Bitmap(format, size, scale_factor, Purgeable::No, backing_store.value())); @@ -75,7 +75,7 @@ RefPtr Bitmap::try_create(BitmapFormat format, const IntSize& size, int RefPtr Bitmap::try_create_purgeable(BitmapFormat format, const IntSize& size, int scale_factor) { - auto backing_store = Bitmap::allocate_backing_store(format, size, scale_factor, Purgeable::Yes); + auto backing_store = Bitmap::try_allocate_backing_store(format, size, scale_factor, Purgeable::Yes); if (!backing_store.has_value()) return nullptr; return adopt_ref(*new Bitmap(format, size, scale_factor, Purgeable::Yes, backing_store.value())); @@ -576,7 +576,7 @@ ShareableBitmap Bitmap::to_shareable_bitmap() const return ShareableBitmap(*bitmap); } -Optional Bitmap::allocate_backing_store(BitmapFormat format, const IntSize& size, int scale_factor, [[maybe_unused]] Purgeable purgeable) +Optional Bitmap::try_allocate_backing_store(BitmapFormat format, IntSize const& size, int scale_factor, [[maybe_unused]] Purgeable purgeable) { if (size_would_overflow(format, size, scale_factor)) return {}; diff --git a/Userland/Libraries/LibGfx/Bitmap.h b/Userland/Libraries/LibGfx/Bitmap.h index 4e0c1d7c3d..b08622f6c3 100644 --- a/Userland/Libraries/LibGfx/Bitmap.h +++ b/Userland/Libraries/LibGfx/Bitmap.h @@ -243,7 +243,7 @@ private: Bitmap(BitmapFormat, const IntSize&, int, size_t pitch, void*); Bitmap(BitmapFormat, Core::AnonymousBuffer, const IntSize&, int, const Vector& palette); - static Optional allocate_backing_store(BitmapFormat, const IntSize&, int, Purgeable); + static Optional try_allocate_backing_store(BitmapFormat format, IntSize const& size, int scale_factor, Purgeable); void allocate_palette_from_format(BitmapFormat, const Vector& source_palette);