Enable Oilpan for core/xml/

Source/core/xml/XPathStep.h

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc.
  *
  * 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.
@@ skipping 22 matching lines @@
 namespace blink {
 
 class Node;
 
 namespace XPath {
 
 class Predicate;
 
 class Step final : public ParseNode {
     WTF_MAKE_NONCOPYABLE(Step);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     enum Axis {
         AncestorAxis, AncestorOrSelfAxis, AttributeAxis,
         ChildAxis, DescendantAxis, DescendantOrSelfAxis,
         FollowingAxis, FollowingSiblingAxis, NamespaceAxis,
         ParentAxis, PrecedingAxis, PrecedingSiblingAxis,
         SelfAxis
     };
 
-    class NodeTest : public NoBaseWillBeGarbageCollectedFinalized<NodeTest> {
-        WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
+    class NodeTest : public GarbageCollectedFinalized<NodeTest> {
     public:
         enum Kind {
             TextNodeTest, CommentNodeTest, ProcessingInstructionNodeTest, AnyNodeTest, NameTest
         };
 
         NodeTest(Kind kind) : m_kind(kind) { }
         NodeTest(Kind kind, const String& data) : m_kind(kind), m_data(data) { }
         NodeTest(Kind kind, const AtomicString& data, const AtomicString& namespaceURI) : m_kind(kind), m_data(data), m_namespaceURI(namespaceURI) { }
 
         NodeTest(const NodeTest& o)
             : m_kind(o.m_kind)
             , m_data(o.m_data)
             , m_namespaceURI(o.m_namespaceURI)
         {
             ASSERT(o.m_mergedPredicates.isEmpty());
         }
         NodeTest& operator=(const NodeTest& o)
         {
             m_kind = o.m_kind;
             m_data = o.m_data;
             m_namespaceURI = o.m_namespaceURI;
             ASSERT(o.m_mergedPredicates.isEmpty());
             return *this;
         }
         void trace(Visitor* visitor) { visitor->trace(m_mergedPredicates); }
 
         Kind kind() const { return m_kind; }
         const AtomicString& data() const { return m_data; }
         const AtomicString& namespaceURI() const { return m_namespaceURI; }
-        WillBeHeapVector<OwnPtrWillBeMember<Predicate> >& mergedPredicates() { return m_mergedPredicates; }
-        const WillBeHeapVector<OwnPtrWillBeMember<Predicate> >& mergedPredicates() const { return m_mergedPredicates; }
+        HeapVector<Member<Predicate> >& mergedPredicates() { return m_mergedPredicates; }
+        const HeapVector<Member<Predicate> >& mergedPredicates() const { return m_mergedPredicates; }
 
     private:
         Kind m_kind;
         AtomicString m_data;
         AtomicString m_namespaceURI;
 
         // When possible, we merge some or all predicates with node test for better performance.
-        WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_mergedPredicates;
+        HeapVector<Member<Predicate> > m_mergedPredicates;
     };
 
     Step(Axis, const NodeTest&);
-    Step(Axis, const NodeTest&, WillBeHeapVector<OwnPtrWillBeMember<Predicate> >&);
+    Step(Axis, const NodeTest&, HeapVector<Member<Predicate> >&);
     virtual ~Step();
     virtual void trace(Visitor*) override;
 
     void optimize();
 
     void evaluate(EvaluationContext&, Node* context, NodeSet&) const;
 
     Axis axis() const { return m_axis; }
     const NodeTest& nodeTest() const { return *m_nodeTest; }
 
 private:
-    friend void optimizeStepPair(Step*, Step*, bool&);
+    friend bool optimizeStepPair(Step*, Step*);
     bool predicatesAreContextListInsensitive() const;
     NodeTest& nodeTest() { return *m_nodeTest; }
 
     void parseNodeTest(const String&);
     void nodesInAxis(EvaluationContext&, Node* context, NodeSet&) const;
     String namespaceFromNodetest(const String& nodeTest) const;
 
     Axis m_axis;
-    OwnPtrWillBeMember<NodeTest> m_nodeTest;
-    WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_predicates;
+    Member<NodeTest> m_nodeTest;
+    HeapVector<Member<Predicate> > m_predicates;
 };
 
-void optimizeStepPair(Step*, Step*, bool& dropSecondStep);
+bool optimizeStepPair(Step*, Step*);
 
 } // namespace XPath
 
 } // namespace blink
 
 #endif // XPathStep_h