media/track: Replace wtf/Assertions.h macros in favor of base/logging.h macros

third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp

Index: third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp
diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp
index 0cc8359b5321ff5f8ada481d0a22167f0848fa70..2d97211d8a8235bf467239995a93e0653f149531 100644
--- a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp
+++ b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.cpp
@@ -123,7 +123,7 @@ static const String& verticalGrowingRightKeyword()
 
 static bool isInvalidPercentage(double value)
 {
-    ASSERT(std::isfinite(value));
+    DCHECK(std::isfinite(value));
     return value < 0 || value > 100;
 }
 
@@ -272,7 +272,7 @@ const String& VTTCue::vertical() const
     case VerticalGrowingRight:
         return verticalGrowingRightKeyword();
     default:
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
         return emptyString();
     }
 }
@@ -287,7 +287,7 @@ void VTTCue::setVertical(const String& value)
     else if (value == verticalGrowingRightKeyword())
         direction = VerticalGrowingRight;
     else
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
 
     if (direction == m_writingDirection)
         return;
@@ -332,7 +332,7 @@ void VTTCue::setLine(const DoubleOrAutoKeyword& position)
             return;
         floatPosition = std::numeric_limits<float>::quiet_NaN();
     } else {
-        ASSERT(position.isDouble());
+        DCHECK(position.isDouble());
         floatPosition = narrowPrecisionToFloat(position.getAsDouble());
         if (m_linePosition == floatPosition)
             return;
@@ -369,7 +369,7 @@ void VTTCue::setPosition(const DoubleOrAutoKeyword& position, ExceptionState& ex
             return;
         floatPosition = std::numeric_limits<float>::quiet_NaN();
     } else {
-        ASSERT(position.isDouble());
+        DCHECK(position.isDouble());
         if (isInvalidPercentage(position.getAsDouble(), exceptionState))
             return;
         floatPosition = narrowPrecisionToFloat(position.getAsDouble());
@@ -414,7 +414,7 @@ const String& VTTCue::align() const
     case Right:
         return rightKeyword();
     default:
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
         return emptyString();
     }
 }
@@ -433,7 +433,7 @@ void VTTCue::setAlign(const String& value)
     else if (value == rightKeyword())
         alignment = Right;
     else
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
 
     if (alignment == m_cueAlignment)
         return;
@@ -565,7 +565,7 @@ static TextDirection determineDirectionality(const String& value, bool& hasStron
 
 static CSSValueID determineTextDirection(DocumentFragment* vttRoot)
 {
-    ASSERT(vttRoot);
+    DCHECK(vttRoot);
 
     // Apply the Unicode Bidirectional Algorithm's Paragraph Level steps to the
     // concatenation of the values of each WebVTT Text Object in nodes, in a
@@ -574,7 +574,7 @@ static CSSValueID determineTextDirection(DocumentFragment* vttRoot)
     TextDirection textDirection = LTR;
     Node* node = NodeTraversal::next(*vttRoot);
     while (node) {
-        ASSERT(node->isDescendantOf(vttRoot));
+        DCHECK(node->isDescendantOf(vttRoot));
 
         if (node->isTextNode()) {
             bool hasStrongDirectionality;
@@ -615,7 +615,7 @@ float VTTCue::calculateComputedTextPosition() const
     case Middle:
         return 50;
     default:
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
         return 0;
     }
 }
@@ -676,7 +676,7 @@ VTTDisplayParameters VTTCue::calculateDisplayParameters() const
         maximumSize = computedTextPosition <= 50 ? computedTextPosition : (100 - computedTextPosition);
         maximumSize = maximumSize * 2;
     } else {
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
     }
 
     // 5. If the cue size is less than maximum size, then let size
@@ -703,7 +703,7 @@ VTTDisplayParameters VTTCue::calculateDisplayParameters() const
             displayParameters.position.setX(computedTextPosition - displayParameters.size / 2);
             break;
         default:
-            ASSERT_NOT_REACHED();
+            NOTREACHED();
         }
     } else {
         // Cases for m_writingDirection being VerticalGrowing{Left|Right}
@@ -718,7 +718,7 @@ VTTDisplayParameters VTTCue::calculateDisplayParameters() const
             displayParameters.position.setY(computedTextPosition - displayParameters.size / 2);
             break;
         default:
-            ASSERT_NOT_REACHED();
+            NOTREACHED();
         }
     }
 
