Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/text

third_party/WebKit/Source/platform/text/BidiResolver.h

Index: third_party/WebKit/Source/platform/text/BidiResolver.h
diff --git a/third_party/WebKit/Source/platform/text/BidiResolver.h b/third_party/WebKit/Source/platform/text/BidiResolver.h
index 78e492389cb188c3e81ea72bf36818d529a283d7..0cc447b87b0471f26f4e8c117a6f01b002dcbb45 100644
--- a/third_party/WebKit/Source/platform/text/BidiResolver.h
+++ b/third_party/WebKit/Source/platform/text/BidiResolver.h
@@ -48,12 +48,12 @@ class MidpointState final {
   }
 
   void startIgnoringSpaces(const Iterator& midpoint) {
-    ASSERT(!(m_numMidpoints % 2));
+    DCHECK(!(m_numMidpoints % 2));
     addMidpoint(midpoint);
   }
 
   void stopIgnoringSpaces(const Iterator& midpoint) {
-    ASSERT(m_numMidpoints % 2);
+    DCHECK(m_numMidpoints % 2);
     addMidpoint(midpoint);
   }
 
@@ -256,7 +256,7 @@ class BidiResolver final {
 
   const BidiStatus& status() const { return m_status; }
   void setStatus(const BidiStatus s) {
-    ASSERT(s.context);
+    DCHECK(s.context);
     m_status = s;
     m_paragraphDirectionality = s.context->dir() == WTF::Unicode::LeftToRight
                                     ? TextDirection::kLtr
@@ -270,7 +270,7 @@ class BidiResolver final {
   // ignore) all child isolated spans.
   void enterIsolate() { m_nestedIsolateCount++; }
   void exitIsolate() {
-    ASSERT(m_nestedIsolateCount >= 1);
+    DCHECK_GE(m_nestedIsolateCount, 1u);
     m_nestedIsolateCount--;
   }
   bool inIsolate() const { return m_nestedIsolateCount; }
@@ -384,8 +384,8 @@ class BidiResolver final {
 template <class Iterator, class Run, class IsolatedRun>
 BidiResolver<Iterator, Run, IsolatedRun>::~BidiResolver() {
   // The owner of this resolver should have handled the isolated runs.
-  ASSERT(m_isolatedRuns.isEmpty());
-  ASSERT(!m_runs.runCount());
+  DCHECK(m_isolatedRuns.isEmpty());
+  DCHECK(!m_runs.runCount());
 }
 #endif
 
@@ -433,10 +433,10 @@ void BidiResolver<Iterator, Run, IsolatedRun>::embed(
     BidiEmbeddingSource source) {
   // Isolated spans compute base directionality during their own UBA run.
   // Do not insert fake embed characters once we enter an isolated span.
-  ASSERT(!inIsolate());
+  DCHECK(!inIsolate());
   using namespace WTF::Unicode;
 
-  ASSERT(dir == PopDirectionalFormat || dir == LeftToRightEmbedding ||
+  DCHECK(dir == PopDirectionalFormat || dir == LeftToRightEmbedding ||
          dir == LeftToRightOverride || dir == RightToLeftEmbedding ||
          dir == RightToLeftOverride);
   m_currentExplicitEmbeddingSequence.push_back(BidiEmbedding(dir, source));
@@ -447,8 +447,8 @@ void BidiResolver<Iterator, Run, IsolatedRun>::
     checkDirectionInLowerRaiseEmbeddingLevel() {
   using namespace WTF::Unicode;
 
-  ASSERT(m_status.eor != OtherNeutral || m_eor.atEnd());
-  ASSERT(m_status.last != NonSpacingMark && m_status.last != BoundaryNeutral &&
+  DCHECK(m_status.eor != OtherNeutral || m_eor.atEnd());
+  DCHECK(m_status.last != NonSpacingMark && m_status.last != BoundaryNeutral &&

[tkent, 2017/04/09 23:07:01]

Split this into 7 DCHECKs.

[Hwanseung Lee, 2017/04/11 03:29:38]

Done.

          m_status.last != RightToLeftEmbedding &&
          m_status.last != LeftToRightEmbedding &&
          m_status.last != RightToLeftOverride &&
@@ -547,7 +547,7 @@ void BidiResolver<Iterator, Run, IsolatedRun>::raiseExplicitEmbeddingLevel(
 template <class Iterator, class Run, class IsolatedRun>
 void BidiResolver<Iterator, Run, IsolatedRun>::computeTrailingSpace(
     BidiRunList<Run>& runs) {
-  ASSERT(runs.runCount());
+  DCHECK(runs.runCount());
 
   Run* trailingSpaceRun = runs.logicallyLastRun();
 
@@ -567,7 +567,7 @@ void BidiResolver<Iterator, Run, IsolatedRun>::computeTrailingSpace(
     m_trailingSpaceRun = addTrailingRun(
         runs, firstSpace, trailingSpaceRun->m_stop, trailingSpaceRun,
         baseContext, m_paragraphDirectionality);
-    ASSERT(m_trailingSpaceRun);
+    DCHECK(m_trailingSpaceRun);
     trailingSpaceRun->m_stop = firstSpace;
     return;
   }
@@ -594,7 +594,7 @@ bool BidiResolver<Iterator, Run, IsolatedRun>::commitExplicitEmbedding(
   // ignores (skips over) the isolated content, including embedding levels.
   // We should never accrue embedding levels while skipping over isolated
   // content.
-  ASSERT(!inIsolate() || m_currentExplicitEmbeddingSequence.isEmpty());
+  DCHECK(!inIsolate() || m_currentExplicitEmbeddingSequence.isEmpty());
 
   using namespace WTF::Unicode;
 
@@ -788,7 +788,7 @@ void BidiResolver<Iterator, Run, IsolatedRun>::createBidiRunsForLine(
     bool reorderRuns) {
   using namespace WTF::Unicode;
 
-  ASSERT(m_direction == OtherNeutral);
+  DCHECK_EQ(m_direction, OtherNeutral);
   m_trailingSpaceRun = 0;
 
   m_endOfLine = end;
@@ -874,7 +874,7 @@ void BidiResolver<Iterator, Run, IsolatedRun>::createBidiRunsForLine(
     if (inIsolate())
       dirCurrent = OtherNeutral;
 
-    ASSERT(m_status.eor != OtherNeutral || m_eor.atEnd());
+    DCHECK(m_status.eor != OtherNeutral || m_eor.atEnd());
     switch (dirCurrent) {
       // embedding and overrides (X1-X9 in the Bidi specs)
       case RightToLeftEmbedding:
@@ -1157,7 +1157,7 @@ void BidiResolver<Iterator, Run, IsolatedRun>::createBidiRunsForLine(
                                                              : EuropeanNumber;
             break;
           default:
-            ASSERT_NOT_REACHED();
+            NOTREACHED();
         }
         appendRun(m_runs);
       }
@@ -1214,7 +1214,7 @@ template <class Iterator, class Run, class IsolatedRun>
 void BidiResolver<Iterator, Run, IsolatedRun>::setMidpointStateForIsolatedRun(
     Run& run,
     const MidpointState<Iterator>& midpoint) {
-  ASSERT(!m_midpointStateForIsolatedRun.contains(&run));
+  DCHECK(!m_midpointStateForIsolatedRun.contains(&run));
   m_midpointStateForIsolatedRun.insert(&run, midpoint);
 }