Oilpan: move AsyncMethodRunner to the heap.

third_party/WebKit/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 93 matching lines @@
     , m_source(source)
     , m_trackDefaults(TrackDefaultList::create())
     , m_asyncEventQueue(asyncEventQueue)
     , m_mode(segmentsKeyword())
     , m_updating(false)
     , m_timestampOffset(0)
     , m_appendWindowStart(0)
     , m_appendWindowEnd(std::numeric_limits<double>::infinity())
     , m_firstInitializationSegmentReceived(false)
     , m_pendingAppendDataOffset(0)
-    , m_appendBufferAsyncPartRunner(this, &SourceBuffer::appendBufferAsyncPart)
+    , m_appendBufferAsyncPartRunner(AsyncMethodRunner<SourceBuffer>::create(this, &SourceBuffer::appendBufferAsyncPart))
     , m_pendingRemoveStart(-1)
     , m_pendingRemoveEnd(-1)
-    , m_removeAsyncPartRunner(this, &SourceBuffer::removeAsyncPart)
+    , m_removeAsyncPartRunner(AsyncMethodRunner<SourceBuffer>::create(this, &SourceBuffer::removeAsyncPart))
     , m_streamMaxSizeValid(false)
     , m_streamMaxSize(0)
-    , m_appendStreamAsyncPartRunner(this, &SourceBuffer::appendStreamAsyncPart)
+    , m_appendStreamAsyncPartRunner(AsyncMethodRunner<SourceBuffer>::create(this, &SourceBuffer::appendStreamAsyncPart))
 {
     ASSERT(m_webSourceBuffer);
     ASSERT(m_source);
     m_webSourceBuffer->setClient(this);
 }
 
 SourceBuffer::~SourceBuffer()
 {
     // Oilpan: a SourceBuffer might be finalized without having been
     // explicitly removed first, hence the asserts below will not
@@ skipping 256 matching lines @@
     // 7. Run the range removal algorithm with start and end as the start and end of the removal range.
     // 7.3. Set the updating attribute to true.
     m_updating = true;
 
     // 7.4. Queue a task to fire a simple event named updatestart at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updatestart);
 
     // 7.5. Return control to the caller and run the rest of the steps asynchronously.
     m_pendingRemoveStart = start;
     m_pendingRemoveEnd = end;
-    m_removeAsyncPartRunner.runAsync();
+    m_removeAsyncPartRunner->runAsync();
 }
 
 void SourceBuffer::setTrackDefaults(TrackDefaultList* trackDefaults, ExceptionState& exceptionState)
 {
     // Per 02 Dec 2014 Editor's Draft
     // http://w3c.github.io/media-source/#widl-SourceBuffer-trackDefaults
     // 1. If this object has been removed from the sourceBuffers attribute of
     //    the parent media source, then throw an InvalidStateError exception
     //    and abort these steps.
     // 2. If the updating attribute equals true, then throw an InvalidStateError
@@ skipping 18 matching lines @@
         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_appendBufferAsyncPartRunner.stop();
+    m_appendBufferAsyncPartRunner->stop();
     m_pendingAppendData.clear();
     m_pendingAppendDataOffset = 0;
 
-    m_removeAsyncPartRunner.stop();
+    m_removeAsyncPartRunner->stop();
     m_pendingRemoveStart = -1;
     m_pendingRemoveEnd = -1;
 
-    m_appendStreamAsyncPartRunner.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 39 matching lines @@
     }
 }
 
 bool SourceBuffer::hasPendingActivity() const
 {
     return m_source;
 }
 
 void SourceBuffer::suspend()
 {
-    m_appendBufferAsyncPartRunner.suspend();
-    m_removeAsyncPartRunner.suspend();
-    m_appendStreamAsyncPartRunner.suspend();
+    m_appendBufferAsyncPartRunner->suspend();
+    m_removeAsyncPartRunner->suspend();
+    m_appendStreamAsyncPartRunner->suspend();
 }
 
 void SourceBuffer::resume()
 {
-    m_appendBufferAsyncPartRunner.resume();
-    m_removeAsyncPartRunner.resume();
-    m_appendStreamAsyncPartRunner.resume();
+    m_appendBufferAsyncPartRunner->resume();
+    m_removeAsyncPartRunner->resume();
+    m_appendStreamAsyncPartRunner->resume();
 }
 
 void SourceBuffer::stop()
 {
-    m_appendBufferAsyncPartRunner.stop();
-    m_removeAsyncPartRunner.stop();
-    m_appendStreamAsyncPartRunner.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 84 matching lines @@
         m_pendingAppendData.append(data, size);
     m_pendingAppendDataOffset = 0;
 
     // 3. Set the updating attribute to true.
     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 buffer append algorithm.
-    m_appendBufferAsyncPartRunner.runAsync();
+    m_appendBufferAsyncPartRunner->runAsync();
 
     TRACE_EVENT_ASYNC_STEP_INTO0("media", "SourceBuffer::appendBuffer", this, "initialDelay");
 }
 
 void SourceBuffer::appendBufferAsyncPart()
 {
     ASSERT(m_updating);
 
     // 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
@@ skipping 20 matching lines @@
     unsigned char zero = 0;
     unsigned char* appendData = &zero;
     if (appendSize)
         appendData = m_pendingAppendData.data() + m_pendingAppendDataOffset;
 
     m_webSourceBuffer->append(appendData, appendSize, &m_timestampOffset);
 
     m_pendingAppendDataOffset += appendSize;
 
     if (m_pendingAppendDataOffset < m_pendingAppendData.size()) {
-        m_appendBufferAsyncPartRunner.runAsync();
+        m_appendBufferAsyncPartRunner->runAsync();
         TRACE_EVENT_ASYNC_STEP_INTO0("media", "SourceBuffer::appendBuffer", this, "nextPieceDelay");
         return;
     }
 
     // 3. Set the updating attribute to false.
     m_updating = false;
     m_pendingAppendData.clear();
     m_pendingAppendDataOffset = 0;
 
     // 4. Queue a task to fire a simple event named update at this SourceBuffer object.
@@ skipping 52 matching lines @@
     // 2. Set the updating attribute to true.
     m_updating = true;
 
     // 3. Queue a task to fire a simple event named updatestart at this SourceBuffer object.
     scheduleEvent(EventTypeNames::updatestart);
 
     // 4. Asynchronously run the stream append loop algorithm with stream and maxSize.
     stream->neuter();
     m_loader = FileReaderLoader::create(FileReaderLoader::ReadByClient, this);
     m_stream = stream;
-    m_appendStreamAsyncPartRunner.runAsync();
+    m_appendStreamAsyncPartRunner->runAsync();
 }
 
 void SourceBuffer::appendStreamAsyncPart()
 {
     ASSERT(m_updating);
     ASSERT(m_loader);
     ASSERT(m_stream);
     TRACE_EVENT_ASYNC_STEP_INTO0("media", "SourceBuffer::appendStream", this, "appendStreamAsyncPart");
 
     // Section 3.5.6 Stream Append Loop
@@ skipping 109 matching lines @@
     // m_loader might be already released, in case appendStream has failed due
     // to evictCodedFrames failing in didReceiveDataForClient. In that case
     // appendStreamDone will be invoked from there, no need to repeat it here.
     if (m_loader)
         appendStreamDone(false);
 }
 
 DEFINE_TRACE(SourceBuffer)
 {
     visitor->trace(m_source);
-    visitor->trace(m_stream);
     visitor->trace(m_trackDefaults);
     visitor->trace(m_asyncEventQueue);
+    visitor->trace(m_appendBufferAsyncPartRunner);
+    visitor->trace(m_removeAsyncPartRunner);
+    visitor->trace(m_appendStreamAsyncPartRunner);
+    visitor->trace(m_stream);
     RefCountedGarbageCollectedEventTargetWithInlineData<SourceBuffer>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink