Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: third_party/WebKit/Source/core/editing/markers/EditingMarkerListThatMergesTouchingMarkers.cpp

Issue 2723663002: Refactor DocumentMarkerController (Closed)
Patch Set: Use correct base commit Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/markers/EditingMarkerListThatMergesTouchingMarkers.cpp
diff --git a/third_party/WebKit/Source/core/editing/markers/EditingMarkerListThatMergesTouchingMarkers.cpp b/third_party/WebKit/Source/core/editing/markers/EditingMarkerListThatMergesTouchingMarkers.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8567f8425b82a5f04aacde233f84bf39c1deab2d
--- /dev/null
+++ b/third_party/WebKit/Source/core/editing/markers/EditingMarkerListThatMergesTouchingMarkers.cpp
@@ -0,0 +1,44 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "core/editing/markers/EditingMarkerListThatMergesTouchingMarkers.h"
+
+#include <algorithm>
+
+namespace blink {
+
+EditingMarkerListThatMergesTouchingMarkers::
+ EditingMarkerListThatMergesTouchingMarkers(
+ DocumentMarkerController* documentMarkerController)
+ : EditingMarkerList(documentMarkerController) {}
+
+static bool doesNotOverlap(const Member<DocumentMarker>& lhv,
+ const DocumentMarker* rhv) {
+ return lhv->endOffset() < rhv->startOffset();
+}
+
+void EditingMarkerListThatMergesTouchingMarkers::insert(
+ DocumentMarker* marker) {
+ if (!m_markersAreSorted)
+ sortMarkerList();
+
+ auto firstOverlappingIt = std::lower_bound(m_markers.begin(), m_markers.end(),
+ marker, doesNotOverlap);
+ size_t index = firstOverlappingIt - m_markers.begin();
+ m_markers.insert(index, marker);
+ auto insertedIt = m_markers.begin() + index;
+ for (auto it = insertedIt + 1;
+ it != m_markers.end() &&
+ (*it)->startOffset() <= (*insertedIt)->endOffset();) {
+ (*insertedIt)
+ ->setStartOffset(
+ std::min((*insertedIt)->startOffset(), (*it)->startOffset()));
+ (*insertedIt)
+ ->setEndOffset(
+ std::max((*insertedIt)->endOffset(), (*it)->endOffset()));
+ m_markers.remove(it - m_markers.begin());
+ }
+}
+
+} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698