Remove HTMLMediaElement::hasMediaControls()

Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 810 matching lines @@
 
     // FIXME: Investigate whether these can be moved into m_networkState != NETWORK_EMPTY block above
     // so they are closer to the relevant spec steps.
     m_lastSeekTime = 0;
     m_duration = std::numeric_limits<double>::quiet_NaN();
 
     // The spec doesn't say to block the load event until we actually run the asynchronous section
     // algorithm, but do it now because we won't start that until after the timer fires and the
     // event may have already fired by then.
     setShouldDelayLoadEvent(true);
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->reset();
 }
 
 void HTMLMediaElement::loadInternal()
 {
     // HTMLMediaElement::textTracksAreReady will need "... the text tracks whose mode was not in the
     // disabled state when the element's resource selection algorithm last started".
     m_textTracksWhenResourceSelectionBegan.clear();
     if (m_textTracks) {
         for (unsigned i = 0; i < m_textTracks->length(); ++i) {
@@ skipping 295 matching lines @@
 
 void HTMLMediaElement::textTrackReadyStateChanged(TextTrack* track)
 {
     if (webMediaPlayer()&& m_textTracksWhenResourceSelectionBegan.contains(track)) {
         if (track->readinessState() != TextTrack::Loading)
             setReadyState(static_cast<ReadyState>(webMediaPlayer()->readyState()));
     } else {
         // The track readiness state might have changed as a result of the user
         // clicking the captions button. In this case, a check whether all the
         // resources have failed loading should be done in order to hide the CC button.
-        if (hasMediaControls() && track->readinessState() == TextTrack::FailedToLoad)
+        if (mediaControls() && track->readinessState() == TextTrack::FailedToLoad)
             mediaControls()->refreshClosedCaptionsButtonVisibility();
     }
 }
 
 void HTMLMediaElement::textTrackModeChanged(TextTrack* track)
 {
     if (track->trackType() == TextTrack::TrackElement) {
         // 4.8.10.12.3 Sourcing out-of-band text tracks
         // ... when a text track corresponding to a track element is created with text track
         // mode set to disabled and subsequently changes its text track mode to hidden, showing,
@@ skipping 209 matching lines @@
     if (error == WebMediaPlayer::NetworkStateNetworkError && m_readyState >= HAVE_METADATA)
         mediaEngineError(MediaError::create(MediaError::MEDIA_ERR_NETWORK));
     else if (error == WebMediaPlayer::NetworkStateDecodeError)
         mediaEngineError(MediaError::create(MediaError::MEDIA_ERR_DECODE));
     else if ((error == WebMediaPlayer::NetworkStateFormatError
         || error == WebMediaPlayer::NetworkStateNetworkError)
         && m_loadState == LoadingFromSrcAttr)
         noneSupported();
 
     updateDisplayState();
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->reset();
 }
 
 void HTMLMediaElement::setNetworkState(WebMediaPlayer::NetworkState state)
 {
     WTF_LOG(Media, "HTMLMediaElement::setNetworkState(%p, %d) - current state is %d", this, static_cast<int>(state), static_cast<int>(m_networkState));
 
     if (state == WebMediaPlayer::NetworkStateEmpty) {
         // Just update the cached state and leave, we can't do anything.
         m_networkState = NETWORK_EMPTY;
@@ skipping 132 matching lines @@
             jumped = true;
         }
 
         if (m_mediaController) {
             if (jumped && initialPlaybackPosition > m_mediaController->currentTime())
                 m_mediaController->setCurrentTime(initialPlaybackPosition);
             else
                 seek(m_mediaController->currentTime());
         }
 
-        if (hasMediaControls())
+        if (mediaControls())
             mediaControls()->reset();
         if (renderer())
             renderer()->updateFromElement();
     }
 
     bool shouldUpdateDisplayState = false;
 
     if (m_readyState >= HAVE_CURRENT_DATA && oldState < HAVE_CURRENT_DATA && !m_haveFiredLoadedData) {
         m_haveFiredLoadedData = true;
         shouldUpdateDisplayState = true;
@@ skipping 26 matching lines @@
             }
         }
 
         scheduleEvent(EventTypeNames::canplaythrough);
 
         shouldUpdateDisplayState = true;
     }
 
     if (shouldUpdateDisplayState) {
         updateDisplayState();
-        if (hasMediaControls())
+        if (mediaControls())
             mediaControls()->refreshClosedCaptionsButtonVisibility();
     }
 
     updatePlayState();
     updateMediaController();
     cueTimeline().updateActiveCues(currentTime());
 }
 
 void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)
 {
@@ skipping 522 matching lines @@
     updateVolume();
 
     scheduleEvent(EventTypeNames::volumechange);
 }
 
 void HTMLMediaElement::updateVolume()
 {
     if (webMediaPlayer())
         webMediaPlayer()->setVolume(effectiveMediaVolume());
 
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->updateVolume();
 }
 
 double HTMLMediaElement::effectiveMediaVolume() const
 {
     if (m_muted)
         return 0;
 
     if (m_mediaController && m_mediaController->muted())
         return 0;
@@ skipping 31 matching lines @@
             pause();
         }
     }
 
     if (!m_seeking)
         scheduleTimeupdateEvent(true);
 
     if (!effectivePlaybackRate())
         return;
 
