From eece7697fdcaf50eed98fff069c5e678ac425784 Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Thu, 5 Sep 2024 09:59:59 -0400
Subject: [PATCH] LibWeb: Rename CharacterData's segmenter indicate it is for
 graphemes

We will be adding a word segmenter as well, so this is to disambiguate
the two.
---
 Userland/Libraries/LibWeb/DOM/CharacterData.cpp    | 14 +++++++-------
 Userland/Libraries/LibWeb/DOM/CharacterData.h      |  4 ++--
 Userland/Libraries/LibWeb/DOM/Position.cpp         |  4 ++--
 .../Libraries/LibWeb/Page/EditEventHandler.cpp     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Userland/Libraries/LibWeb/DOM/CharacterData.cpp b/Userland/Libraries/LibWeb/DOM/CharacterData.cpp
index 4ff366b07e6..eb65ff1d79c 100644
--- a/Userland/Libraries/LibWeb/DOM/CharacterData.cpp
+++ b/Userland/Libraries/LibWeb/DOM/CharacterData.cpp
@@ -128,8 +128,8 @@ WebIDL::ExceptionOr<void> CharacterData::replace_data(size_t offset, size_t coun
 
     document().set_needs_layout();
 
-    if (m_segmenter)
-        m_segmenter->set_segmented_text(m_data);
+    if (m_grapheme_segmenter)
+        m_grapheme_segmenter->set_segmented_text(m_data);
 
     return {};
 }
@@ -155,14 +155,14 @@ WebIDL::ExceptionOr<void> CharacterData::delete_data(size_t offset, size_t count
     return replace_data(offset, count, String {});
 }
 
-Unicode::Segmenter& CharacterData::segmenter()
+Unicode::Segmenter& CharacterData::grapheme_segmenter()
 {
-    if (!m_segmenter) {
-        m_segmenter = Unicode::Segmenter::create(Unicode::SegmenterGranularity::Grapheme);
-        m_segmenter->set_segmented_text(m_data);
+    if (!m_grapheme_segmenter) {
+        m_grapheme_segmenter = Unicode::Segmenter::create(Unicode::SegmenterGranularity::Grapheme);
+        m_grapheme_segmenter->set_segmented_text(m_data);
     }
 
-    return *m_segmenter;
+    return *m_grapheme_segmenter;
 }
 
 }
diff --git a/Userland/Libraries/LibWeb/DOM/CharacterData.h b/Userland/Libraries/LibWeb/DOM/CharacterData.h
index 0598c8d88db..1b35f9d285f 100644
--- a/Userland/Libraries/LibWeb/DOM/CharacterData.h
+++ b/Userland/Libraries/LibWeb/DOM/CharacterData.h
@@ -40,7 +40,7 @@ public:
     WebIDL::ExceptionOr<void> delete_data(size_t offset_in_utf16_code_units, size_t count_in_utf16_code_units);
     WebIDL::ExceptionOr<void> replace_data(size_t offset_in_utf16_code_units, size_t count_in_utf16_code_units, String const&);
 
-    Unicode::Segmenter& segmenter();
+    Unicode::Segmenter& grapheme_segmenter();
 
 protected:
     CharacterData(Document&, NodeType, String const&);
@@ -50,7 +50,7 @@ protected:
 private:
     String m_data;
 
-    OwnPtr<Unicode::Segmenter> m_segmenter;
+    OwnPtr<Unicode::Segmenter> m_grapheme_segmenter;
 };
 
 }
diff --git a/Userland/Libraries/LibWeb/DOM/Position.cpp b/Userland/Libraries/LibWeb/DOM/Position.cpp
index 2bfe401e82d..4407c38dd49 100644
--- a/Userland/Libraries/LibWeb/DOM/Position.cpp
+++ b/Userland/Libraries/LibWeb/DOM/Position.cpp
@@ -41,7 +41,7 @@ bool Position::increment_offset()
 
     auto& node = verify_cast<DOM::Text>(*m_node);
 
-    if (auto offset = node.segmenter().next_boundary(m_offset); offset.has_value()) {
+    if (auto offset = node.grapheme_segmenter().next_boundary(m_offset); offset.has_value()) {
         m_offset = *offset;
         return true;
     }
@@ -57,7 +57,7 @@ bool Position::decrement_offset()
 
     auto& node = verify_cast<DOM::Text>(*m_node);
 
-    if (auto offset = node.segmenter().previous_boundary(m_offset); offset.has_value()) {
+    if (auto offset = node.grapheme_segmenter().previous_boundary(m_offset); offset.has_value()) {
         m_offset = *offset;
         return true;
     }
diff --git a/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp b/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp
index a9fdcdbb970..0179665ecf7 100644
--- a/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp
+++ b/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp
@@ -22,7 +22,7 @@ void EditEventHandler::handle_delete_character_after(JS::NonnullGCPtr<DOM::Docum
     auto& node = verify_cast<DOM::Text>(*cursor_position->node());
     auto& text = node.data();
 
-    auto next_offset = node.segmenter().next_boundary(cursor_position->offset());
+    auto next_offset = node.grapheme_segmenter().next_boundary(cursor_position->offset());
     if (!next_offset.has_value()) {
         // FIXME: Move to the next node and delete the first character there.
         return;