| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
| 7 * reserved. | 7 * reserved. |
| 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
| 10 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 return; | 160 return; |
| 161 DCHECK(!markers_.IsEmpty()); | 161 DCHECK(!markers_.IsEmpty()); |
| 162 | 162 |
| 163 int start_offset = marked_text.StartOffsetInCurrentContainer(); | 163 int start_offset = marked_text.StartOffsetInCurrentContainer(); |
| 164 int end_offset = marked_text.EndOffsetInCurrentContainer(); | 164 int end_offset = marked_text.EndOffsetInCurrentContainer(); |
| 165 RemoveMarkers(marked_text.CurrentContainer(), start_offset, | 165 RemoveMarkers(marked_text.CurrentContainer(), start_offset, |
| 166 end_offset - start_offset, marker_types); | 166 end_offset - start_offset, marker_types); |
| 167 } | 167 } |
| 168 } | 168 } |
| 169 | 169 |
| 170 void DocumentMarkerController::RemoveMarkers( | 170 void DocumentMarkerController::RemoveMarkersInRange( |
| 171 const EphemeralRange& range, | 171 const EphemeralRange& range, |
| 172 DocumentMarker::MarkerTypes marker_types) { | 172 DocumentMarker::MarkerTypes marker_types) { |
| 173 DCHECK(!document_->NeedsLayoutTreeUpdate()); | 173 DCHECK(!document_->NeedsLayoutTreeUpdate()); |
| 174 | 174 |
| 175 TextIterator marked_text(range.StartPosition(), range.EndPosition()); | 175 TextIterator marked_text(range.StartPosition(), range.EndPosition()); |
| 176 DocumentMarkerController::RemoveMarkers(marked_text, marker_types); | 176 DocumentMarkerController::RemoveMarkers(marked_text, marker_types); |
| 177 } | 177 } |
| 178 | 178 |
| 179 static void UpdateMarkerRenderedRect(const Node& node, | 179 static void UpdateMarkerRenderedRect(const Node& node, |
| 180 RenderedDocumentMarker& marker) { | 180 RenderedDocumentMarker& marker) { |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 } | 765 } |
| 766 | 766 |
| 767 } // namespace blink | 767 } // namespace blink |
| 768 | 768 |
| 769 #ifndef NDEBUG | 769 #ifndef NDEBUG |
| 770 void showDocumentMarkers(const blink::DocumentMarkerController* controller) { | 770 void showDocumentMarkers(const blink::DocumentMarkerController* controller) { |
| 771 if (controller) | 771 if (controller) |
| 772 controller->ShowMarkers(); | 772 controller->ShowMarkers(); |
| 773 } | 773 } |
| 774 #endif | 774 #endif |
| OLD | NEW |