@@ -748,9 +748,9 @@ VTTDisplayParameters VTTCue::calculateDisplayParameters() const
         ? computedLinePosition
         : std::numeric_limits<float>::quiet_NaN();
 
-    ASSERT(std::isfinite(displayParameters.size));
-    ASSERT(displayParameters.direction != CSSValueNone);
-    ASSERT(displayParameters.writingMode != CSSValueNone);
+    DCHECK(std::isfinite(displayParameters.size));
+    DCHECK(displayParameters.direction != CSSValueNone);
+    DCHECK(displayParameters.writingMode != CSSValueNone);

[fs, 2016/05/20 13:01:07]

DCHECK_NE (x2)

[Srirama, 2016/05/20 14:15:41]

Done.

     return displayParameters;
 }
 
@@ -758,7 +758,7 @@ void VTTCue::updatePastAndFutureNodes(double movieTime)
 {
     DEFINE_STATIC_LOCAL(const String, timestampTag, ("timestamp"));
 
-    ASSERT(isActive());
+    DCHECK(isActive());
 
     // An active cue may still not have a display tree, e.g. if its track is
     // hidden or if the track belongs to an audio element.
@@ -781,7 +781,8 @@ void VTTCue::updatePastAndFutureNodes(double movieTime)
         if (child.nodeName() == timestampTag) {
             double currentTimestamp;
             bool check = VTTParser::collectTimeStamp(child.nodeValue(), currentTimestamp);
-            ASSERT_UNUSED(check, check);
+            DCHECK(check);
+            ALLOW_UNUSED_LOCAL(check);

[fs, 2016/05/20 13:01:07]

Just use DCHECK.

[Srirama, 2016/05/20 14:15:41]

Done.

 
             if (currentTimestamp > movieTime)
                 isPastNode = false;
@@ -798,14 +799,14 @@ void VTTCue::updatePastAndFutureNodes(double movieTime)
 
 VTTCueBox* VTTCue::getDisplayTree()
 {
-    ASSERT(track() && track()->isRendered() && isActive());
+    DCHECK(track() && track()->isRendered() && isActive());
 
     if (!m_displayTree) {
         m_displayTree = VTTCueBox::create(document());
         m_displayTree->appendChild(m_cueBackgroundBox);
     }
 
-    ASSERT(m_displayTree->firstChild() == m_cueBackgroundBox);
+    DCHECK(m_displayTree->firstChild() == m_cueBackgroundBox);

[fs, 2016/05/20 13:01:07]

DCHECK_EQ?

[Srirama, 2016/05/20 14:15:41]

Done.

 
     if (!m_displayTreeShouldChange) {
         // Apply updated user style overrides for text tracks when display tree doesn't change.
@@ -853,7 +854,7 @@ void VTTCue::removeDisplayTree(RemovalNotification removalNotification)
 
 void VTTCue::updateDisplay(HTMLDivElement& container)
 {
-    ASSERT(track() && track()->isRendered() && isActive());
+    DCHECK(track() && track()->isRendered() && isActive());
 
     UseCounter::count(document(), UseCounter::VTTCueRender);
 
@@ -1129,13 +1130,13 @@ void VTTCue::applyUserOverrideCSSProperties()
 
 ExecutionContext* VTTCue::getExecutionContext() const
 {
-    ASSERT(m_cueBackgroundBox);
+    DCHECK(m_cueBackgroundBox);
     return m_cueBackgroundBox->getExecutionContext();
 }
 
 Document& VTTCue::document() const
 {
-    ASSERT(m_cueBackgroundBox);
+    DCHECK(m_cueBackgroundBox);
     return m_cueBackgroundBox->document();
 }