Avoid shadowing local |event| in CueTimeline::updateActiveCues

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 84 matching lines @@
     // track order.
     if (a.second->track() != b.second->track())
         return trackIndexCompare(a.second->track(), b.second->track());
 
     // 12 - Further sort tasks in events that have the same time by the
     // relative text track cue order of the text track cues associated
     // with these tasks.
     return a.second->cueIndex() - b.second->cueIndex() < 0;
 }
 
+static PassRefPtrWillBeRawPtr<Event> createEventWithTarget(const AtomicString& eventName, PassRefPtrWillBeRawPtr<EventTarget> eventTarget)
+{
+    RefPtrWillBeRawPtr<Event> event = Event::create(eventName);
+    event->setTarget(eventTarget);
+    return event.release();
+}
+
 void CueTimeline::updateActiveCues(double movieTime)
 {
     // 4.8.10.8 Playing the media resource
 
     //  If the current playback position changes while the steps are running,
     //  then the user agent must wait for the steps to complete, and then must
     //  immediately rerun the steps.
     if (ignoreUpdateRequests())
         return;
 
@@ skipping 141 matching lines @@
 
     // 12 - Sort the tasks in events in ascending time order (tasks with earlier
     // times first).
     nonCopyingSort(eventTasks.begin(), eventTasks.end(), eventTimeCueCompare);
 
     for (size_t i = 0; i < eventTasks.size(); ++i) {
         if (!affectedTracks.contains(eventTasks[i].second->track()))
             affectedTracks.append(eventTasks[i].second->track());
 
         // 13 - Queue each task in events, in list order.
-        RefPtrWillBeRawPtr<Event> event = nullptr;
 
         // Each event in eventTasks may be either an enterEvent or an exitEvent,
         // depending on the time that is associated with the event. This
         // correctly identifies the type of the event, if the startTime is
         // less than the endTime in the cue.
         if (eventTasks[i].second->startTime() >= eventTasks[i].second->endTime()) {
-            event = Event::create(EventTypeNames::enter);
-            event->setTarget(eventTasks[i].second);
-            mediaElement.scheduleEvent(event.release());
-
-            event = Event::create(EventTypeNames::exit);
-            event->setTarget(eventTasks[i].second);
-            mediaElement.scheduleEvent(event.release());
+            mediaElement.scheduleEvent(createEventWithTarget(EventTypeNames::enter, eventTasks[i].second));
+            mediaElement.scheduleEvent(createEventWithTarget(EventTypeNames::exit, eventTasks[i].second));
         } else {
-            if (eventTasks[i].first == eventTasks[i].second->startTime())
-                event = Event::create(EventTypeNames::enter);
-            else
-                event = Event::create(EventTypeNames::exit);
-
-            event->setTarget(eventTasks[i].second);
-            mediaElement.scheduleEvent(event.release());
+            bool isEnterEvent = eventTasks[i].first == eventTasks[i].second->startTime();
+            AtomicString eventName = isEnterEvent ? EventTypeNames::enter : EventTypeNames::exit;
+            mediaElement.scheduleEvent(createEventWithTarget(eventName, eventTasks[i].second));
         }
     }
 
     // 14 - Sort affected tracks in the same order as the text tracks appear in
     // the media element's list of text tracks, and remove duplicates.
     nonCopyingSort(affectedTracks.begin(), affectedTracks.end(), trackIndexCompare);
 
     // 15 - For each text track in affected tracks, in the list order, queue a
     // task to fire a simple event named cuechange at the TextTrack object, and, ...
     for (size_t i = 0; i < affectedTracks.size(); ++i) {
-        RefPtrWillBeRawPtr<Event> event = Event::create(EventTypeNames::cuechange);
-        event->setTarget(affectedTracks[i]);
-
-        mediaElement.scheduleEvent(event.release());
+        mediaElement.scheduleEvent(createEventWithTarget(EventTypeNames::cuechange, affectedTracks[i]));
 
         // ... if the text track has a corresponding track element, to then fire a
         // simple event named cuechange at the track element as well.
         if (affectedTracks[i]->trackType() == TextTrack::TrackElement) {
-            RefPtrWillBeRawPtr<Event> event = Event::create(EventTypeNames::cuechange);
             HTMLTrackElement* trackElement = static_cast<LoadableTextTrack*>(affectedTracks[i].get())->trackElement();
             ASSERT(trackElement);
-            event->setTarget(trackElement);
-
-            mediaElement.scheduleEvent(event.release());
+            mediaElement.scheduleEvent(createEventWithTarget(EventTypeNames::cuechange, trackElement));
         }
     }
 
     // 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) {
@@ skipping 20 matching lines @@
     if (!m_ignoreUpdate && mediaElement().inActiveDocument())
         updateActiveCues(mediaElement().currentTime());
 }
 
 DEFINE_TRACE(CueTimeline)
 {
     visitor->trace(m_mediaElement);
 }
 
 } // namespace blink