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

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

Issue 1878473002: ASSERT -> DCHECK in core/editing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Output info for some DCHECKs, add TODOs. Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
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 9294e4b98baab96989878f060366d4d9a9c73b76..06683509720b5ac00a104bf5bf83232bf59f163a 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
@@ -127,7 +127,7 @@ void DocumentMarkerController::removeMarkers(TextIterator& markedText, DocumentM
for (; !markedText.atEnd(); markedText.advance()) {
if (!possiblyHasMarkers(markerTypes))
return;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
int startOffset = markedText.startOffsetInCurrentContainer();
int endOffset = markedText.endOffsetInCurrentContainer();
@@ -189,7 +189,7 @@ static bool updateMarkerRenderedRect(Node* node, RenderedDocumentMarker& marker)
void DocumentMarkerController::addMarker(Node* node, const DocumentMarker& newMarker)
{
- ASSERT(newMarker.endOffset() >= newMarker.startOffset());
+ DCHECK_GE(newMarker.endOffset(), newMarker.startOffset());
if (newMarker.endOffset() == newMarker.startOffset())
return;
@@ -248,7 +248,7 @@ void DocumentMarkerController::copyMarkers(Node* srcNode, unsigned startOffset,
if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
return;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
MarkerLists* markers = m_markers.get(srcNode);
if (!markers)
@@ -293,7 +293,7 @@ void DocumentMarkerController::removeMarkers(Node* node, unsigned startOffset, i
if (!possiblyHasMarkers(markerTypes))
return;
- ASSERT(!(m_markers.isEmpty()));
+ DCHECK(!(m_markers.isEmpty()));
MarkerLists* markers = m_markers.get(node);
if (!markers)
@@ -371,7 +371,7 @@ DocumentMarker* DocumentMarkerController::markerContainingPoint(const LayoutPoin
{
if (!possiblyHasMarkers(markerType))
return 0;
- ASSERT(!(m_markers.isEmpty()));
+ DCHECK(!(m_markers.isEmpty()));
// outer loop: process each node that contains any markers
MarkerMap::iterator end = m_markers.end();
@@ -434,10 +434,10 @@ DocumentMarkerVector DocumentMarkerController::markersInRange(const EphemeralRan
DocumentMarkerVector foundMarkers;
Node* startContainer = range.startPosition().computeContainerNode();
- ASSERT(startContainer);
+ DCHECK(startContainer);
unsigned startOffset = static_cast<unsigned>(range.startPosition().computeOffsetInContainerNode());
Node* endContainer = range.endPosition().computeContainerNode();
- ASSERT(endContainer);
+ DCHECK(endContainer);
unsigned endOffset = static_cast<unsigned>(range.endPosition().computeOffsetInContainerNode());
Node* pastLastNode = range.endPosition().nodeAsRangePastLastNode();
@@ -461,7 +461,7 @@ Vector<IntRect> DocumentMarkerController::renderedRectsForMarkers(DocumentMarker
if (!possiblyHasMarkers(markerType))
return result;
- ASSERT(!(m_markers.isEmpty()));
+ DCHECK(!(m_markers.isEmpty()));
// outer loop: process each node
MarkerMap::iterator end = m_markers.end();
@@ -516,7 +516,7 @@ void DocumentMarkerController::removeMarkers(Node* node, DocumentMarker::MarkerT
{
if (!possiblyHasMarkers(markerTypes))
return;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
MarkerMap::iterator iterator = m_markers.find(node);
if (iterator != m_markers.end())
@@ -551,7 +551,7 @@ void DocumentMarkerController::removeMarkers(DocumentMarker::MarkerTypes markerT
{
if (!possiblyHasMarkers(markerTypes))
return;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
HeapVector<Member<const Node>> nodesWithMarkers;
copyKeysToVector(m_markers, nodesWithMarkers);
@@ -614,7 +614,7 @@ void DocumentMarkerController::repaintMarkers(DocumentMarker::MarkerTypes marker
{
if (!possiblyHasMarkers(markerTypes))
return;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
// outer loop: process each markered node in the document
MarkerMap::iterator end = m_markers.end();
@@ -641,7 +641,7 @@ void DocumentMarkerController::shiftMarkers(Node* node, unsigned startOffset, in
{
if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
return;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
MarkerLists* markers = m_markers.get(node);
if (!markers)
@@ -656,7 +656,7 @@ void DocumentMarkerController::shiftMarkers(Node* node, unsigned startOffset, in
for (MarkerList::iterator marker = startPos; marker != list->end(); ++marker) {
#if ENABLE(ASSERT)
int startOffset = (*marker)->startOffset();
- ASSERT(startOffset + delta >= 0);
+ DCHECK_GE(startOffset + delta, 0);
#endif
(*marker)->shiftOffsets(delta);
docDirty = true;
@@ -675,7 +675,7 @@ bool DocumentMarkerController::setMarkersActive(Range* range, bool active)
if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
return false;
- ASSERT(!m_markers.isEmpty());
+ DCHECK(!m_markers.isEmpty());
Node* startContainer = range->startContainer();
Node* endContainer = range->endContainer();

Powered by Google App Engine
This is Rietveld 408576698