-    if (!m_paused && hasMediaControls())
+    if (!m_paused && mediaControls())
         mediaControls()->playbackProgressed();
 
     cueTimeline().updateActiveCues(currentTime());
 }
 
 void HTMLMediaElement::scheduleTimeupdateEvent(bool periodicEvent)
 {
     double now = WTF::currentTime();
     double movieTime = currentTime();
 
@@ skipping 179 matching lines @@
     // passed to mediaPlayerDidAddTextTrack.
     RefPtrWillBeRawPtr<InbandTextTrack> textTrack = static_cast<InbandTextTrack*>(webTrack->client());
     if (!textTrack)
         return;
 
     removeTextTrack(textTrack.get());
 }
 
 void HTMLMediaElement::textTracksChanged()
 {
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->refreshClosedCaptionsButtonVisibility();
 }
 
 void HTMLMediaElement::addTextTrack(TextTrack* track)
 {
     textTracks()->append(track);
 
     textTracksChanged();
 }
 
@@ skipping 380 matching lines @@
     WTF_LOG(Media, "HTMLMediaElement::durationChanged(%p, %f, %d)", this, duration, requestSeek);
 
     // Abort if duration unchanged.
     if (m_duration == duration)
         return;
 
     WTF_LOG(Media, "HTMLMediaElement::durationChanged(%p) : %f -> %f", this, m_duration, duration);
     m_duration = duration;
     scheduleEvent(EventTypeNames::durationchange);
 
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->reset();
     if (renderer())
         renderer()->updateFromElement();
 
     if (requestSeek)
         seek(duration);
 }
 
 void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
 {
@@ skipping 25 matching lines @@
     if (m_mediaController) {
         m_mediaController->setCurrentTime(time);
         return;
     }
     setCurrentTime(time, ASSERT_NO_EXCEPTION);
 }
 
 void HTMLMediaElement::remoteRouteAvailabilityChanged(bool routesAvailable)
 {
     m_remoteRoutesAvailable = routesAvailable;
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->refreshCastButtonVisibility();
 }
 
 void HTMLMediaElement::connectedToRemoteDevice()
 {
     m_playingRemotely = true;
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->startedCasting();
 }
 
 void HTMLMediaElement::disconnectedFromRemoteDevice()
 {
     m_playingRemotely = false;
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->stoppedCasting();
 }
 
 // MediaPlayerPresentation methods
 void HTMLMediaElement::mediaPlayerRepaint()
 {
     if (m_webLayer)
         m_webLayer->invalidate();
 
     updateDisplayState();
@@ skipping 116 matching lines @@
         invalidateCachedTime();
 
         if (!isPlaying) {
             // Set rate, muted before calling play in case they were set before the media engine was setup.
             // The media engine should just stash the rate and muted values since it isn't already playing.
             webMediaPlayer()->setRate(effectivePlaybackRate());
             updateVolume();
             webMediaPlayer()->play();
         }
 
-        if (hasMediaControls())
+        if (mediaControls())
             mediaControls()->playbackStarted();
         startPlaybackProgressTimer();
         m_playing = true;
 
     } else { // Should not be playing right now
         if (isPlaying)
             webMediaPlayer()->pause();
         refreshCachedTime();
 
         m_playbackProgressTimer.stop();
         m_playing = false;
         double time = currentTime();
         if (time > m_lastSeekTime)
             addPlayedRange(m_lastSeekTime, time);
 
         if (couldPlayIfEnoughData())
             prepareToPlay();
 
-        if (hasMediaControls())
+        if (mediaControls())
             mediaControls()->playbackStopped();
     }
 
     updateMediaController();
 
     if (renderer())
         renderer()->updateFromElement();
 }
 
 void HTMLMediaElement::stopPeriodicTimers()
@@ skipping 70 matching lines @@
 
     stopPeriodicTimers();
     m_loadTimer.stop();
 
     m_pendingActionFlags &= ~flags;
     m_loadState = WaitingForSource;
 
     // We can't cast if we don't have a media player.
     m_remoteRoutesAvailable = false;
     m_playingRemotely = false;
