| Index: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
|
| index 61ec49d48e03d01ff5ca1e408c88b419c3fb91d5..cc44d550894e82ebd305752f3a1a8b54f332b8bc 100644
|
| --- a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
|
| +++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
|
| @@ -182,7 +182,7 @@ void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelEleme
|
|
|
| void MediaControlPanelElement::didBecomeVisible()
|
| {
|
| - ASSERT(m_isDisplayed && m_opaque);
|
| + DCHECK(m_isDisplayed && m_opaque);
|
| mediaElement().mediaControlsDidBecomeVisible();
|
| }
|
|
|
| @@ -443,7 +443,7 @@ void MediaControlTextTrackListElement::defaultEventHandler(Event* event)
|
| disableShowingTextTracks();
|
| int trackIndex = toElement(target)->getIntegralAttribute(trackIndexAttrName());
|
| if (trackIndex != trackIndexOffValue) {
|
| - ASSERT(trackIndex >= 0);
|
| + DCHECK_GE(trackIndex, 0);
|
| showTextTrackAtIndex(trackIndex);
|
| mediaElement().disableAutomaticTextTrackSelection();
|
| }
|
| @@ -526,7 +526,7 @@ Element* MediaControlTextTrackListElement::createTextTrackListItem(TextTrack* tr
|
| if (track->kind() == track->captionsKeyword()) {
|
| trackKindMarker->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list-kind-captions"));
|
| } else {
|
| - ASSERT(track->kind() == track->subtitlesKeyword());
|
| + DCHECK_EQ(track->kind(), track->subtitlesKeyword());
|
| trackKindMarker->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list-kind-subtitles"));
|
| }
|
| trackItem->appendChild(trackKindMarker);
|
| @@ -805,7 +805,7 @@ void MediaControlCastButtonElement::setIsPlayingRemotely(bool isPlayingRemotely)
|
|
|
| void MediaControlCastButtonElement::tryShowOverlay()
|
| {
|
| - ASSERT(m_isOverlayButton);
|
| + DCHECK(m_isOverlayButton);
|
|
|
| setIsWanted(true);
|
| if (elementFromCenter(*this) != &mediaElement()) {
|
| @@ -813,7 +813,7 @@ void MediaControlCastButtonElement::tryShowOverlay()
|
| return;
|
| }
|
|
|
| - ASSERT(isWanted());
|
| + DCHECK(isWanted());
|
| if (!m_showUseCounted) {
|
| m_showUseCounted = true;
|
| recordMetrics(CastOverlayMetrics::Shown);
|
| @@ -827,7 +827,7 @@ bool MediaControlCastButtonElement::keepEventInNode(Event* event)
|
|
|
| void MediaControlCastButtonElement::recordMetrics(CastOverlayMetrics metric)
|
| {
|
| - ASSERT(m_isOverlayButton);
|
| + DCHECK(m_isOverlayButton);
|
| DEFINE_STATIC_LOCAL(EnumerationHistogram, overlayHistogram, ("Cast.Sender.Overlay", static_cast<int>(CastOverlayMetrics::Count)));
|
| overlayHistogram.count(static_cast<int>(metric));
|
| }
|
|
|