Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 88 matching lines @@
 #ifndef LOG_CACHED_TIME_WARNINGS
 // Default to not logging warnings about excessive drift in the cached media time because it adds a
 // fair amount of overhead and logging.
 #define LOG_CACHED_TIME_WARNINGS 0
 #endif
 
 namespace blink {
 
 using namespace HTMLNames;
 
-using WeakMediaElementSet = WillBeHeapHashSet<RawPtrWillBeWeakMember<HTMLMediaElement>>;
-using DocumentElementSetMap = WillBeHeapHashMap<RawPtrWillBeWeakMember<Document>, WeakMediaElementSet>;
+using WeakMediaElementSet = HeapHashSet<WeakMember<HTMLMediaElement>>;
+using DocumentElementSetMap = HeapHashMap<WeakMember<Document>, WeakMediaElementSet>;
 
 namespace {
 
 // URL protocol used to signal that the media source API is being used.
 const char mediaSourceBlobProtocol[] = "blob";
 
 enum MediaControlsShow {
     MediaControlsShowAttribute = 0,
     MediaControlsShowFullscreen,
     MediaControlsShowNoScript,
@@ skipping 12 matching lines @@
 }
 
 const char* boolString(bool val)
 {
     return val ? "true" : "false";
 }
 #endif
 
 DocumentElementSetMap& documentToElementSetMap()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<DocumentElementSetMap>, map, (adoptPtrWillBeNoop(new DocumentElementSetMap())));
+    DEFINE_STATIC_LOCAL(Persistent<DocumentElementSetMap>, map, (new DocumentElementSetMap()));
     return *map;
 }
 
 void addElementToDocumentMap(HTMLMediaElement* element, Document* document)
 {
     DocumentElementSetMap& map = documentToElementSetMap();
     WeakMediaElementSet set = map.take(document);
     set.add(element);
     map.add(document, set);
 }
@@ skipping 114 matching lines @@
     ASSERT_NOT_REACHED();
     return String();
 }
 
 } // anonymous namespace
 
 class HTMLMediaElement::AutoplayHelperClientImpl :
     public AutoplayExperimentHelper::Client {
 
 public:
-    static PassOwnPtrWillBeRawPtr<AutoplayHelperClientImpl> create(HTMLMediaElement* element)
+    static RawPtr<AutoplayHelperClientImpl> create(HTMLMediaElement* element)
     {
-        return adoptPtrWillBeNoop(new AutoplayHelperClientImpl(element));
+        return new AutoplayHelperClientImpl(element);
     }
 
     virtual ~AutoplayHelperClientImpl();
 
     using RecordMetricsBehavior = HTMLMediaElement::RecordMetricsBehavior;
 
     double currentTime() const override { return m_element->currentTime(); }
     double duration() const override { return m_element->duration(); }
     bool ended() const override { return m_element->ended(); }
     bool muted() const override { return m_element->muted(); }
@@ skipping 20 matching lines @@
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_element);
         Client::trace(visitor);
     }
 
 private:
     AutoplayHelperClientImpl(HTMLMediaElement* element) : m_element(element) {}
 
-    RawPtrWillBeMember<HTMLMediaElement> m_element;
+    Member<HTMLMediaElement> m_element;
 };
 
 
 void HTMLMediaElement::recordAutoplayMetric(AutoplayMetrics metric)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, autoplayHistogram, ("Blink.MediaElement.Autoplay", NumberOfAutoplayMetrics));
     autoplayHistogram.count(metric);
 }
 
 WebMimeRegistry::SupportsType HTMLMediaElement::supportsType(const ContentType& contentType)
@@ skipping 343 matching lines @@
     // Schedule the timer to try the next <source> element WITHOUT resetting state ala invokeLoadAlgorithm.
     m_pendingActionFlags |= LoadMediaResource;
     m_loadTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
 void HTMLMediaElement::scheduleEvent(const AtomicString& eventName)
 {
     scheduleEvent(Event::createCancelable(eventName));
 }
 
