Replace Timers used in ActiveDOMObject with AsyncMethodRunner

Source/modules/mediasource/SourceBuffer.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 49 matching lines @@
 
 SourceBuffer::SourceBuffer(PassOwnPtr<SourceBufferPrivate> sourceBufferPrivate, MediaSource* source, GenericEventQueue* asyncEventQueue)
     : ActiveDOMObject(source->executionContext())
     , m_private(sourceBufferPrivate)
     , m_source(source)
     , m_asyncEventQueue(asyncEventQueue)
     , m_updating(false)
     , m_timestampOffset(0)
     , m_appendWindowStart(0)
     , m_appendWindowEnd(std::numeric_limits<double>::infinity())
-    , m_appendBufferTimer(this, &SourceBuffer::appendBufferTimerFired)
-    , m_removeTimer(this, &SourceBuffer::removeTimerFired)
+    , m_appendBufferAsyncPartRunner(this, &SourceBuffer::appendBufferAsyncPart)
+    , m_removeAsyncPartRunner(this, &SourceBuffer::removeAsyncPart)
     , m_pendingRemoveStart(-1)
     , m_pendingRemoveEnd(-1)
     , m_streamMaxSizeValid(false)
     , m_streamMaxSize(0)
-    , m_appendStreamTimer(this, &SourceBuffer::appendStreamTimerFired)
+    , m_appendStreamAsyncPartRunner(this, &SourceBuffer::appendStreamAsyncPart)
 {
     ASSERT(m_private);
     ASSERT(m_source);
     ScriptWrappable::init(this);
 }
 
 SourceBuffer::~SourceBuffer()
 {
     ASSERT(isRemoved());
     ASSERT(!m_loader);
@@ skipping 209 matching lines @@
 
     // 6. Set the updating attribute to true.
     m_updating = true;
 
     // 7. Queue a task to fire a simple event named updatestart at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updatestart);
 
     // 8. Return control to the caller and run the rest of the steps asynchronously.
     m_pendingRemoveStart = start;
     m_pendingRemoveEnd = end;
-    m_removeTimer.startOneShot(0);
+    m_removeAsyncPartRunner.runAsync();
 }
 
 void SourceBuffer::abortIfUpdating()
 {
     // Section 3.2 abort() method step 3 substeps.
     // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-SourceBuffer-abort-void
 
     if (!m_updating)
         return;
 
     const char* traceEventName = 0;
     if (!m_pendingAppendData.isEmpty()) {
         traceEventName = "SourceBuffer::appendBuffer";
     } else if (m_stream) {
         traceEventName = "SourceBuffer::appendStream";
     } else if (m_pendingRemoveStart != -1) {
         traceEventName = "SourceBuffer::remove";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     // 3.1. Abort the buffer append and stream append loop algorithms if they are running.
-    m_appendBufferTimer.stop();
+    m_appendBufferAsyncPartRunner.stop();
     m_pendingAppendData.clear();
 
-    m_removeTimer.stop();
+    m_removeAsyncPartRunner.stop();
     m_pendingRemoveStart = -1;
     m_pendingRemoveEnd = -1;
 
-    m_appendStreamTimer.stop();
+    m_appendStreamAsyncPartRunner.stop();
     clearAppendStreamState();
 
     // 3.2. Set the updating attribute to false.
     m_updating = false;
 
     // 3.3. Queue a task to fire a simple event named abort at this SourceBuffer object.
     scheduleEvent(EventTypeNames::abort);
 
     // 3.4. Queue a task to fire a simple event named updateend at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updateend);
@@ skipping 11 matching lines @@
     m_private->removedFromMediaSource();
     m_source = 0;
     m_asyncEventQueue = 0;
 }
 
 bool SourceBuffer::hasPendingActivity() const
 {
     return m_source;
 }
 
+void SourceBuffer::suspend()
+{
+    m_appendBufferAsyncPartRunner.suspend();
+    m_removeAsyncPartRunner.suspend();
+    m_appendStreamAsyncPartRunner.suspend();
+}
+
+void SourceBuffer::resume()
+{
+    m_appendBufferAsyncPartRunner.resume();
+    m_removeAsyncPartRunner.resume();
+    m_appendStreamAsyncPartRunner.resume();
+}
+
 void SourceBuffer::stop()
 {
-    m_appendBufferTimer.stop();
-    m_removeTimer.stop();
-    m_appendStreamTimer.stop();
+    m_appendBufferAsyncPartRunner.stop();
+    m_removeAsyncPartRunner.stop();
+    m_appendStreamAsyncPartRunner.stop();
 }
 
 ExecutionContext* SourceBuffer::executionContext() const
 {
     return ActiveDOMObject::executionContext();
 }
 
 const AtomicString& SourceBuffer::interfaceName() const
 {
     return EventTargetNames::SourceBuffer;
@@ skipping 37 matching lines @@
     // 7. Add data to the end of the input buffer.
     m_pendingAppendData.append(data, size);
 
     // 8. Set the updating attribute to true.
     m_updating = true;
 
     // 9. Queue a task to fire a simple event named updatestart at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updatestart);
 
     // 10. Asynchronously run the buffer append algorithm.
-    m_appendBufferTimer.startOneShot(0);
+    m_appendBufferAsyncPartRunner.runAsync();
 
     TRACE_EVENT_ASYNC_STEP0("media", "SourceBuffer::appendBuffer", this, "waiting");
 }
 
-void SourceBuffer::appendBufferTimerFired(Timer<SourceBuffer>*)
+void SourceBuffer::appendBufferAsyncPart()
 {
     ASSERT(m_updating);
 
     TRACE_EVENT_ASYNC_STEP0("media", "SourceBuffer::appendBuffer", this, "appending");
 
     // Section 3.5.4 Buffer Append Algorithm
     // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-buffer-append
 
     // 1. Run the segment parser loop algorithm.
     // Step 2 doesn't apply since we run Step 1 synchronously here.
@@ skipping 11 matching lines @@
     m_pendingAppendData.clear();
 
     // 4. Queue a task to fire a simple event named update at this SourceBuffer object.
     scheduleEvent(EventTypeNames::update);
 
     // 5. Queue a task to fire a simple event named updateend at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updateend);
     TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendBuffer", this);
 }
 
-void SourceBuffer::removeTimerFired(Timer<SourceBuffer>*)
+void SourceBuffer::removeAsyncPart()
 {
     ASSERT(m_updating);
     ASSERT(m_pendingRemoveStart >= 0);
     ASSERT(m_pendingRemoveStart < m_pendingRemoveEnd);
 
     // Section 3.2 remove() method steps
     // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-SourceBuffer-remove-void-double-start-double-end
 
     // 9. Run the coded frame removal algorithm with start and end as the start and end of the removal range.
     m_private->remove(m_pendingRemoveStart, m_pendingRemoveEnd);
@@ skipping 41 matching lines @@
     m_updating = true;
 
     // 4. Queue a task to fire a simple event named updatestart at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updatestart);
 
     // 5. Asynchronously run the stream append loop algorithm with stream and maxSize.
 
     stream->neuter();
     m_loader = adoptPtr(new FileReaderLoader(FileReaderLoader::ReadByClient, this));
     m_stream = stream;
-    m_appendStreamTimer.startOneShot(0);
+    m_appendStreamAsyncPartRunner.runAsync();
 }
 
-void SourceBuffer::appendStreamTimerFired(Timer<SourceBuffer>*)
+void SourceBuffer::appendStreamAsyncPart()
 {
     ASSERT(m_updating);
     ASSERT(m_loader);
     ASSERT(m_stream);
 
     // Section 3.5.6 Stream Append Loop
     // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-stream-append-loop
 
     // 1. If maxSize is set, then let bytesLeft equal maxSize.
     // 2. Loop Top: If maxSize is set and bytesLeft equals 0, then jump to the loop done step below.
@@ skipping 26 matching lines @@
         // 3. Queue a task to fire a simple event named error at this SourceBuffer object.
         scheduleEvent(EventTypeNames::error);
 
         // 4. Queue a task to fire a simple event named updateend at this SourceBuffer object.
         scheduleEvent(EventTypeNames::updateend);
         TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendStream", this);
         return;
     }
 
     // Section 3.5.6 Stream Append Loop
-    // Steps 1-11 are handled by appendStreamTimerFired(), |m_loader|, and |m_private|.
+    // Steps 1-11 are handled by appendStreamAsyncPart(), |m_loader|, and |m_private|.
     // 12. Loop Done: Set the updating attribute to false.
     m_updating = false;
 
     // 13. Queue a task to fire a simple event named update at this SourceBuffer object.
     scheduleEvent(EventTypeNames::update);
 
     // 14. Queue a task to fire a simple event named updateend at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updateend);
     TRACE_EVENT_ASYNC_END0("media", "SourceBuffer::appendStream", this);
 }
@@ skipping 26 matching lines @@
     appendStreamDone(true);
 }
 
 void SourceBuffer::didFail(FileError::ErrorCode errorCode)
 {
     LOG(Media, "SourceBuffer::didFail(%d) %p", errorCode, this);
     appendStreamDone(false);
 }
 
 } // namespace WebCore