Index: third_party/WebKit/Source/core/loader/ImageLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.cpp b/third_party/WebKit/Source/core/loader/ImageLoader.cpp |
index 7c9b956fd41cc5075a849191f9ca178da84a2b13..29410d0fbd83fecfa4c56a16f9ae2a61d21aa6fe 100644 |
--- a/third_party/WebKit/Source/core/loader/ImageLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.cpp |
@@ -54,14 +54,14 @@ 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) |
@@ -181,6 +181,7 @@ void ImageLoader::dispose() |
if (m_image) |
m_image->removeClient(this); |
+#if !ENABLE(OILPAN) |
ASSERT(m_hasPendingLoadEvent || !loadEventSender().hasPendingEvents(this)); |
if (m_hasPendingLoadEvent) |
loadEventSender().cancelEvent(this); |
@@ -188,6 +189,7 @@ void ImageLoader::dispose() |
ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this)); |
if (m_hasPendingErrorEvent) |
errorEventSender().cancelEvent(this); |
+#endif |
} |
#if ENABLE(OILPAN) |