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 6cfa2baf5dbfd1086c34ad84f749454a62b63498..5fd8443f6a09a9a51f56f6dd91819beeb79790f7 100644 |
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp |
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp |
@@ -97,9 +97,9 @@ void DocumentMarkerController::clear() |
void DocumentMarkerController::addMarker(const Position& start, const Position& end, DocumentMarker::MarkerType type, const String& description, uint32_t hash) |
{ |
- // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited. |
+ // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited. |
// see http://crbug.com/590369 for more details. |
- start.document()->updateLayoutIgnorePendingStylesheets(); |
+ start.document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
// Use a TextIterator to visit the potentially multiple nodes the range covers. |
for (TextIterator markedText(start, end); !markedText.atEnd(); markedText.advance()) { |
@@ -109,9 +109,9 @@ void DocumentMarkerController::addMarker(const Position& start, const Position& |
void DocumentMarkerController::addTextMatchMarker(const Range* range, bool activeMatch) |
{ |
- // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited. |
+ // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited. |
// see http://crbug.com/590369 for more details. |
- range->startPosition().document()->updateLayoutIgnorePendingStylesheets(); |
+ range->startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
// Use a TextIterator to visit the potentially multiple nodes the range covers. |
for (TextIterator markedText(range->startPosition(), range->endPosition()); !markedText.atEnd(); markedText.advance()) |
@@ -121,9 +121,9 @@ void DocumentMarkerController::addTextMatchMarker(const Range* range, bool activ |
void DocumentMarkerController::addCompositionMarker(const Position& start, const Position& end, Color underlineColor, bool thick, Color backgroundColor) |
{ |
- // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited. |
+ // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited. |
// see http://crbug.com/590369 for more details. |
- start.document()->updateLayoutIgnorePendingStylesheets(); |
+ start.document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
for (TextIterator markedText(start, end); !markedText.atEnd(); markedText.advance()) |
addMarker(markedText.currentContainer(), DocumentMarker(markedText.startOffsetInCurrentContainer(), markedText.endOffsetInCurrentContainer(), underlineColor, thick, backgroundColor)); |
@@ -149,9 +149,9 @@ void DocumentMarkerController::removeMarkers(TextIterator& markedText, DocumentM |
void DocumentMarkerController::removeMarkers(const EphemeralRange& range, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker) |
{ |
- // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited. |
+ // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited. |
// see http://crbug.com/590369 for more details. |
- range.startPosition().document()->updateLayoutIgnorePendingStylesheets(); |
+ range.startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets(); |
TextIterator markedText(range.startPosition(), range.endPosition()); |
DocumentMarkerController::removeMarkers(markedText, markerTypes, shouldRemovePartiallyOverlappingMarker); |