Oilpan: move AsyncMethodRunner to the heap.

third_party/WebKit/Source/core/css/FontFaceSet.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:
  *
  * 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 100 matching lines @@
     visitor->trace(m_fontFaces);
     visitor->trace(m_resolver);
     LoadFontCallback::trace(visitor);
 }
 
 FontFaceSet::FontFaceSet(Document& document)
     : ActiveDOMObject(&document)
     , m_shouldFireLoadingEvent(false)
     , m_isLoading(false)
     , m_ready(new ReadyProperty(executionContext(), this, ReadyProperty::Ready))
-    , m_asyncRunner(this, &FontFaceSet::handlePendingEventsAndPromises)
+    , m_asyncRunner(AsyncMethodRunner<FontFaceSet>::create(this, &FontFaceSet::handlePendingEventsAndPromises))
 {
     suspendIfNeeded();
 }
 
 FontFaceSet::~FontFaceSet()
 {
+#if !ENABLE(OILPAN)
+    stop();

[haraken, 2016/01/13 07:41:56]

Do we really need to call stop() here?

[sof, 2016/01/13 07:49:46]

It is required.

If we don't (from this non-heap object), then the Persistent<> will be cleared
and make the pointed-to AsyncMethodRunner<> garbage..to be collected by the next
GC. Until that time we want to protect timers from firing and calling into this
object, which has now been freed.

[haraken, 2016/01/13 07:57:34]

Ah, makes sense.

+#endif
 }
 
 Document* FontFaceSet::document() const
 {
     return toDocument(executionContext());
 }
 
 bool FontFaceSet::inActiveDocumentContext() const
 {
     ExecutionContext* context = executionContext();
@@ skipping 19 matching lines @@
 AtomicString FontFaceSet::status() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, loading, ("loading", AtomicString::ConstructFromLiteral));
     DEFINE_STATIC_LOCAL(AtomicString, loaded, ("loaded", AtomicString::ConstructFromLiteral));
     return m_isLoading ? loading : loaded;
 }
 
 void FontFaceSet::handlePendingEventsAndPromisesSoon()
 {
     // m_asyncRunner will be automatically stopped on destruction.
-    m_asyncRunner.runAsync();
+    m_asyncRunner->runAsync();
 }
 
 void FontFaceSet::didLayout()
 {
     if (document()->frame()->isMainFrame() && m_loadingFonts.isEmpty())
         m_histogram.record();
     if (!shouldSignalReady())
         return;
     handlePendingEventsAndPromisesSoon();
 }
@@ skipping 14 matching lines @@
 void FontFaceSet::fireLoadingEvent()
 {
     if (m_shouldFireLoadingEvent) {
         m_shouldFireLoadingEvent = false;
         dispatchEvent(FontFaceSetLoadEvent::createForFontFaces(EventTypeNames::loading));
     }
 }
 
 void FontFaceSet::suspend()
 {
-    m_asyncRunner.suspend();
+    m_asyncRunner->suspend();
 }
 
 void FontFaceSet::resume()
 {
-    m_asyncRunner.resume();
+    m_asyncRunner->resume();
 }
 
 void FontFaceSet::stop()
 {
-    m_asyncRunner.stop();
+    m_asyncRunner->stop();
 }
 
 void FontFaceSet::beginFontLoading(FontFace* fontFace)
 {
     m_histogram.incrementCount();
     addToLoadingFonts(fontFace);
 }
 
 void FontFaceSet::fontLoaded(FontFace* fontFace)
 {
@@ skipping 309 matching lines @@
 }
 
 DEFINE_TRACE(FontFaceSet)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_ready);
     visitor->trace(m_loadingFonts);
     visitor->trace(m_loadedFonts);
     visitor->trace(m_failedFonts);
     visitor->trace(m_nonCSSConnectedFaces);
+    visitor->trace(m_asyncRunner);
     HeapSupplement<Document>::trace(visitor);
 #endif
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink