Remove OILPAN from core/dom/shadow/

third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp

Index: third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
diff --git a/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp b/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
index 5326524cad5e5720bdc2a9102f96e4db7e4484b9..aa11696e48e513f271c11440900cbd4e7b20a427 100644
--- a/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
+++ b/third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp
@@ -142,9 +142,6 @@ ElementShadow::ElementShadow()
 
 ElementShadow::~ElementShadow()
 {
-#if !ENABLE(OILPAN)
-    removeDetachedShadowRoots();
-#endif
 }
 
 ShadowRoot& ElementShadow::addShadowRoot(Element& shadowHost, ShadowRootType type)
@@ -183,25 +180,6 @@ ShadowRoot& ElementShadow::addShadowRoot(Element& shadowHost, ShadowRootType typ
     return *shadowRoot;
 }
 
-#if !ENABLE(OILPAN)
-void ElementShadow::removeDetachedShadowRoots()
-{
-    // Dont protect this ref count.
-    Element* shadowHost = host();
-    DCHECK(shadowHost);
-
-    while (ShadowRoot* oldRoot = m_shadowRoots.head()) {
-        InspectorInstrumentation::willPopShadowRoot(shadowHost, oldRoot);
-        shadowHost->document().removeFocusedElementOfSubtree(oldRoot);
-        m_shadowRoots.removeHead();
-        oldRoot->setParentOrShadowHostNode(0);
-        oldRoot->setParentTreeScope(shadowHost->document());
-        oldRoot->setPrev(0);
-        oldRoot->setNext(0);
-    }
-}
-#endif
-
 void ElementShadow::attach(const Node::AttachContext& context)
 {
     Node::AttachContext childrenContext(context);
@@ -263,11 +241,7 @@ const InsertionPoint* ElementShadow::finalDestinationInsertionPointFor(const Nod
     DCHECK(!key->needsDistributionRecalc());
 #endif
     NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoints.find(key);
-#if ENABLE(OILPAN)
-    return it == m_nodeToInsertionPoints.end() ? nullptr : it->value->last().get();
-#else
-    return it == m_nodeToInsertionPoints.end() ? nullptr : it->value.last().get();
-#endif
+    return it == m_nodeToInsertionPoints.end() ? nullptr : it->value->last();
 }
 
 const DestinationInsertionPoints* ElementShadow::destinationInsertionPointsFor(const Node* key) const
@@ -277,11 +251,7 @@ const DestinationInsertionPoints* ElementShadow::destinationInsertionPointsFor(c
     DCHECK(!key->needsDistributionRecalc());
 #endif
     NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoints.find(key);
-#if ENABLE(OILPAN)
-    return it == m_nodeToInsertionPoints.end() ? nullptr : it->value.get();
-#else
-    return it == m_nodeToInsertionPoints.end() ? nullptr : &it->value;
-#endif
+    return it == m_nodeToInsertionPoints.end() ? nullptr : it->value;
 }
 
 void ElementShadow::distribute()
@@ -301,7 +271,7 @@ void ElementShadow::distributeV0()
         HTMLShadowElement* shadowInsertionPoint = 0;
         const HeapVector<Member<InsertionPoint>>& insertionPoints = root->descendantInsertionPoints();
         for (size_t i = 0; i < insertionPoints.size(); ++i) {
-            InsertionPoint* point = insertionPoints[i].get();
+            InsertionPoint* point = insertionPoints[i];
             if (!point->isActive())
                 continue;
             if (isHTMLShadowElement(*point)) {
@@ -337,15 +307,10 @@ void ElementShadow::distributeV0()
 
 void ElementShadow::didDistributeNode(const Node* node, InsertionPoint* insertionPoint)
 {
-#if ENABLE(OILPAN)
     NodeToDestinationInsertionPoints::AddResult result = m_nodeToInsertionPoints.add(node, nullptr);
     if (result.isNewEntry)
-        result.storedValue->value = new DestinationInsertionPoints();
+        result.storedValue->value = new DestinationInsertionPoints;
     result.storedValue->value->append(insertionPoint);
-#else
-    NodeToDestinationInsertionPoints::AddResult result = m_nodeToInsertionPoints.add(node, DestinationInsertionPoints());
-    result.storedValue->value.append(insertionPoint);
-#endif
 }
 
 const SelectRuleFeatureSet& ElementShadow::ensureSelectFeatureSet()