mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-19 08:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

AK: Remove endianness override from Utf16View

Browse source 
Utf16View is now always in "host" endian mode. This makes it smaller
and less branchy for everyone!
This commit is contained in:
Andreas Kling 2025-04-15 17:58:42 +02:00 • committed by Andreas Kling
commit 7628ddfaf7
Notes: github-actions[bot] 2025-04-16 08:06:00 +00:00
5 changed files with 16 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

41
AK/Utf16View.cpp
View file

@ -185,7 +185,7 @@ size_t Utf16View::length_in_code_points() const
u16 Utf16View::code_unit_at(size_t index) const
{
VERIFY(index < length_in_code_units());
return host_code_unit(m_code_units[index], m_endianness);
return host_code_unit(m_code_units[index], Endianness::Host);
}
u32 Utf16View::code_point_at(size_t index) const
@ -296,31 +296,12 @@ bool Utf16View::starts_with(Utf16View const& needle) const
bool Utf16View::validate() const
{
switch (m_endianness) {
case Endianness::Host:
return simdutf::validate_utf16(char_data(), length_in_code_units());
case Endianness::Big:
return simdutf::validate_utf16be(char_data(), length_in_code_units());
case Endianness::Little:
return simdutf::validate_utf16le(char_data(), length_in_code_units());
}
VERIFY_NOT_REACHED();
return simdutf::validate_utf16(char_data(), length_in_code_units());
}
bool Utf16View::validate(size_t& valid_code_units) const
{
auto result = [&]() {
switch (m_endianness) {
case Endianness::Host:
return simdutf::validate_utf16_with_errors(char_data(), length_in_code_units());
case Endianness::Big:
return simdutf::validate_utf16be_with_errors(char_data(), length_in_code_units());
case Endianness::Little:
return simdutf::validate_utf16le_with_errors(char_data(), length_in_code_units());
}
VERIFY_NOT_REACHED();
}();
auto result = simdutf::validate_utf16_with_errors(char_data(), length_in_code_units());
valid_code_units = result.count;
return result.error == simdutf::SUCCESS;
}
@ -330,16 +311,8 @@ size_t Utf16View::calculate_length_in_code_points() const
// FIXME: simdutf's code point length method assumes valid UTF-16, whereas Utf16View uses U+FFFD as a replacement
// for invalid code points. If we change Utf16View to only accept valid encodings as an invariant, we can
// remove this branch.
if (validate()) [[likely]] {
switch (m_endianness) {
case Endianness::Host:
return simdutf::count_utf16(char_data(), length_in_code_units());
case Endianness::Big:
return simdutf::count_utf16be(char_data(), length_in_code_units());
case Endianness::Little:
return simdutf::count_utf16le(char_data(), length_in_code_units());
}
}
if (validate()) [[likely]]
return simdutf::count_utf16(char_data(), length_in_code_units());
size_t code_points = 0;
for ([[maybe_unused]] auto code_point : *this)
@ -397,11 +370,11 @@ u32 Utf16CodePointIterator::operator*() const
// W2 as its 10 low-order bits.
// 5) Add 0x10000 to U' to obtain the character value U. Terminate.
auto code_unit = host_code_unit(*m_ptr, m_endianness);
auto code_unit = host_code_unit(*m_ptr, Endianness::Host);
if (Utf16View::is_high_surrogate(code_unit)) {
if (m_remaining_code_units > 1) {
auto next_code_unit = host_code_unit(*(m_ptr + 1), m_endianness);
auto next_code_unit = host_code_unit(*(m_ptr + 1), Endianness::Host);
if (Utf16View::is_low_surrogate(next_code_unit))
return Utf16View::decode_surrogate_pair(code_unit, next_code_unit);