Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

 /*
  * Copyright (C) 2008 Apple 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 30 matching lines @@
 #include "platform/heap/Handle.h"
 #include "wtf/MathExtras.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
 #include <algorithm>
 
 namespace blink {
 
 class RepeatEvent final : public Event {
 public:
-    static PassRefPtrWillBeRawPtr<RepeatEvent> create(const AtomicString& type, int repeat)
+    static RawPtr<RepeatEvent> create(const AtomicString& type, int repeat)
     {
-        return adoptRefWillBeNoop(new RepeatEvent(type, false, false, repeat));
+        return new RepeatEvent(type, false, false, repeat);
     }
 
     ~RepeatEvent() override {}
 
     int repeat() const { return m_repeat; }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         Event::trace(visitor);
     }
@@ skipping 10 matching lines @@
 };
 
 inline RepeatEvent* toRepeatEvent(Event* event)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!event || event->type() == "repeatn");
     return static_cast<RepeatEvent*>(event);
 }
 
 static SMILEventSender& smilEndEventSender()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::endEvent)));
+    DEFINE_STATIC_LOCAL(Persistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::endEvent)));
     return *sender;
 }
 
 static SMILEventSender& smilBeginEventSender()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::beginEvent)));
+    DEFINE_STATIC_LOCAL(Persistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::beginEvent)));
     return *sender;
 }
 
 static SMILEventSender& smilRepeatEventSender()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::repeatEvent)));
+    DEFINE_STATIC_LOCAL(Persistent<SMILEventSender>, sender, (SMILEventSender::create(EventTypeNames::repeatEvent)));
     return *sender;
 }
 
 static SMILEventSender& smilRepeatNEventSender()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SMILEventSender>, sender, (SMILEventSender::create(AtomicString("repeatn", AtomicString::ConstructFromLiteral))));
+    DEFINE_STATIC_LOCAL(Persistent<SMILEventSender>, sender, (SMILEventSender::create(AtomicString("repeatn", AtomicString::ConstructFromLiteral))));
     return *sender;
 }
 
 // This is used for duration type time values that can't be negative.
 static const double invalidCachedTime = -1.;
 
 class ConditionEventListener final : public EventListener {
 public:
-    static PassRefPtrWillBeRawPtr<ConditionEventListener> create(SVGSMILElement* animation, SVGSMILElement::Condition* condition)
+    static RawPtr<ConditionEventListener> create(SVGSMILElement* animation, SVGSMILElement::Condition* condition)
     {
-        return adoptRefWillBeNoop(new ConditionEventListener(animation, condition));
+        return new ConditionEventListener(animation, condition);
     }
 
     static const ConditionEventListener* cast(const EventListener* listener)
     {
         return listener->type() == ConditionEventListenerType
             ? static_cast<const ConditionEventListener*>(listener)
             : nullptr;
     }
 
     bool operator==(const EventListener& other) const override;
@@ skipping 13 matching lines @@
 private:
     ConditionEventListener(SVGSMILElement* animation, SVGSMILElement::Condition* condition)
         : EventListener(ConditionEventListenerType)
         , m_animation(animation)
         , m_condition(condition)
     {
     }
 
     void handleEvent(ExecutionContext*, Event*) override;
 
-    RawPtrWillBeMember<SVGSMILElement> m_animation;
-    RawPtrWillBeMember<SVGSMILElement::Condition> m_condition;
+    Member<SVGSMILElement> m_animation;
+    Member<SVGSMILElement::Condition> m_condition;
 };
 
 bool ConditionEventListener::operator==(const EventListener& listener) const
 {
     if (const ConditionEventListener* conditionEventListener = ConditionEventListener::cast(&listener))
         return m_animation == conditionEventListener->m_animation && m_condition == conditionEventListener->m_condition;
     return false;
 }
 
 void ConditionEventListener::handleEvent(ExecutionContext*, Event* event)
 {
     if (!m_animation)
         return;
     m_animation->handleConditionEvent(event, m_condition);
 }
 
-void SVGSMILElement::Condition::setEventListener(PassRefPtrWillBeRawPtr<ConditionEventListener> eventListener)
+void SVGSMILElement::Condition::setEventListener(RawPtr<ConditionEventListener> eventListener)
 {
     m_eventListener = eventListener;
 }
 
 SVGSMILElement::Condition::Condition(Type type, BeginOrEnd beginOrEnd, const String& baseID, const String& name, SMILTime offset, int repeat)
     : m_type(type)
     , m_beginOrEnd(beginOrEnd)
     , m_baseID(baseID)
     , m_name(name)
     , m_offset(offset)
@@ skipping 1050 matching lines @@
     m_nextProgressTime = calculateNextProgressTime(elapsed);
     return animationIsContributing;
 }
 
 void SVGSMILElement::notifyDependentsIntervalChanged()
 {
     ASSERT(m_interval.begin.isFinite());
     // |loopBreaker| is used to avoid infinite recursions which may be caused from:
     // |notifyDependentsIntervalChanged| -> |createInstanceTimesFromSyncbase| -> |add{Begin,End}Time| -> |{begin,end}TimeChanged| -> |notifyDependentsIntervalChanged|
     // |loopBreaker| is defined as a Persistent<HeapHashSet<Member<SVGSMILElement>>>. This won't cause leaks because it is guaranteed to be empty after the root |notifyDependentsIntervalChanged| has exited.
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashSet<RawPtrWillBeMember<SVGSMILElement>>>, loopBreaker, (adoptPtrWillBeNoop(new WillBeHeapHashSet<RawPtrWillBeMember<SVGSMILElement>>())));
+    DEFINE_STATIC_LOCAL(Persistent<HeapHashSet<Member<SVGSMILElement>>>, loopBreaker, (new HeapHashSet<Member<SVGSMILElement>>()));
     if (!loopBreaker->add(this).isNewEntry)
         return;
 
     for (SVGSMILElement* element : m_syncBaseDependents)
         element->createInstanceTimesFromSyncbase(this);
 
     loopBreaker->remove(this);
 }
 
 void SVGSMILElement::createInstanceTimesFromSyncbase(SVGSMILElement* syncBase)
@@ skipping 121 matching lines @@
     visitor->trace(m_targetElement);
     visitor->trace(m_timeContainer);
     visitor->trace(m_conditions);
     visitor->trace(m_syncBaseDependents);
 #endif
     SVGElement::trace(visitor);
     SVGTests::trace(visitor);
 }
 
 } // namespace blink