Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/custom/CustomElementScheduler.cpp

 /*
  * Copyright (C) 2013 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 28 matching lines @@
 #include "core/dom/custom/CustomElementMicrotaskResolutionStep.h"
 #include "core/dom/custom/CustomElementMicrotaskRunQueue.h"
 #include "core/dom/custom/CustomElementProcessingStack.h"
 #include "core/dom/custom/CustomElementRegistrationContext.h"
 #include "core/dom/custom/CustomElementSyncMicrotaskQueue.h"
 #include "core/html/imports/HTMLImportChild.h"
 #include "core/html/imports/HTMLImportsController.h"
 
 namespace blink {
 
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CustomElementScheduler)
-
 // FIXME: Consider moving the element's callback queue to ElementRareData.
-typedef WillBeHeapHashMap<RawPtrWillBeMember<Element>, OwnPtrWillBeMember<CustomElementCallbackQueue>> ElementCallbackQueueMap;
+typedef HeapHashMap<Member<Element>, Member<CustomElementCallbackQueue>> ElementCallbackQueueMap;
 
 static ElementCallbackQueueMap& callbackQueues()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ElementCallbackQueueMap>, map, (adoptPtrWillBeNoop(new ElementCallbackQueueMap())));
+    DEFINE_STATIC_LOCAL(Persistent<ElementCallbackQueueMap>, map, (new ElementCallbackQueueMap()));
     return *map;
 }
 
-static CustomElementCallbackQueue& ensureCallbackQueue(PassRefPtrWillBeRawPtr<Element> element)
+static CustomElementCallbackQueue& ensureCallbackQueue(RawPtr<Element> element)
 {
     ElementCallbackQueueMap::ValueType* it = callbackQueues().add(element.get(), nullptr).storedValue;
     if (!it->value)
         it->value = CustomElementCallbackQueue::create(element);
     return *it->value.get();
 }
 
 // Finds or creates the callback queue for element.
-static CustomElementCallbackQueue& scheduleCallbackQueue(PassRefPtrWillBeRawPtr<Element> passElement)
+static CustomElementCallbackQueue& scheduleCallbackQueue(RawPtr<Element> passElement)
 {
-    RefPtrWillBeRawPtr<Element> element(passElement);
+    RawPtr<Element> element(passElement);
 
     CustomElementCallbackQueue& callbackQueue = ensureCallbackQueue(element);
     if (callbackQueue.inCreatedCallback()) {
         // Don't move it. Authors use the createdCallback like a
         // constructor. By not moving it, the createdCallback
         // completes before any other callbacks are entered for this
         // element.
         return callbackQueue;
     }
 
     if (CustomElementProcessingStack::inCallbackDeliveryScope()) {
         // The processing stack is active.
         CustomElementProcessingStack::instance().enqueue(&callbackQueue);
         return callbackQueue;
     }
 
     CustomElementMicrotaskDispatcher::instance().enqueue(&callbackQueue);
     return callbackQueue;
 }
 
-void CustomElementScheduler::scheduleCallback(PassRefPtrWillBeRawPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtrWillBeRawPtr<Element> element, CustomElementLifecycleCallbacks::CallbackType type)
+void CustomElementScheduler::scheduleCallback(RawPtr<CustomElementLifecycleCallbacks> callbacks, RawPtr<Element> element, CustomElementLifecycleCallbacks::CallbackType type)
 {
     ASSERT(type != CustomElementLifecycleCallbacks::AttributeChangedCallback);
 
     if (!callbacks->hasCallback(type))
         return;
 
     CustomElementCallbackQueue& queue = scheduleCallbackQueue(element);
     queue.append(CustomElementCallbackInvocation::createInvocation(callbacks, type));
 }
 
-void CustomElementScheduler::scheduleAttributeChangedCallback(PassRefPtrWillBeRawPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtrWillBeRawPtr<Element> element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
+void CustomElementScheduler::scheduleAttributeChangedCallback(RawPtr<CustomElementLifecycleCallbacks> callbacks, RawPtr<Element> element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     if (!callbacks->hasCallback(CustomElementLifecycleCallbacks::AttributeChangedCallback))
         return;
 
     CustomElementCallbackQueue& queue = scheduleCallbackQueue(element);
     queue.append(CustomElementCallbackInvocation::createAttributeChangedInvocation(callbacks, name, oldValue, newValue));
 }
 
-void CustomElementScheduler::resolveOrScheduleResolution(PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> context, PassRefPtrWillBeRawPtr<Element> element, const CustomElementDescriptor& descriptor)
+void CustomElementScheduler::resolveOrScheduleResolution(RawPtr<CustomElementRegistrationContext> context, RawPtr<Element> element, const CustomElementDescriptor& descriptor)
 {
     if (CustomElementProcessingStack::inCallbackDeliveryScope()) {
         context->resolve(element.get(), descriptor);
         return;
     }
 
     Document& document = element->document();
-    OwnPtrWillBeRawPtr<CustomElementMicrotaskResolutionStep> step = CustomElementMicrotaskResolutionStep::create(context, element, descriptor);
+    RawPtr<CustomElementMicrotaskResolutionStep> step = CustomElementMicrotaskResolutionStep::create(context, element, descriptor);
     enqueueMicrotaskStep(document, step.release());
 }
 
 CustomElementMicrotaskImportStep* CustomElementScheduler::scheduleImport(HTMLImportChild* import)
 {
     ASSERT(!import->hasFinishedLoading());
     ASSERT(import->parent());
 
     // Ownership of the new step is transferred to the parent
     // processing step, or the base queue.
-    OwnPtrWillBeRawPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create(import);
+    RawPtr<CustomElementMicrotaskImportStep> step = CustomElementMicrotaskImportStep::create(import);
     CustomElementMicrotaskImportStep* rawStep = step.get();
     enqueueMicrotaskStep(*(import->parent()->document()), step.release(), import->isSync());
     return rawStep;
 }
 
-void CustomElementScheduler::enqueueMicrotaskStep(Document& document, PassOwnPtrWillBeRawPtr<CustomElementMicrotaskStep> step, bool importIsSync)
+void CustomElementScheduler::enqueueMicrotaskStep(Document& document, RawPtr<CustomElementMicrotaskStep> step, bool importIsSync)
 {
     Document& master = document.importsController() ? *(document.importsController()->master()) : document;
     master.customElementMicrotaskRunQueue()->enqueue(document.importLoader(), step, importIsSync);
 }
 
 
 void CustomElementScheduler::callbackDispatcherDidFinish()
 {
     if (CustomElementMicrotaskDispatcher::instance().elementQueueIsEmpty())
         callbackQueues().clear();
 }
 
 void CustomElementScheduler::microtaskDispatcherDidFinish()
 {
     ASSERT(!CustomElementProcessingStack::inCallbackDeliveryScope());
     callbackQueues().clear();
 }
 
 } // namespace blink