Simplify HTMLMediaElement::textTrackModeChanged

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 1133 matching lines @@
         // 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)
             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,
-        // or showing by default for the first time, the user agent must immediately and synchronously
-        // run the following algorithm ...
-
-        for (HTMLTrackElement* trackElement = Traversal<HTMLTrackElement>::firstChild(*this); trackElement; trackElement = Traversal<HTMLTrackElement>::nextSibling(*trackElement)) {
-            if (trackElement->track() != track)
-                continue;
-
-            // Mark this track as "configured" so configureTextTracks won't change the mode again.
-            track->setHasBeenConfigured(true);
-            if (track->mode() != TextTrack::disabledKeyword()) {
-                if (trackElement->readyState() == HTMLTrackElement::LOADED)
-                    cueTimeline().addCues(track, track->cues());
-
-                // If this is the first added track, create the list of text tracks.

[philipj_slow, 2015/02/25 15:52:14]

Was this just dead code?

[fs, 2015/02/25 16:26:11]

Yes. (This method was only called from within TextTrack::setMode, and only if
mediaElement(), and the latter is "m_trackList ? m_trackList->owner() : 0;" -
i.e. it's hard to send this notification if there was no list in the first
place... Probably some old iteration left behind.)

-                if (!m_textTracks)
-                    m_textTracks = TextTrackList::create(this);
-            }
-            break;
-        }
-    } else if (track->trackType() == TextTrack::AddTrack && track->mode() != TextTrack::disabledKeyword()) {
-        cueTimeline().addCues(track, track->cues());
-    }
+    // Mark this track as "configured" so configureTextTracks won't change the mode again.
+    if (track->trackType() == TextTrack::TrackElement)
+        track->setHasBeenConfigured(true);
 
     configureTextTrackDisplay(AssumeVisibleChange);
 
     ASSERT(textTracks()->contains(track));
     textTracks()->scheduleChangeEvent();
 }
 
 void HTMLMediaElement::textTrackKindChanged(TextTrack* track)
 {
     if (track->kind() != TextTrack::captionsKeyword() && track->kind() != TextTrack::subtitlesKeyword() && track->mode() == TextTrack::showingKeyword())
@@ skipping 2442 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(nullptr);
 }
 #endif
 
 }