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

Unified Diff: Source/core/editing/markers/DocumentMarkerController.cpp

Issue 1347313002: Don't merge adjacent composition markers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unnecessary toElement() call in the unit test Created 5 years, 3 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
« no previous file with comments | « no previous file | Source/core/editing/markers/DocumentMarkerControllerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/markers/DocumentMarkerController.cpp
diff --git a/Source/core/editing/markers/DocumentMarkerController.cpp b/Source/core/editing/markers/DocumentMarkerController.cpp
index b0040ff6f32e4fc55837210d00959c7c55ff9358..e1bca8ab4864bd506749a82797192833abe715ec 100644
--- a/Source/core/editing/markers/DocumentMarkerController.cpp
+++ b/Source/core/editing/markers/DocumentMarkerController.cpp
@@ -214,7 +214,7 @@ void DocumentMarkerController::addMarker(Node* node, const DocumentMarker& newMa
if (list->isEmpty() || list->last()->endOffset() < newMarker.startOffset()) {
list->append(newRenderedMarker.release());
} else {
- if (newMarker.type() != DocumentMarker::TextMatch) {
+ if (newMarker.type() != DocumentMarker::TextMatch && newMarker.type() != DocumentMarker::Composition) {
mergeOverlapping(list.get(), newRenderedMarker.release());
} else {
MarkerList::iterator pos = std::lower_bound(list->begin(), list->end(), &newMarker, startsFurther);
« no previous file with comments | « no previous file | Source/core/editing/markers/DocumentMarkerControllerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698