| Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.h
|
| diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.h
|
| index b5022fd7ac6ab7c9bfc12a1244e006c254739352..5edeca3c7580ea1c1ae96ef49203c52cdebeb1b4 100644
|
| --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.h
|
| +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.h
|
| @@ -17,7 +17,9 @@ class DocumentMarkerListEditor {
|
| public:
|
| using MarkerList = HeapVector<Member<RenderedDocumentMarker>>;
|
|
|
| - static void AddMarker(MarkerList*, const DocumentMarker*);
|
| + static void AddMarkerAndMergeOverlapping(MarkerList*, const DocumentMarker*);
|
| + static void AddMarkerWithoutMergingOverlapping(MarkerList*,
|
| + const DocumentMarker*);
|
|
|
| // Returns true if a marker was moved, false otherwise.
|
| static bool MoveMarkers(MarkerList* src_list,
|
| @@ -37,9 +39,6 @@ class DocumentMarkerListEditor {
|
| unsigned offset,
|
| unsigned old_length,
|
| unsigned new_length);
|
| -
|
| - private:
|
| - static void MergeOverlapping(MarkerList*, RenderedDocumentMarker* to_insert);
|
| };
|
|
|
| } // namespace blink
|
|
|