Oilpan: Remove most WillBe types from the code base

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

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 20 matching lines @@
 #include "core/layout/LayoutPart.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/plugins/PluginView.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 namespace blink {
 
-typedef WillBeHeapHashMap<RefPtrWillBeMember<Widget>, RawPtrWillBeMember<FrameView>> WidgetToParentMap;
+typedef HeapHashMap<Member<Widget>, Member<FrameView>> WidgetToParentMap;
 static WidgetToParentMap& widgetNewParentMap()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WidgetToParentMap>, map, (adoptPtrWillBeNoop(new WidgetToParentMap())));
+    DEFINE_STATIC_LOCAL(Persistent<WidgetToParentMap>, map, (new WidgetToParentMap()));
     return *map;
 }
 
-typedef WillBeHeapHashSet<RefPtrWillBeMember<Widget>> WidgetSet;
+typedef HeapHashSet<Member<Widget>> WidgetSet;
 static WidgetSet& widgetsPendingTemporaryRemovalFromParent()
 {
     // Widgets in this set will not leak because it will be cleared in
     // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperations.
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WidgetSet>, set, (adoptPtrWillBeNoop(new WidgetSet())));
+    DEFINE_STATIC_LOCAL(Persistent<WidgetSet>, set, (new WidgetSet()));
     return *set;
 }
 
-WillBeHeapHashCountedSet<RawPtrWillBeMember<Node>>& SubframeLoadingDisabler::disabledSubtreeRoots()
+HeapHashCountedSet<Member<Node>>& SubframeLoadingDisabler::disabledSubtreeRoots()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashCountedSet<RawPtrWillBeMember<Node>>>, nodes, (adoptPtrWillBeNoop(new WillBeHeapHashCountedSet<RawPtrWillBeMember<Node>>())));
+    DEFINE_STATIC_LOCAL(Persistent<HeapHashCountedSet<Member<Node>>>, nodes, (new HeapHashCountedSet<Member<Node>>()));
     return *nodes;
 }
 
 static unsigned s_updateSuspendCount = 0;
 
 HTMLFrameOwnerElement::UpdateSuspendScope::UpdateSuspendScope()
 {
     ++s_updateSuspendCount;
 }
 
@@ skipping 101 matching lines @@
     for (ContainerNode* node = this; node; node = node->parentOrShadowHostNode())
         node->decrementConnectedSubframeCount();
 }
 
 void HTMLFrameOwnerElement::disconnectContentFrame()
 {
     // FIXME: Currently we don't do this in removedFrom because this causes an
     // unload event in the subframe which could execute script that could then
     // reach up into this document and then attempt to look back down. We should
     // see if this behavior is really needed as Gecko does not allow this.
-    if (RefPtrWillBeRawPtr<Frame> frame = contentFrame()) {
+    if (RawPtr<Frame> frame = contentFrame()) {
         frame->detach(FrameDetachType::Remove);
     }
 }
 
 HTMLFrameOwnerElement::~HTMLFrameOwnerElement()
 {
     // An owner must by now have been informed of detachment
     // when the frame was closed.
     ASSERT(!m_contentFrame);
 }
@@ skipping 28 matching lines @@
 }
 
 Document* HTMLFrameOwnerElement::getSVGDocument(ExceptionState& exceptionState) const
 {
     Document* doc = contentDocument();
     if (doc && doc->isSVGDocument())
         return doc;
     return nullptr;
 }
 
-void HTMLFrameOwnerElement::setWidget(PassRefPtrWillBeRawPtr<Widget> widget)
+void HTMLFrameOwnerElement::setWidget(RawPtr<Widget> widget)
 {
     if (widget == m_widget)
         return;
 
     if (m_widget) {
         if (m_widget->parent())
             moveWidgetToParentSoon(m_widget.get(), 0);
         m_widget = nullptr;
     }
 
     m_widget = widget;
 
     LayoutPart* layoutPart = toLayoutPart(layoutObject());
     LayoutPartItem layoutPartItem = LayoutPartItem(layoutPart);
     if (layoutPartItem.isNull())
         return;
 
     if (m_widget) {
         layoutPartItem.updateOnWidgetChange();
 
         ASSERT(document().view() == layoutPartItem.frameView());
         ASSERT(layoutPartItem.frameView());
         moveWidgetToParentSoon(m_widget.get(), layoutPartItem.frameView());
     }
 
     if (AXObjectCache* cache = document().existingAXObjectCache())
         cache->childrenChanged(layoutPart);
 }
 
-PassRefPtrWillBeRawPtr<Widget> HTMLFrameOwnerElement::releaseWidget()
+RawPtr<Widget> HTMLFrameOwnerElement::releaseWidget()
 {
     if (!m_widget)
         return nullptr;
     if (m_widget->parent())
         temporarilyRemoveWidgetFromParentSoon(m_widget.get());
     LayoutPart* layoutPart = toLayoutPart(layoutObject());
     if (layoutPart) {
         if (AXObjectCache* cache = document().existingAXObjectCache())
             cache->childrenChanged(layoutPart);
     }
     return m_widget.release();
 }
 
 Widget* HTMLFrameOwnerElement::ownedWidget() const
 {
     return m_widget.get();
 }
 
 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const AtomicString& frameName, bool replaceCurrentItem)
 {
-    RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame();
+    RawPtr<LocalFrame> parentFrame = document().frame();
     if (contentFrame()) {
         contentFrame()->navigate(document(), url, replaceCurrentItem, UserGestureStatus::None);
         return true;
     }
 
     if (!document().getSecurityOrigin()->canDisplay(url)) {
         FrameLoader::reportLocalLoadFailed(parentFrame.get(), url.getString());
         return false;
     }
 
@@ skipping 15 matching lines @@
 DEFINE_TRACE(HTMLFrameOwnerElement)
 {
     visitor->trace(m_contentFrame);
     visitor->trace(m_widget);
     HTMLElement::trace(visitor);
     FrameOwner::trace(visitor);
 }
 
 
 } // namespace blink