Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

Issue 1554903002: EventSender<T> singletons are better off on the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove no-op cancelEvent()s Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
index f66c9cc3937ae49e0d420ce04742ddb961396488..2f4c6b338876ab592123f9a37c06fff7e66ad0e6 100644
--- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
@@ -81,26 +81,26 @@ inline RepeatEvent* toRepeatEvent(Event* event)
static SMILEventSender& smilEndEventSender()
{
- DEFINE_STATIC_LOCAL(SMILEventSender, sender, (EventTypeNames::endEvent));
- return sender;
+ DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::endEvent)));
+ return *sender;
}
static SMILEventSender& smilBeginEventSender()
{
- DEFINE_STATIC_LOCAL(SMILEventSender, sender, (EventTypeNames::beginEvent));
- return sender;
+ DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::beginEvent)));
+ return *sender;
}
static SMILEventSender& smilRepeatEventSender()
{
- DEFINE_STATIC_LOCAL(SMILEventSender, sender, (EventTypeNames::repeatEvent));
- return sender;
+ DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::repeatEvent)));
+ return *sender;
}
static SMILEventSender& smilRepeatNEventSender()
{
- DEFINE_STATIC_LOCAL(SMILEventSender, sender, (AtomicString("repeatn", AtomicString::ConstructFromLiteral)));
- return sender;
+ DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(AtomicString("repeatn", AtomicString::ConstructFromLiteral))));
+ return *sender;
}
// This is used for duration type time values that can't be negative.
@@ -206,12 +206,10 @@ SVGSMILElement::~SVGSMILElement()
{
#if !ENABLE(OILPAN)
clearResourceAndEventBaseReferences();
-#endif
smilEndEventSender().cancelEvent(this);
smilBeginEventSender().cancelEvent(this);
smilRepeatEventSender().cancelEvent(this);
smilRepeatNEventSender().cancelEvent(this);
-#if !ENABLE(OILPAN)
clearConditions();
unscheduleIfScheduled();
« no previous file with comments | « third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698