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

Unified Diff: third_party/WebKit/Source/core/editing/VisibleSelection.cpp

Issue 1878473002: ASSERT -> DCHECK in core/editing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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/VisibleSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
index a4e56f2ba76185007b51f8c29376d4b90a46fdbc..48dc430667cdbe2bfb6a699469fef09597f6f7ee 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
@@ -100,7 +100,7 @@ template <typename Strategy>
static SelectionType computeSelectionType(const PositionTemplate<Strategy>& start, const PositionTemplate<Strategy>& end)
{
if (start.isNull()) {
- ASSERT(end.isNull());
+ DCHECK(end.isNull());
return NoSelection;
}
if (start == end)
@@ -161,7 +161,7 @@ VisibleSelectionTemplate<Strategy>::~VisibleSelectionTemplate()
template <typename Strategy>
VisibleSelectionTemplate<Strategy> VisibleSelectionTemplate<Strategy>::selectionFromContentsOfNode(Node* node)
{
- ASSERT(!Strategy::editingIgnoresContent(node));
+ DCHECK(!Strategy::editingIgnoresContent(node));
return VisibleSelectionTemplate(PositionTemplate<Strategy>::firstPositionInNode(node), PositionTemplate<Strategy>::lastPositionInNode(node));
}
@@ -253,7 +253,7 @@ EphemeralRangeTemplate<Strategy> VisibleSelectionTemplate<Strategy>::toNormalize
// On a treasure map, <b>X</b> marks the spot.
// ^ selected
//
- ASSERT(isRange());
+ DCHECK(isRange());
return normalizeRange(EphemeralRangeTemplate<Strategy>(m_start, m_end));
}
@@ -293,7 +293,7 @@ static EphemeralRangeTemplate<Strategy> makeSearchRange(const PositionTemplate<S
template <typename Strategy>
void VisibleSelectionTemplate<Strategy>::appendTrailingWhitespace()
{
- ASSERT(m_granularity == WordGranularity);
+ DCHECK_EQ(m_granularity, WordGranularity);
const EphemeralRangeTemplate<Strategy> searchRange = makeSearchRange(end());
if (searchRange.isNull())
return;
@@ -344,8 +344,8 @@ void VisibleSelectionTemplate<Strategy>::setBaseAndExtentToDeepEquivalents()
template <typename Strategy>
void VisibleSelectionTemplate<Strategy>::setStartRespectingGranularity(TextGranularity granularity, EWordSide wordSide)
{
- ASSERT(m_base.isNotNull());
- ASSERT(m_extent.isNotNull());
+ DCHECK(m_base.isNotNull());
+ DCHECK(m_extent.isNotNull());
m_start = m_baseIsFirst ? m_base : m_extent;
@@ -404,8 +404,8 @@ void VisibleSelectionTemplate<Strategy>::setStartRespectingGranularity(TextGranu
template <typename Strategy>
void VisibleSelectionTemplate<Strategy>::setEndRespectingGranularity(TextGranularity granularity, EWordSide wordSide)
{
- ASSERT(m_base.isNotNull());
- ASSERT(m_extent.isNotNull());
+ DCHECK(m_base.isNotNull());
+ DCHECK(m_extent.isNotNull());
m_end = m_baseIsFirst ? m_extent : m_base;
@@ -540,9 +540,9 @@ void VisibleSelectionTemplate<Strategy>::validate(TextGranularity granularity)
m_start = m_baseIsFirst ? m_base : m_extent;
m_end = m_baseIsFirst ? m_extent : m_base;
setStartRespectingGranularity(granularity);
- ASSERT(m_start.isNotNull());
+ DCHECK(m_start.isNotNull());
setEndRespectingGranularity(granularity);
- ASSERT(m_end.isNotNull());
+ DCHECK(m_end.isNotNull());
adjustSelectionToAvoidCrossingShadowBoundaries();
adjustSelectionToAvoidCrossingEditingBoundaries();
updateSelectionType();
@@ -806,14 +806,14 @@ VisibleSelectionChangeObserver::~VisibleSelectionChangeObserver()
template <typename Strategy>
void VisibleSelectionTemplate<Strategy>::setChangeObserver(VisibleSelectionChangeObserver& observer)
{
- ASSERT(!m_changeObserver);
+ DCHECK(!m_changeObserver);
m_changeObserver = &observer;
}
template <typename Strategy>
void VisibleSelectionTemplate<Strategy>::clearChangeObserver()
{
- ASSERT(m_changeObserver);
+ DCHECK(m_changeObserver);
m_changeObserver = nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698