From b21235bb8e7dd9fcec5d6420bbbec4f9d3a2215f Mon Sep 17 00:00:00 2001
From: Megan Gardner <megan_gardner@apple.com>
Date: Tue, 21 May 2024 15:06:37 -0700
Subject: [PATCH] Text not visible after undo-ing UnifiedTextReplacement.
 https://bugs.webkit.org/show_bug.cgi?id=274427 rdar://128292480

Reviewed by Wenson Hsieh and Aditya Keerthi.

We were only clearing document markers in a specific range,
but after text has been replaced, those nodes might not be
in that range any longer. Just clear all the markers associated
with an ID, regardless of location.

* Source/WebCore/dom/DocumentMarkerController.h:
* Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm:
(WebKit::UnifiedTextReplacementController::removeTransparentMarkersForUUID):

Canonical link: https://commits.webkit.org/279078@main
---
 Source/WebCore/dom/DocumentMarkerController.h                 | 2 +-
 .../WebPage/Cocoa/UnifiedTextReplacementController.mm         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/WebCore/dom/DocumentMarkerController.h b/Source/WebCore/dom/DocumentMarkerController.h
index 5ae57d2076538..c6a7b89379cf1 100644
--- a/Source/WebCore/dom/DocumentMarkerController.h
+++ b/Source/WebCore/dom/DocumentMarkerController.h
@@ -79,6 +79,7 @@ class DocumentMarkerController final : public CanMakeCheckedPtr<DocumentMarkerCo
     WEBCORE_EXPORT void filterMarkers(const SimpleRange&, const Function<FilterMarkerResult(const DocumentMarker&)>& filterFunction, OptionSet<DocumentMarker::Type> = DocumentMarker::allMarkers(), RemovePartiallyOverlappingMarker = RemovePartiallyOverlappingMarker::No);
 
     WEBCORE_EXPORT void removeMarkers(OptionSet<DocumentMarker::Type> = DocumentMarker::allMarkers());
+    WEBCORE_EXPORT void removeMarkers(OptionSet<DocumentMarker::Type>, const Function<FilterMarkerResult(const RenderedDocumentMarker&)>& filterFunction);
     void removeMarkers(Node&, OptionSet<DocumentMarker::Type> = DocumentMarker::allMarkers());
     void repaintMarkers(OptionSet<DocumentMarker::Type> = DocumentMarker::allMarkers());
     void shiftMarkers(Node&, unsigned startOffset, int delta);
@@ -115,7 +116,6 @@ class DocumentMarkerController final : public CanMakeCheckedPtr<DocumentMarkerCo
     using MarkerMap = HashMap<Ref<Node>, std::unique_ptr<Vector<RenderedDocumentMarker>>>;
 
     bool possiblyHasMarkers(OptionSet<DocumentMarker::Type>) const;
-    void removeMarkers(OptionSet<DocumentMarker::Type>, const Function<FilterMarkerResult(const RenderedDocumentMarker&)>& filterFunction);
     OptionSet<DocumentMarker::Type> removeMarkersFromList(MarkerMap::iterator, OptionSet<DocumentMarker::Type>, const Function<FilterMarkerResult(const RenderedDocumentMarker&)>& filterFunction = nullptr);
 
     void forEachOfTypes(OptionSet<DocumentMarker::Type>, Function<bool(Node&, RenderedDocumentMarker&)>&&);
diff --git a/Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm b/Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm
index 0ac6439967440..76bceb95f6c94 100644
--- a/Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm
+++ b/Source/WebKit/WebProcess/WebPage/Cocoa/UnifiedTextReplacementController.mm
@@ -332,9 +332,9 @@
         return;
     }
 
-    document->markers().filterMarkers(range, [&](const WebCore::DocumentMarker& marker) {
+    document->markers().removeMarkers({ WebCore::DocumentMarker::Type::TransparentContent }, [&](const WebCore::DocumentMarker& marker) {
         return std::get<WebCore::DocumentMarker::TransparentContentData>(marker.data()).uuid == uuid ? WebCore::FilterMarkerResult::Remove : WebCore::FilterMarkerResult::Keep;
-    }, { WebCore::DocumentMarker::Type::TransparentContent });
+    });
 }
 
 void UnifiedTextReplacementController::removeTransparentMarkersForSession(const WTF::UUID& uuid, RemoveAllMarkersForSession removeAll)