Use per-frame WebTaskRunner with makeCancellable in AXObjectCacheImpl

third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp

 /*
  * Copyright (C) 2014, 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
@@ skipping 13 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/InputTypeNames.h"
 #include "core/dom/Document.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLOptionElement.h"
@@ skipping 46 matching lines @@
 {
     return new AXObjectCacheImpl(document);
 }
 
 AXObjectCacheImpl::AXObjectCacheImpl(Document& document)
     : m_document(document)
     , m_modificationCount(0)
 #if ENABLE(ASSERT)
     , m_hasBeenDisposed(false)
 #endif
-    , m_notificationPostTimer(this, &AXObjectCacheImpl::notificationPostTimerFired)
 {
 }
 
 AXObjectCacheImpl::~AXObjectCacheImpl()
 {
     ASSERT(m_hasBeenDisposed);
 }
 
 void AXObjectCacheImpl::dispose()
 {
-    m_notificationPostTimer.stop();
+    m_notificationPostCanceller.cancel();
 
     for (auto& entry : m_objects) {
         AXObject* obj = entry.value;
         obj->detach();
         removeAXID(obj);
     }
 
 #if ENABLE(ASSERT)
     m_hasBeenDisposed = true;
 #endif
@@ skipping 519 matching lines @@
 }
 
 void AXObjectCacheImpl::childrenChanged(AXObject* obj)
 {
     if (!obj)
         return;
 
     obj->childrenChanged();
 }
 
-void AXObjectCacheImpl::notificationPostTimerFired(TimerBase*)
+void AXObjectCacheImpl::postNotificationsNow()
 {
-    m_notificationPostTimer.stop();
-
     unsigned i = 0, count = m_notificationsToPost.size();
     for (i = 0; i < count; ++i) {
         AXObject* obj = m_notificationsToPost[i].first;
 
         if (!obj->axObjectID())
             continue;
 
         if (obj->isDetached())
             continue;
 
@@ skipping 36 matching lines @@
     postNotification(get(node), notification);
 }
 
 void AXObjectCacheImpl::postNotification(AXObject* object, AXNotification notification)
 {
     m_modificationCount++;
     if (!object)
         return;
 
     m_notificationsToPost.append(std::make_pair(object, notification));
-    if (!m_notificationPostTimer.isActive())
-        m_notificationPostTimer.startOneShot(0, BLINK_FROM_HERE);
+    if (m_notificationPostCanceller.isActive())
+        return;
+
+    auto result = WTF::makeCancellable(WTF::bind(&AXObjectCacheImpl::postNotificationsNow, wrapWeakPersistent(this)));
+    m_notificationPostCanceller = std::move(result.canceller);
+    TaskRunnerHelper::get(TaskType::Internal, m_document)->postTask(BLINK_FROM_HERE, std::move(result.function));
 }
 
 bool AXObjectCacheImpl::isAriaOwned(const AXObject* child) const
 {
     return m_ariaOwnedChildToOwnerMapping.contains(child->axObjectID());
 }
 
 AXObject* AXObjectCacheImpl::getAriaOwnedParent(const AXObject* child) const
 {
     return objectFromAXID(m_ariaOwnedChildToOwnerMapping.get(child->axObjectID()));
@@ skipping 561 matching lines @@
     visitor->trace(m_document);
     visitor->trace(m_nodeObjectMapping);
 
     visitor->trace(m_objects);
     visitor->trace(m_notificationsToPost);
 
     AXObjectCache::trace(visitor);
 }
 
 } // namespace blink