diff --git a/AK/StringBuilder.cpp b/AK/StringBuilder.cpp index 048ea24dda7..33306fed2e4 100644 --- a/AK/StringBuilder.cpp +++ b/AK/StringBuilder.cpp @@ -18,32 +18,6 @@ namespace AK { -inline ErrorOr StringBuilder::will_append(size_t size) -{ - if (m_use_inline_capacity_only == UseInlineCapacityOnly::Yes) { - VERIFY(m_buffer.capacity() == StringBuilder::inline_capacity); - Checked current_pointer = m_buffer.size(); - current_pointer += size; - VERIFY(!current_pointer.has_overflow()); - if (current_pointer <= StringBuilder::inline_capacity) { - return {}; - } - return Error::from_errno(ENOMEM); - } - - Checked needed_capacity = m_buffer.size(); - needed_capacity += size; - VERIFY(!needed_capacity.has_overflow()); - // Prefer to completely use the existing capacity first - if (needed_capacity <= m_buffer.capacity()) - return {}; - Checked expanded_capacity = needed_capacity; - expanded_capacity *= 2; - VERIFY(!expanded_capacity.has_overflow()); - TRY(m_buffer.try_ensure_capacity(expanded_capacity.value())); - return {}; -} - ErrorOr StringBuilder::create(size_t initial_capacity) { StringBuilder builder; @@ -56,9 +30,19 @@ StringBuilder::StringBuilder(size_t initial_capacity) m_buffer.ensure_capacity(initial_capacity); } -StringBuilder::StringBuilder(UseInlineCapacityOnly use_inline_capacity_only) - : m_use_inline_capacity_only(use_inline_capacity_only) +inline ErrorOr StringBuilder::will_append(size_t size) { + Checked needed_capacity = m_buffer.size(); + needed_capacity += size; + VERIFY(!needed_capacity.has_overflow()); + // Prefer to completely use the existing capacity first + if (needed_capacity <= m_buffer.capacity()) + return {}; + Checked expanded_capacity = needed_capacity; + expanded_capacity *= 2; + VERIFY(!expanded_capacity.has_overflow()); + TRY(m_buffer.try_ensure_capacity(expanded_capacity.value())); + return {}; } size_t StringBuilder::length() const diff --git a/AK/StringBuilder.h b/AK/StringBuilder.h index 59995754c8a..2dfff324249 100644 --- a/AK/StringBuilder.h +++ b/AK/StringBuilder.h @@ -23,12 +23,6 @@ public: static ErrorOr create(size_t initial_capacity = inline_capacity); explicit StringBuilder(size_t initial_capacity = inline_capacity); - - enum class UseInlineCapacityOnly { - Yes, - No, - }; - explicit StringBuilder(UseInlineCapacityOnly use_inline_capacity_only); ~StringBuilder() = default; ErrorOr try_append(StringView); @@ -106,7 +100,6 @@ private: u8* data(); u8 const* data() const; - UseInlineCapacityOnly m_use_inline_capacity_only { UseInlineCapacityOnly::No }; Detail::ByteBuffer m_buffer; };