-void HTMLMediaElement::scheduleEvent(PassRefPtrWillBeRawPtr<Event> event)
+void HTMLMediaElement::scheduleEvent(RawPtr<Event> event)
 {
 #if LOG_MEDIA_EVENTS
     WTF_LOG(Media, "HTMLMediaElement::scheduleEvent(%p) - scheduling '%s'", this, event->type().ascii().data());
 #endif
     m_asyncEventQueue->enqueueEvent(event);
 }
 
 void HTMLMediaElement::loadTimerFired(Timer<HTMLMediaElement>*)
 {
     if (m_pendingActionFlags & LoadTextTrackResource)
@@ skipping 1913 matching lines @@
     AutomaticTrackSelection trackSelection(configuration);
     trackSelection.perform(*m_textTracks);
 
     textTracksChanged();
 }
 
 bool HTMLMediaElement::havePotentialSourceChild()
 {
     // Stash the current <source> node and next nodes so we can restore them after checking
     // to see there is another potential.
-    RefPtrWillBeRawPtr<HTMLSourceElement> currentSourceNode = m_currentSourceNode;
-    RefPtrWillBeRawPtr<Node> nextNode = m_nextChildNodeToConsider;
+    RawPtr<HTMLSourceElement> currentSourceNode = m_currentSourceNode;
+    RawPtr<Node> nextNode = m_nextChildNodeToConsider;
 
     KURL nextURL = selectNextSourceChild(0, DoNothing);
 
     m_currentSourceNode = currentSourceNode;
     m_nextChildNodeToConsider = nextNode;
 
     return nextURL.isValid();
 }
 
 KURL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, InvalidURLAction actionIfInvalid)
@@ skipping 658 matching lines @@
 
 TextTrackContainer& HTMLMediaElement::ensureTextTrackContainer()
 {
     ShadowRoot& shadowRoot = ensureUserAgentShadowRoot();
     assertShadowRootChildren(shadowRoot);
 
     Node* firstChild = shadowRoot.firstChild();
     if (firstChild && firstChild->isTextTrackContainer())
         return toTextTrackContainer(*firstChild);
 
-    RefPtrWillBeRawPtr<TextTrackContainer> textTrackContainer = TextTrackContainer::create(document());
+    RawPtr<TextTrackContainer> textTrackContainer = TextTrackContainer::create(document());
 
     // The text track container should be inserted before the media controls,
     // so that they are rendered behind them.
     shadowRoot.insertBefore(textTrackContainer, firstChild);
 
     assertShadowRootChildren(shadowRoot);
 
     return *textTrackContainer;
 }
 
@@ skipping 121 matching lines @@
     }
 
     return nullptr;
 }
 
 void HTMLMediaElement::ensureMediaControls()
 {
     if (mediaControls())
         return;
 
-    RefPtrWillBeRawPtr<MediaControls> mediaControls = MediaControls::create(*this);
+    RawPtr<MediaControls> mediaControls = MediaControls::create(*this);
 
     mediaControls->reset();
     if (isFullscreen())
         mediaControls->enteredFullscreen();
 
     ShadowRoot& shadowRoot = ensureUserAgentShadowRoot();
     assertShadowRootChildren(shadowRoot);
 
     // The media controls should be inserted after the text track container,
     // so that they are rendered in front of captions and subtitles.
@@ skipping 18 matching lines @@
 
     if (shouldShowControls(RecordMetricsBehavior::DoRecord))
         mediaControls()->show();
     else
         mediaControls()->hide();
 }
 
 CueTimeline& HTMLMediaElement::cueTimeline()
 {
     if (!m_cueTimeline)
-        m_cueTimeline = adoptPtrWillBeNoop(new CueTimeline(*this));
+        m_cueTimeline = new CueTimeline(*this);
     return *m_cueTimeline;
 }
 
 void HTMLMediaElement::configureTextTrackDisplay()
 {
     ASSERT(m_textTracks);
     WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p)", this);
 
     if (m_processingPreferenceChange)
         return;
@@ skipping 365 matching lines @@
 
 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() const
 {
     IntRect result;
     if (LayoutObject* object = m_element->layoutObject())
         result = object->absoluteBoundingBoxRect();
     return result;
 }
 
 } // namespace blink