Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h |
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h |
index 08b2e64320847b16760d3d3654e6b97e170044b2..c9cdf5adfd8fa6cb600c5661a871e5b8c10926dd 100644 |
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h |
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h |
@@ -30,6 +30,7 @@ |
#define DocumentMarkerController_h |
#include "core/CoreExport.h" |
+#include "core/dom/SynchronousMutationObserver.h" |
#include "core/editing/iterators/TextIterator.h" |
#include "core/editing/markers/DocumentMarker.h" |
#include "platform/geometry/IntRect.h" |
@@ -39,27 +40,28 @@ |
namespace blink { |
+class DocumentMarkerList; |
class Node; |
-class RenderedDocumentMarker; |
-class Text; |
class MarkerRemoverPredicate final { |
public: |
explicit MarkerRemoverPredicate(const Vector<String>& words); |
bool operator()(const DocumentMarker&, const Text&) const; |
- private: |
Vector<String> m_words; |
}; |
class CORE_EXPORT DocumentMarkerController final |
- : public GarbageCollected<DocumentMarkerController> { |
+ : public GarbageCollected<DocumentMarkerController>, |
+ public SynchronousMutationObserver { |
WTF_MAKE_NONCOPYABLE(DocumentMarkerController); |
+ USING_GARBAGE_COLLECTED_MIXIN(DocumentMarkerController); |
public: |
- explicit DocumentMarkerController(const Document&); |
+ explicit DocumentMarkerController(Document&); |
void clear(); |
+ void addMarker(Node*, DocumentMarker*); |
void addMarker(const Position& start, |
const Position& end, |
DocumentMarker::MarkerType, |
@@ -105,13 +107,12 @@ class CORE_EXPORT DocumentMarkerController final |
void removeMarkers(const MarkerRemoverPredicate& shouldRemoveMarker); |
void repaintMarkers( |
DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers()); |
- void shiftMarkers(Node*, unsigned startOffset, int delta); |
// Returns true if markers within a range are found. |
bool setMarkersActive(const EphemeralRange&, bool); |
// Returns true if markers within a range defined by a node, |startOffset| and |
// |endOffset| are found. |
bool setMarkersActive(Node*, unsigned startOffset, unsigned endOffset, bool); |
- bool hasMarkers(Node* node) const { return m_markers.contains(node); } |
+ bool hasMarkers(Node*) const; |
DocumentMarkerVector markersFor( |
Node*, |
@@ -120,9 +121,9 @@ class CORE_EXPORT DocumentMarkerController final |
DocumentMarker::MarkerTypes); |
DocumentMarkerVector markers(); |
Vector<IntRect> renderedRectsForMarkers(DocumentMarker::MarkerType); |
- void updateMarkerRenderedRectIfNeeded(const Node&, RenderedDocumentMarker&); |
+ |
void invalidateRectsForAllMarkers(); |
- void invalidateRectsForMarkersInNode(const Node&); |
+ void invalidateRectsForMarkersInNode(Node&); |
DECLARE_TRACE(); |
@@ -130,24 +131,29 @@ class CORE_EXPORT DocumentMarkerController final |
void showMarkers() const; |
#endif |
+ // SynchronousMutationObserver |
+ void didUpdateCharacterData(CharacterData*, |
+ unsigned offset, |
+ unsigned oldLength, |
+ unsigned newLength) final; |
+ |
private: |
- void addMarker(Node*, const DocumentMarker&); |
- |
- using MarkerList = HeapVector<Member<RenderedDocumentMarker>>; |
- using MarkerLists = |
- HeapVector<Member<MarkerList>, DocumentMarker::MarkerTypeIndexesCount>; |
- using MarkerMap = HeapHashMap<WeakMember<const Node>, Member<MarkerLists>>; |
- void mergeOverlapping(MarkerList*, RenderedDocumentMarker*); |
- bool possiblyHasMarkers(DocumentMarker::MarkerTypes); |
- void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes); |
+ using MarkerMap = HeapHashMap<WeakMember<Node>, Member<DocumentMarkerList>>; |
+ |
+ DocumentMarkerList* createMarkerListOfType(DocumentMarker::MarkerType); |
+ HeapVector<Member<DocumentMarkerList>> getMarkerListsForNode( |
+ Node*, |
+ DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers()); |
+ MarkerMap& markerMapForType(DocumentMarker::MarkerType); |
void removeMarkers(TextIterator&, |
DocumentMarker::MarkerTypes, |
RemovePartiallyOverlappingMarkerOrNot); |
- MarkerMap m_markers; |
- // Provide a quick way to determine whether a particular marker type is absent |
- // without going through the map. |
- DocumentMarker::MarkerTypes m_possiblyExistingMarkerTypes; |
+ MarkerMap m_spelling; |
+ MarkerMap m_grammar; |
+ MarkerMap m_textMatches; |
+ MarkerMap m_compositions; |
+ |
const Member<const Document> m_document; |
}; |