| Index: third_party/WebKit/Source/core/editing/EphemeralRange.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/EphemeralRange.cpp b/third_party/WebKit/Source/core/editing/EphemeralRange.cpp
|
| index b4aefe4a2f086dc290f9a9f625d101e2e902328f..555818549a81b24a2b20239629de0f2a0cea11a9 100644
|
| --- a/third_party/WebKit/Source/core/editing/EphemeralRange.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/EphemeralRange.cpp
|
| @@ -15,7 +15,7 @@ template <typename Strategy>
|
| EphemeralRangeTemplate<Strategy>::EphemeralRangeTemplate(const PositionTemplate<Strategy>& start, const PositionTemplate<Strategy>& end)
|
| : m_startPosition(start)
|
| , m_endPosition(end)
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| , m_domTreeVersion(start.isNull() ? 0 : start.document()->domTreeVersion())
|
| #endif
|
| {
|
| @@ -50,7 +50,7 @@ EphemeralRangeTemplate<Strategy>::EphemeralRangeTemplate(const Range* range)
|
| DCHECK(range->inShadowIncludingDocument());
|
| m_startPosition = fromPositionInDOMTree<Strategy>(range->startPosition());
|
| m_endPosition = fromPositionInDOMTree<Strategy>(range->endPosition());
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| m_domTreeVersion = range->ownerDocument().domTreeVersion();
|
| #endif
|
| }
|
| @@ -71,7 +71,7 @@ EphemeralRangeTemplate<Strategy>& EphemeralRangeTemplate<Strategy>::operator=(co
|
| DCHECK(other.isValid());
|
| m_startPosition = other.m_startPosition;
|
| m_endPosition = other.m_endPosition;
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| m_domTreeVersion = other.m_domTreeVersion;
|
| #endif
|
| return *this;
|
| @@ -123,7 +123,7 @@ EphemeralRangeTemplate<Strategy> EphemeralRangeTemplate<Strategy>::rangeOfConten
|
| return EphemeralRangeTemplate<Strategy>(PositionTemplate<Strategy>::firstPositionInNode(&const_cast<Node&>(node)), PositionTemplate<Strategy>::lastPositionInNode(&const_cast<Node&>(node)));
|
| }
|
|
|
| -#if ENABLE(ASSERT)
|
| +#if DCHECK_IS_ON()
|
| template <typename Strategy>
|
| bool EphemeralRangeTemplate<Strategy>::isValid() const
|
| {
|
|
|