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

Side by Side Diff: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp

Issue 2898953005: [DMC #16] Rename RenderedDocumentMarker to TextMatchMarker (Closed)
Patch Set: Rebase Created 3 years, 6 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 unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
30 30
31 #include <algorithm> 31 #include <algorithm>
32 #include "core/dom/Node.h" 32 #include "core/dom/Node.h"
33 #include "core/dom/NodeTraversal.h" 33 #include "core/dom/NodeTraversal.h"
34 #include "core/dom/Text.h" 34 #include "core/dom/Text.h"
35 #include "core/editing/VisibleUnits.h" 35 #include "core/editing/VisibleUnits.h"
36 #include "core/editing/iterators/TextIterator.h" 36 #include "core/editing/iterators/TextIterator.h"
37 #include "core/editing/markers/CompositionMarkerListImpl.h" 37 #include "core/editing/markers/CompositionMarkerListImpl.h"
38 #include "core/editing/markers/DocumentMarkerListEditor.h" 38 #include "core/editing/markers/DocumentMarkerListEditor.h"
39 #include "core/editing/markers/GrammarMarkerListImpl.h" 39 #include "core/editing/markers/GrammarMarkerListImpl.h"
40 #include "core/editing/markers/RenderedDocumentMarker.h"
41 #include "core/editing/markers/SpellingMarkerListImpl.h" 40 #include "core/editing/markers/SpellingMarkerListImpl.h"
41 #include "core/editing/markers/TextMatchMarker.h"
42 #include "core/editing/markers/TextMatchMarkerListImpl.h" 42 #include "core/editing/markers/TextMatchMarkerListImpl.h"
43 #include "core/frame/LocalFrameView.h" 43 #include "core/frame/LocalFrameView.h"
44 #include "core/layout/LayoutObject.h" 44 #include "core/layout/LayoutObject.h"
45 45
46 #ifndef NDEBUG 46 #ifndef NDEBUG
47 #include <stdio.h> 47 #include <stdio.h>
48 #endif 48 #endif
49 49
50 namespace blink { 50 namespace blink {
51 51
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 MarkerLists* markers = markers_.at(&node); 439 MarkerLists* markers = markers_.at(&node);
440 440
441 const DocumentMarkerList* const marker_list = 441 const DocumentMarkerList* const marker_list =
442 ListForType(markers, DocumentMarker::kTextMatch); 442 ListForType(markers, DocumentMarker::kTextMatch);
443 if (!marker_list || marker_list->IsEmpty()) 443 if (!marker_list || marker_list->IsEmpty())
444 return; 444 return;
445 445
446 const HeapVector<Member<DocumentMarker>>& markers_in_list = 446 const HeapVector<Member<DocumentMarker>>& markers_in_list =
447 marker_list->GetMarkers(); 447 marker_list->GetMarkers();
448 for (auto& marker : markers_in_list) 448 for (auto& marker : markers_in_list)
449 ToRenderedDocumentMarker(marker)->Invalidate(); 449 ToTextMatchMarker(marker)->Invalidate();
450 450
451 InvalidatePaintForTickmarks(node); 451 InvalidatePaintForTickmarks(node);
452 } 452 }
453 453
454 void DocumentMarkerController::InvalidateRectsForAllTextMatchMarkers() { 454 void DocumentMarkerController::InvalidateRectsForAllTextMatchMarkers() {
455 for (auto& node_markers : markers_) { 455 for (auto& node_markers : markers_) {
456 const Node& node = *node_markers.key; 456 const Node& node = *node_markers.key;
457 InvalidateRectsForTextMatchMarkersInNode(node); 457 InvalidateRectsForTextMatchMarkersInNode(node);
458 } 458 }
459 } 459 }
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 } 708 }
709 709
710 } // namespace blink 710 } // namespace blink
711 711
712 #ifndef NDEBUG 712 #ifndef NDEBUG
713 void showDocumentMarkers(const blink::DocumentMarkerController* controller) { 713 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
714 if (controller) 714 if (controller)
715 controller->ShowMarkers(); 715 controller->ShowMarkers();
716 } 716 }
717 #endif 717 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698