EventSender<T> singletons are better off on the Oilpan heap.

third_party/WebKit/Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 36 matching lines @@
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
 static ImageEventSender& loadEventSender()
 {
-    DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::load));
-    return sender;
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ImageEventSender>, sender, (ImageEventSender::create(EventTypeNames::load)));
+    return *sender;
 }
 
 static ImageEventSender& errorEventSender()
 {
-    DEFINE_STATIC_LOCAL(ImageEventSender, sender, (EventTypeNames::error));
-    return sender;
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ImageEventSender>, sender, (ImageEventSender::create(EventTypeNames::error)));
+    return *sender;
 }
 
 static inline bool pageIsBeingDismissed(Document* document)
 {
     return document->pageDismissalEventBeingDispatched() != Document::NoDismissal;
 }
 
 static ImageLoader::BypassMainWorldBehavior shouldBypassMainWorldCSP(ImageLoader* loader)
 {
     ASSERT(loader);
@@ skipping 99 matching lines @@
 #endif
 
 #if ENABLE(OILPAN)
     for (const auto& client : m_clients)
         willRemoveClient(*client);
 #endif
 
     if (m_image)
         m_image->removeClient(this);
 
+#if !ENABLE(OILPAN)
     ASSERT(m_hasPendingLoadEvent || !loadEventSender().hasPendingEvents(this));
     if (m_hasPendingLoadEvent)
         loadEventSender().cancelEvent(this);
 
     ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this));
     if (m_hasPendingErrorEvent)
         errorEventSender().cancelEvent(this);
+#endif
 }
 
 #if ENABLE(OILPAN)
 void ImageLoader::clearWeakMembers(Visitor* visitor)
 {
     Vector<UntracedMember<ImageLoaderClient>> deadClients;
     for (const auto& client : m_clients) {
         if (!Heap::isHeapObjectAlive(client)) {
             willRemoveClient(*client);
             deadClients.append(client);
@@ skipping 475 matching lines @@
 
 void ImageLoader::sourceImageChanged()
 {
     for (auto& client : m_clients) {
         ImageLoaderClient* handle = client;
         handle->notifyImageSourceChanged();
     }
 }
 
 } // namespace blink