Hoist cue "deactivation" out of TextTrackCueList::remove

Source/core/html/track/TextTrackCueList.cpp

 /*
  * Copyright (C) 2011 Google 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 95 matching lines @@
 
     return add(cue.release(), index + 1, end);
 }
 
 bool TextTrackCueList::remove(TextTrackCue* cue)
 {
     size_t index = m_list.find(cue);
     if (index == kNotFound)
         return false;
 
+    m_list.remove(index);
+    return true;
+}
+
+bool TextTrackCueList::updateCueIndex(TextTrackCue* cue)
+{
+    size_t index = m_list.find(cue);
+    if (index == kNotFound)
+        return false;
+
     cue->setIsActive(false);
     cue->removeDisplayTree();
 
     m_list.remove(index);
-    return true;
-}
 
-bool TextTrackCueList::contains(TextTrackCue* cue) const
-{
-    return m_list.contains(cue);
-}
-
-bool TextTrackCueList::updateCueIndex(TextTrackCue* cue)
-{
-    if (!contains(cue))
-        return false;
-
-    remove(cue);
     return add(cue);
 }
 
 void TextTrackCueList::clear()
 {
     m_list.clear();
 }
 
 void TextTrackCueList::invalidateCueIndexes(size_t start)
 {
     for (size_t i = start; i < m_list.size(); ++i)
         m_list[i]->invalidateCueIndex();
 }
 
 DEFINE_TRACE(TextTrackCueList)
 {
     visitor->trace(m_list);
     visitor->trace(m_activeCues);
 }
 
 } // namespace blink