Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp |
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp |
index c4ac4a97857c7bbaf3599d5e99d55040bf1bce74..e2a7f805c1f6ac054fd128417260e32b3c9426df 100644 |
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp |
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp |
@@ -63,8 +63,7 @@ void DocumentMarkerController::clear() { |
} |
void DocumentMarkerController::addGrammarOrSpellingMarker( |
- const Position& start, |
- const Position& end, |
+ const EphemeralRange& range, |
DocumentMarker::MarkerType type, |
const String& description) { |
DCHECK(!m_document->needsLayoutTreeUpdate()); |
@@ -72,8 +71,8 @@ void DocumentMarkerController::addGrammarOrSpellingMarker( |
<< type; |
// Use a TextIterator to visit the potentially multiple nodes the range |
// covers. |
- for (TextIterator markedText(start, end); !markedText.atEnd(); |
- markedText.advance()) { |
+ for (TextIterator markedText(range.startPosition(), range.endPosition()); |
+ !markedText.atEnd(); markedText.advance()) { |
addMarker(markedText.currentContainer(), |
new SpellCheckMarker( |
type, markedText.startOffsetInCurrentContainer(), |
@@ -81,16 +80,14 @@ void DocumentMarkerController::addGrammarOrSpellingMarker( |
} |
} |
-void DocumentMarkerController::addSpellingMarker(const Position& start, |
- const Position& end, |
+void DocumentMarkerController::addSpellingMarker(const EphemeralRange& range, |
const String& description) { |
- addGrammarOrSpellingMarker(start, end, DocumentMarker::Spelling, description); |
+ addGrammarOrSpellingMarker(range, DocumentMarker::Spelling, description); |
} |
-void DocumentMarkerController::addGrammarMarker(const Position& start, |
- const Position& end, |
+void DocumentMarkerController::addGrammarMarker(const EphemeralRange& range, |
const String& description) { |
- addGrammarOrSpellingMarker(start, end, DocumentMarker::Grammar, description); |
+ addGrammarOrSpellingMarker(range, DocumentMarker::Grammar, description); |
} |
void DocumentMarkerController::addTextMatchMarker(const EphemeralRange& range, |
@@ -110,15 +107,14 @@ void DocumentMarkerController::addTextMatchMarker(const EphemeralRange& range, |
// throttling algorithm. crbug.com/6819. |
} |
-void DocumentMarkerController::addCompositionMarker(const Position& start, |
- const Position& end, |
+void DocumentMarkerController::addCompositionMarker(const EphemeralRange& range, |
Color underlineColor, |
bool thick, |
Color backgroundColor) { |
DCHECK(!m_document->needsLayoutTreeUpdate()); |
- for (TextIterator markedText(start, end); !markedText.atEnd(); |
- markedText.advance()) { |
+ for (TextIterator markedText(range.startPosition(), range.endPosition()); |
+ !markedText.atEnd(); markedText.advance()) { |
addMarker(markedText.currentContainer(), |
new CompositionMarker(markedText.startOffsetInCurrentContainer(), |
markedText.endOffsetInCurrentContainer(), |