Remove internal uses of TrackDisplayUpdateScope in CueTimeline

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"
 #include "core/html/track/LoadableTextTrack.h"
 #include "core/html/track/TextTrack.h"
 #include "core/html/track/TextTrackCue.h"
 #include "core/html/track/TextTrackCueList.h"
 #include "wtf/NonCopyingSort.h"
 
 namespace blink {
 
 CueTimeline::CueTimeline(HTMLMediaElement& mediaElement)
     : m_mediaElement(&mediaElement)
     , m_lastUpdateTime(-1)
     , m_ignoreUpdate(0)
 {
 }
 
 void CueTimeline::addCues(TextTrack* track, const TextTrackCueList* cues)
 {
     ASSERT(track->mode() != TextTrack::disabledKeyword());
-
-    TrackDisplayUpdateScope scope(*this);
     for (size_t i = 0; i < cues->length(); ++i)
-        addCue(cues->item(i)->track(), cues->item(i));
+        addCueInternal(cues->item(i));
+    updateActiveCues(mediaElement().currentTime());
 }
 
 void CueTimeline::addCue(TextTrack* track, PassRefPtrWillBeRawPtr<TextTrackCue> cue)
 {
     ASSERT(track->mode() != TextTrack::disabledKeyword());
+    addCueInternal(cue);
+    updateActiveCues(mediaElement().currentTime());
+}
 
+void CueTimeline::addCueInternal(PassRefPtrWillBeRawPtr<TextTrackCue> cue)
+{
     // Negative duration cues need 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());
     if (!m_cueTree.contains(interval))
         m_cueTree.add(interval);
-    updateActiveCues(mediaElement().currentTime());
 }
 
 void CueTimeline::removeCues(TextTrack*, const TextTrackCueList* cues)
 {
-    TrackDisplayUpdateScope scope(*this);
     for (size_t i = 0; i < cues->length(); ++i)
-        removeCue(cues->item(i)->track(), cues->item(i));
+        removeCueInternal(cues->item(i));
+    updateActiveCues(mediaElement().currentTime());
 }
 
 void CueTimeline::removeCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue> cue)
 {
+    removeCueInternal(cue);
+    updateActiveCues(mediaElement().currentTime());
+}
+
+void CueTimeline::removeCueInternal(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);
 
     size_t index = m_currentlyActiveCues.find(interval);
     if (index != kNotFound) {
         ASSERT(cue->isActive());
         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);
     }
-    updateActiveCues(mediaElement().currentTime());
 }
 
 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 247 matching lines @@
     if (!m_ignoreUpdate && mediaElement().inActiveDocument())
         updateActiveCues(mediaElement().currentTime());
 }
 
 DEFINE_TRACE(CueTimeline)
 {
     visitor->trace(m_mediaElement);
 }
 
 } // namespace blink