Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: Source/WebCore/html/HTMLMediaElement.cpp

Issue 9937009: Merge 112623 - Crash in GenericEventQueue::~GenericEventQueue. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/HTMLMediaElement.cpp
===================================================================
--- Source/WebCore/html/HTMLMediaElement.cpp (revision 112635)
+++ Source/WebCore/html/HTMLMediaElement.cpp (working copy)
@@ -182,6 +182,7 @@
, m_progressEventTimer(this, &HTMLMediaElement::progressEventTimerFired)
, m_playbackProgressTimer(this, &HTMLMediaElement::playbackProgressTimerFired)
, m_playedTimeRanges()
+ , m_asyncEventQueue(GenericEventQueue::create(this))
, m_playbackRate(1.0f)
, m_defaultPlaybackRate(1.0f)
, m_webkitPreservesPitch(true)
@@ -550,7 +551,7 @@
RefPtr<Event> event = Event::create(eventName, false, true);
event->setTarget(this);
- m_asyncEventQueue.enqueueEvent(event.release());
+ m_asyncEventQueue->enqueueEvent(event.release());
}
void HTMLMediaElement::loadTimerFired(Timer<HTMLMediaElement>*)
@@ -1149,7 +1150,7 @@
event = Event::create(eventNames().exitEvent, false, false);
event->setTarget(eventTasks[i].second);
- m_asyncEventQueue.enqueueEvent(event.release());
+ m_asyncEventQueue->enqueueEvent(event.release());
}
// 14 - Sort affected tracks in the same order as the text tracks appear in
@@ -1164,7 +1165,7 @@
RefPtr<Event> event = Event::create(eventNames().cuechangeEvent, false, false);
event->setTarget(affectedTracks[i]);
- m_asyncEventQueue.enqueueEvent(event.release());
+ m_asyncEventQueue->enqueueEvent(event.release());
// Fire syncronous cue change event for track elements.
if (affectedTracks[i]->trackType() == TextTrack::TrackElement)
@@ -1399,7 +1400,7 @@
void HTMLMediaElement::cancelPendingEventsAndCallbacks()
{
LOG(Media, "HTMLMediaElement::cancelPendingEventsAndCallbacks");
- m_asyncEventQueue.cancelAllEvents();
+ m_asyncEventQueue->cancelAllEvents();
for (Node* node = firstChild(); node; node = node->nextSibling()) {
if (node->hasTagName(sourceTag))
@@ -3466,7 +3467,7 @@
bool HTMLMediaElement::hasPendingActivity() const
{
- return m_asyncEventQueue.hasPendingEvents();
+ return m_asyncEventQueue->hasPendingEvents();
}
void HTMLMediaElement::mediaVolumeDidChange()
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698