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

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

Issue 2759703002: Migrate WTF::HashMap::remove() to ::erase() (Closed)
Patch Set: rebase, fix one platform-specific reference Created 3 years, 9 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 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 if (needsRepainting) { 689 if (needsRepainting) {
690 const Node& node = *iterator->key; 690 const Node& node = *iterator->key;
691 if (LayoutObject* layoutObject = node.layoutObject()) { 691 if (LayoutObject* layoutObject = node.layoutObject()) {
692 layoutObject->setShouldDoFullPaintInvalidation( 692 layoutObject->setShouldDoFullPaintInvalidation(
693 PaintInvalidationDocumentMarkerChange); 693 PaintInvalidationDocumentMarkerChange);
694 } 694 }
695 invalidatePaintForTickmarks(node); 695 invalidatePaintForTickmarks(node);
696 } 696 }
697 697
698 if (nodeCanBeRemoved) { 698 if (nodeCanBeRemoved) {
699 m_markers.remove(iterator); 699 m_markers.erase(iterator);
700 if (m_markers.isEmpty()) 700 if (m_markers.isEmpty())
701 m_possiblyExistingMarkerTypes = 0; 701 m_possiblyExistingMarkerTypes = 0;
702 } 702 }
703 } 703 }
704 704
705 void DocumentMarkerController::repaintMarkers( 705 void DocumentMarkerController::repaintMarkers(
706 DocumentMarker::MarkerTypes markerTypes) { 706 DocumentMarker::MarkerTypes markerTypes) {
707 if (!possiblyHasMarkers(markerTypes)) 707 if (!possiblyHasMarkers(markerTypes))
708 return; 708 return;
709 DCHECK(!m_markers.isEmpty()); 709 DCHECK(!m_markers.isEmpty());
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 #endif 869 #endif
870 870
871 } // namespace blink 871 } // namespace blink
872 872
873 #ifndef NDEBUG 873 #ifndef NDEBUG
874 void showDocumentMarkers(const blink::DocumentMarkerController* controller) { 874 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
875 if (controller) 875 if (controller)
876 controller->showMarkers(); 876 controller->showMarkers();
877 } 877 }
878 #endif 878 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698