-    if (hasMediaControls()) {
+    if (mediaControls())
         mediaControls()->refreshCastButtonVisibility();
-    }
 
     if (m_textTracks)
         configureTextTrackDisplay(AssumeNoVisibleChange);
 }
 
 void HTMLMediaElement::stop()
 {
     WTF_LOG(Media, "HTMLMediaElement::stop(%p)", this);
 
     if (m_playing && m_initialPlayWithoutUserGestures)
@@ skipping 75 matching lines @@
 
 void HTMLMediaElement::exitFullscreen()
 {
     WTF_LOG(Media, "HTMLMediaElement::exitFullscreen(%p)", this);
 
     Fullscreen::from(document()).exitFullscreen();
 }
 
 void HTMLMediaElement::didBecomeFullscreenElement()
 {
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->enteredFullscreen();
     if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoElement())
         document().renderView()->compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 void HTMLMediaElement::willStopBeingFullscreenElement()
 {
-    if (hasMediaControls())
+    if (mediaControls())
         mediaControls()->exitedFullscreen();
     if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && isHTMLVideoElement())
         document().renderView()->compositor()->setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
 }
 
 blink::WebLayer* HTMLMediaElement::platformLayer() const
 {
     return m_webLayer;
 }
 
@@ skipping 91 matching lines @@
     m_shouldDelayLoadEvent = shouldDelay;
     if (shouldDelay)
         document().incrementLoadEventDelayCount();
     else
         document().decrementLoadEventDelayCount();
 }
 
 
 MediaControls* HTMLMediaElement::mediaControls() const
 {
-    return toMediaControls(closedShadowRoot()->firstChild());
-}
-
-bool HTMLMediaElement::hasMediaControls() const
-{
-    if (ShadowRoot* userAgent = closedShadowRoot()) {
-        Node* node = userAgent->firstChild();
-        ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isMediaControls());
-        return node;
+    if (ShadowRoot* shadowRoot = closedShadowRoot()) {
+        // Note that |shadowRoot->firstChild()| may be null.
+        return toMediaControls(shadowRoot->firstChild());
     }
 
-    return false;
+    return nullptr;
 }
 
 void HTMLMediaElement::ensureMediaControls()
 {
-    if (hasMediaControls())
+    if (mediaControls())
         return;
 
     RefPtrWillBeRawPtr<MediaControls> mediaControls = MediaControls::create(*this);
 
     mediaControls->reset();
     if (isFullscreen())
         mediaControls->enteredFullscreen();
 
     ensureClosedShadowRoot().appendChild(mediaControls);
 
     if (!shouldShowControls() || !inDocument())
         mediaControls->hide();
 }
 
 void HTMLMediaElement::configureMediaControls()
 {
     if (!inDocument()) {
-        if (hasMediaControls())
+        if (mediaControls())
             mediaControls()->hide();
         return;
     }
 
     ensureMediaControls();
     mediaControls()->reset();
     if (shouldShowControls())
         mediaControls()->show();
     else
         mediaControls()->hide();
@@ skipping 23 matching lines @@
     }
 
     if (assumption == AssumeNoVisibleChange
         && m_haveVisibleTextTrack == haveVisibleTextTrack) {
         cueTimeline().updateActiveCues(currentTime());
         return;
     }
     m_haveVisibleTextTrack = haveVisibleTextTrack;
     m_closedCaptionsVisible = m_haveVisibleTextTrack;
 
-    if (!m_haveVisibleTextTrack && !hasMediaControls())
+    if (!m_haveVisibleTextTrack && !mediaControls())
         return;
 
     ensureMediaControls();
     mediaControls()->changedClosedCaptionsVisibility();
 
     cueTimeline().updateActiveCues(currentTime());
     updateTextTrackDisplay();
 }
 
 void* HTMLMediaElement::preDispatchEventHandler(Event* event)
@@ skipping 178 matching lines @@
 }
 
 bool HTMLMediaElement::isInteractiveContent() const
 {
     return fastHasAttribute(controlsAttr);
 }
 
 void HTMLMediaElement::defaultEventHandler(Event* event)
 {
     if (event->type() == EventTypeNames::focusin) {
-        if (hasMediaControls())
+        if (mediaControls())
             mediaControls()->mediaElementFocused();
     }
     HTMLElement::defaultEventHandler(event);
 }
 
 DEFINE_TRACE(HTMLMediaElement)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_playedTimeRanges);
     visitor->trace(m_asyncEventQueue);
@@ skipping 46 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(nullptr);
 }
 #endif
 
 }