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

Side by Side Diff: Source/core/dom/DocumentMarkerController.h

Issue 645443003: Move parts of core/dom to C++11 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed nit Created 6 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/DocumentMarker.h ('k') | Source/core/dom/DocumentOrderedList.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 void trace(Visitor*); 95 void trace(Visitor*);
96 96
97 #ifndef NDEBUG 97 #ifndef NDEBUG
98 void showMarkers() const; 98 void showMarkers() const;
99 #endif 99 #endif
100 100
101 private: 101 private:
102 void addMarker(Node*, const DocumentMarker&); 102 void addMarker(Node*, const DocumentMarker&);
103 103
104 typedef WillBeHeapVector<OwnPtrWillBeMember<RenderedDocumentMarker> > Marker List; 104 using MarkerList = WillBeHeapVector<OwnPtrWillBeMember<RenderedDocumentMarke r>>;
105 typedef WillBeHeapVector<OwnPtrWillBeMember<MarkerList>, DocumentMarker::Mar kerTypeIndexesCount> MarkerLists; 105 using MarkerLists = WillBeHeapVector<OwnPtrWillBeMember<MarkerList>, Documen tMarker::MarkerTypeIndexesCount>;
106 typedef WillBeHeapHashMap<RawPtrWillBeWeakMember<const Node>, OwnPtrWillBeMe mber<MarkerLists> > MarkerMap; 106 using MarkerMap = WillBeHeapHashMap<RawPtrWillBeWeakMember<const Node>, OwnP trWillBeMember<MarkerLists>>;
107 void mergeOverlapping(MarkerList*, DocumentMarker&); 107 void mergeOverlapping(MarkerList*, DocumentMarker&);
108 bool possiblyHasMarkers(DocumentMarker::MarkerTypes); 108 bool possiblyHasMarkers(DocumentMarker::MarkerTypes);
109 void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes) ; 109 void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes) ;
110 void removeMarkers(TextIterator&, DocumentMarker::MarkerTypes, RemovePartial lyOverlappingMarkerOrNot); 110 void removeMarkers(TextIterator&, DocumentMarker::MarkerTypes, RemovePartial lyOverlappingMarkerOrNot);
111 111
112 MarkerMap m_markers; 112 MarkerMap m_markers;
113 // Provide a quick way to determine whether a particular marker type is abse nt without going through the map. 113 // Provide a quick way to determine whether a particular marker type is abse nt without going through the map.
114 DocumentMarker::MarkerTypes m_possiblyExistingMarkerTypes; 114 DocumentMarker::MarkerTypes m_possiblyExistingMarkerTypes;
115 }; 115 };
116 116
117 } // namespace blink 117 } // namespace blink
118 118
119 #ifndef NDEBUG 119 #ifndef NDEBUG
120 void showDocumentMarkers(const blink::DocumentMarkerController*); 120 void showDocumentMarkers(const blink::DocumentMarkerController*);
121 #endif 121 #endif
122 122
123 #endif // DocumentMarkerController_h 123 #endif // DocumentMarkerController_h
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentMarker.h ('k') | Source/core/dom/DocumentOrderedList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698