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

third_party/WebKit/Source/core/html/track/TextTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2011, 2012, 2013 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 126 matching lines @@
     invalidateTrackIndex();
 }
 
 bool TextTrack::isVisualKind() const
 {
     return kind() == subtitlesKeyword() || kind() == captionsKeyword();
 }
 
 void TextTrack::setMode(const AtomicString& mode)
 {
-    ASSERT(mode == disabledKeyword() || mode == hiddenKeyword() || mode == showingKeyword());
+    DCHECK(mode == disabledKeyword() || mode == hiddenKeyword() || mode == showingKeyword());
 
     // On setting, if the new value isn't equal to what the attribute would currently
     // return, the new value must be processed as follows ...
     if (m_mode == mode)
         return;
 
     if (m_cues && cueTimeline()) {
         // If mode changes to disabled, remove this track's cues from the client
         // because they will no longer be accessible from the cues() function.
         if (mode == disabledKeyword())
@@ skipping 65 matching lines @@
 
     if (!m_activeCues)
         m_activeCues = TextTrackCueList::create();
 
     m_cues->collectActiveCues(*m_activeCues);
     return m_activeCues;
 }
 
 void TextTrack::addCue(TextTrackCue* cue)
 {
-    ASSERT(cue);
+    DCHECK(cue);
 
     // TODO(93143): Add spec-compliant behavior for negative time values.
     if (std::isnan(cue->startTime()) || std::isnan(cue->endTime()) || cue->startTime() < 0 || cue->endTime() < 0)
         return;
 
     // https://html.spec.whatwg.org/multipage/embedded-content.html#dom-texttrack-addcue
 
     // The addCue(cue) method of TextTrack objects, when invoked, must run the following steps:
 
     // (Steps 1 and 2 - pertaining to association of rendering rules - are not implemented.)
 
     // 3. If the given cue is in a text track list of cues, then remove cue
     // from that text track list of cues.
     if (TextTrack* cueTrack = cue->track())
         cueTrack->removeCue(cue, ASSERT_NO_EXCEPTION);
 
     // 4. Add cue to the method's TextTrack object's text track's text track list of cues.
     cue->setTrack(this);
     ensureTextTrackCueList()->add(cue);
 
     if (cueTimeline() && m_mode != disabledKeyword())
         cueTimeline()->addCue(this, cue);
 }
 
 void TextTrack::removeCue(TextTrackCue* cue, ExceptionState& exceptionState)
 {
-    ASSERT(cue);
+    DCHECK(cue);
 
     // https://html.spec.whatwg.org/multipage/embedded-content.html#dom-texttrack-removecue
 
     // The removeCue(cue) method of TextTrack objects, when invoked, must run the following steps:
 
     // 1. If the given cue is not currently listed in the method's TextTrack
     // object's text track's text track list of cues, then throw a NotFoundError exception.
     if (cue->track() != this) {
         exceptionState.throwDOMException(NotFoundError, "The specified cue is not listed in the TextTrack's list of cues.");
         return;
     }
 
     // cue->track() == this implies that cue is in this track's list of cues,
     // so this track should have a list of cues and the cue being removed
     // should be in it.
-    ASSERT(m_cues);
+    DCHECK(m_cues);
 
     // 2. Remove cue from the method's TextTrack object's text track's text track list of cues.
     bool wasRemoved = m_cues->remove(cue);
-    ASSERT_UNUSED(wasRemoved, wasRemoved);
+    DCHECK(wasRemoved);

[fs, 2016/05/21 16:04:52]

Let's try:

bool wasRemoved = ...;
DCHECK(wasRemoved);

this time.

At least if my reading of

https://code.google.com/p/chromium/codesearch#chromium/src/base/logging.h&q=D...

is correct, that ought to work out.

[Srirama, 2016/05/23 05:44:34]

Done.

+    ALLOW_UNUSED_LOCAL(wasRemoved);
 
     // If the cue is active, a timeline needs to be available.
-    ASSERT(!cue->isActive() || cueTimeline());
+    DCHECK(!cue->isActive() || cueTimeline());
 
     cue->setTrack(0);
 
     if (cueTimeline())
         cueTimeline()->removeCue(this, cue);
 }
 
 VTTRegionList* TextTrack::ensureVTTRegionList()
 {
     if (!m_regions)
@@ skipping 69 matching lines @@
     // The cue may need to be repositioned in the media element's interval tree, may need to
     // be re-rendered, etc, so remove it before the modification...
     if (cueTimeline())
         cueTimeline()->removeCue(this, cue);
 }
 
 void TextTrack::cueDidChange(TextTrackCue* cue)
 {
     // This method is called through cue->track(), which should imply that this
     // track has a list of cues.
-    ASSERT(m_cues && cue->track() == this);
+    DCHECK(m_cues && cue->track() == this);
 
     // Make sure the TextTrackCueList order is up-to-date.
     // FIXME: Only need to do this if the change was to any of the timestamps.
     m_cues->updateCueIndex(cue);
 
     // Since a call to cueDidChange is always preceded by a call to
     // cueWillChange, the cue should no longer be active when we reach this
     // point (since it was removed from the timeline in cueWillChange).
-    ASSERT(!cue->isActive());
+    DCHECK(!cue->isActive());
 
     if (m_mode == disabledKeyword())
         return;
 
     // ... and add it back again if the track is enabled.
     if (cueTimeline())
         cueTimeline()->addCue(this, cue);
 }
 
 int TextTrack::trackIndex()
 {
-    ASSERT(m_trackList);
+    DCHECK(m_trackList);
 
     if (m_trackIndex == invalidTrackIndex)
         m_trackIndex = m_trackList->getTrackIndex(this);
 
     return m_trackIndex;
 }
 
 void TextTrack::invalidateTrackIndex()
 {
     m_trackIndex = invalidTrackIndex;
@@ skipping 14 matching lines @@
 TextTrackCueList* TextTrack::ensureTextTrackCueList()
 {
     if (!m_cues)
         m_cues = TextTrackCueList::create();
 
     return m_cues.get();
 }
 
 int TextTrack::trackIndexRelativeToRenderedTracks()
 {
-    ASSERT(m_trackList);
+    DCHECK(m_trackList);
 
     if (m_renderedTrackIndex == invalidTrackIndex)
         m_renderedTrackIndex = m_trackList->getTrackIndexRelativeToRenderedTracks(this);
 
     return m_renderedTrackIndex;
 }
 
 const AtomicString& TextTrack::interfaceName() const
 {
     return EventTargetNames::TextTrack;
@@ skipping 28 matching lines @@
     visitor->trace(m_trackList);
     TrackBase::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(TextTrack)
 {
     visitor->traceWrappers(m_cues);
 }
 } // namespace blink