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

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

Issue 1325563002: Avoid style clobbering in setCompositionFromExistingText. (2nd land) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Release Range on document detach and remove selectionStart/End 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
Index: Source/core/editing/markers/DocumentMarkerController.cpp
diff --git a/Source/core/editing/markers/DocumentMarkerController.cpp b/Source/core/editing/markers/DocumentMarkerController.cpp
index 586289842a50a59afdd84a83d12a4009c7118108..b0040ff6f32e4fc55837210d00959c7c55ff9358 100644
--- a/Source/core/editing/markers/DocumentMarkerController.cpp
+++ b/Source/core/editing/markers/DocumentMarkerController.cpp
@@ -69,6 +69,8 @@ DocumentMarker::MarkerTypeIndex MarkerTypeToMarkerIndex(DocumentMarker::MarkerTy
return DocumentMarker::TextMatchMarkerIndex;
case DocumentMarker::InvisibleSpellcheck:
return DocumentMarker::InvisibleSpellcheckMarkerIndex;
+ case DocumentMarker::Composition:
+ return DocumentMarker::CompositionMarkerIndex;
}
ASSERT_NOT_REACHED();
@@ -111,6 +113,12 @@ void DocumentMarkerController::addTextMatchMarker(const Range* range, bool activ
// Don't invalidate tickmarks here. TextFinder invalidates tickmarks using a throttling algorithm. crbug.com/6819.
}
+void DocumentMarkerController::addCompositionMarker(const Position& start, const Position& end, Color underlineColor, bool thick, Color backgroundColor)
+{
+ for (TextIterator markedText(start, end); !markedText.atEnd(); markedText.advance())
+ addMarker(markedText.currentContainer(), DocumentMarker(markedText.startOffsetInCurrentContainer(), markedText.endOffsetInCurrentContainer(), underlineColor, thick, backgroundColor));
+}
+
void DocumentMarkerController::prepareForDestruction()
{
clear();
« no previous file with comments | « Source/core/editing/markers/DocumentMarkerController.h ('k') | Source/core/editing/markers/DocumentMarkerControllerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698