Remove TextTrackCue::notifyRegionWhenRemovingDisplayTree

Source/core/html/track/CueTimeline.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/html/track/CueTimeline.h"
 
 #include "core/events/Event.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLTrackElement.h"
@@ skipping 44 matching lines @@
 
 void CueTimeline::removeCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue> cue)
 {
     // Negative duration cues need to be treated in the interval tree as
     // zero-length cues.
     double endTime = std::max(cue->startTime(), cue->endTime());
 
     CueInterval interval = m_cueTree.createInterval(cue->startTime(), endTime, cue.get());
     m_cueTree.remove(interval);
 
-    // Since the cue will be removed from the media element and likely the
-    // TextTrack might also be destructed, notifying the region of the cue
-    // removal shouldn't be done.
-    cue->notifyRegionWhenRemovingDisplayTree(false);
-
     size_t index = m_currentlyActiveCues.find(interval);
     if (index != kNotFound) {
         m_currentlyActiveCues.remove(index);
         cue->setIsActive(false);
+        // Since the cue will be removed from the media element and likely the
+        // TextTrack might also be destructed, notifying the region of the cue
+        // removal shouldn't be done.
+        cue->removeDisplayTree(TextTrackCue::DontNotifyRegion);
     }
-    cue->removeDisplayTree();
     updateActiveCues(mediaElement().currentTime());
-
-    cue->notifyRegionWhenRemovingDisplayTree(true);
 }
 
 static bool trackIndexCompare(TextTrack* a, TextTrack* b)
 {
     return a->trackIndex() - b->trackIndex() < 0;
 }
 
 static bool eventTimeCueCompare(const std::pair<double, TextTrackCue*>& a, const std::pair<double, TextTrackCue*>& b)
 {
     // 12 - Sort the tasks in events in ascending time order (tasks with earlier
@@ skipping 223 matching lines @@
         }
     }
 
     // 16 - Set the text track cue active flag of all the cues in the current
     // cues, and unset the text track cue active flag of all the cues in the
     // other cues.
     for (size_t i = 0; i < currentCuesSize; ++i)
         currentCues[i].data()->setIsActive(true);
 
     for (size_t i = 0; i < previousCuesSize; ++i) {
-        if (!currentCues.contains(previousCues[i]))
-            previousCues[i].data()->setIsActive(false);
+        if (!currentCues.contains(previousCues[i])) {
+            TextTrackCue* cue = previousCues[i].data();
+            cue->setIsActive(false);
+            cue->removeDisplayTree();
+        }
     }
 
     // Update the current active cues.
     m_currentlyActiveCues = currentCues;
 
     if (activeSetChanged)
         mediaElement.updateTextTrackDisplay();
 }
 
 void CueTimeline::beginIgnoringUpdateRequests()
 {
     ++m_ignoreUpdate;
 }
 
 void CueTimeline::endIgnoringUpdateRequests()
 {
     ASSERT(m_ignoreUpdate);
     --m_ignoreUpdate;
     if (!m_ignoreUpdate && mediaElement().inActiveDocument())
         updateActiveCues(mediaElement().currentTime());
 }
 
 DEFINE_TRACE(CueTimeline)
 {
     visitor->trace(m_mediaElement);
 }
 
 } // namespace blink