Enable Oilpan for core/xml/

Source/core/xml/XPathParser.cpp

 /*
  * Copyright 2005 Maksim Orlovich <maksim@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * 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
@@ skipping 447 matching lines @@
         if (namespaceURI.isNull())
             return false;
         localName = AtomicString(qName.substring(colon + 1));
     } else {
         localName = AtomicString(qName);
     }
 
     return true;
 }
 
-PassOwnPtrWillBeRawPtr<Expression> Parser::parseStatement(const String& statement, PassRefPtrWillBeRawPtr<XPathNSResolver> resolver, ExceptionState& exceptionState)
+Expression* Parser::parseStatement(const String& statement, XPathNSResolver* resolver, ExceptionState& exceptionState)
 {
     reset(statement);
 
     m_resolver = resolver;
 
     Parser* oldParser = currentParser;
     currentParser = this;
     int parseError = xpathyyparse(this);
     currentParser = oldParser;
 
     if (parseError) {
-#if !ENABLE(OILPAN)
-        while (!m_parseNodes.isEmpty())
-            delete m_parseNodes.takeAny();
-
-        HashSet<Vector<OwnPtr<Predicate> >*>::iterator pend = m_predicateVectors.end();
-        for (HashSet<Vector<OwnPtr<Predicate> >*>::iterator it = m_predicateVectors.begin(); it != pend; ++it)
-            delete *it;
-        m_predicateVectors.clear();
-
-        HashSet<Vector<OwnPtr<Expression> >*>::iterator eend = m_expressionVectors.end();
-        for (HashSet<Vector<OwnPtr<Expression> >*>::iterator it = m_expressionVectors.begin(); it != eend; ++it)
-            delete *it;
-        m_expressionVectors.clear();
-
-        m_nodeTests.clear();
-#endif
-
         m_strings.clear();
 
         m_topExpr = nullptr;
 
         if (m_gotNamespaceError)
             exceptionState.throwDOMException(NamespaceError, "The string '" + statement + "' contains unresolvable namespaces.");
         else
             exceptionState.throwDOMException(SyntaxError, "The string '" + statement + "' is not a valid XPath expression.");
         return nullptr;
     }
     ASSERT(m_strings.size() == 0);
-#if !ENABLE(OILPAN)
-    ASSERT(m_parseNodes.size() == 1);
-    ASSERT(*m_parseNodes.begin() == m_topExpr);
-    ASSERT(m_expressionVectors.size() == 0);
-    ASSERT(m_predicateVectors.size() == 0);
-    ASSERT(m_nodeTests.size() == 0);
-    m_parseNodes.clear();
-#endif
-
     Expression* result = m_topExpr;
     m_topExpr = nullptr;
 
-    return adoptPtrWillBeNoop(result);
-}
-
-void Parser::registerParseNode(ParseNode* node)
-{
-#if !ENABLE(OILPAN)
-    if (node == 0)
-        return;
-
-    ASSERT(!m_parseNodes.contains(node));
-
-    m_parseNodes.add(node);
-#endif
-}
-
-void Parser::unregisterParseNode(ParseNode* node)
-{
-#if !ENABLE(OILPAN)
-    if (node == 0)
-        return;
-
-    ASSERT(m_parseNodes.contains(node));
-
-    m_parseNodes.remove(node);
-#endif
-}
-
-void Parser::registerPredicateVector(WillBeHeapVector<OwnPtrWillBeMember<Predicate> >* vector)
-{
-#if !ENABLE(OILPAN)
-    if (vector == 0)
-        return;
-
-    ASSERT(!m_predicateVectors.contains(vector));
-
-    m_predicateVectors.add(vector);
-#endif
-}
-
-void Parser::deletePredicateVector(WillBeHeapVector<OwnPtrWillBeMember<Predicate> >* vector)
-{
-#if !ENABLE(OILPAN)
-    if (vector == 0)
-        return;
-
-    ASSERT(m_predicateVectors.contains(vector));
-
-    m_predicateVectors.remove(vector);
-    delete vector;
-#endif
-}
-
-
-void Parser::registerExpressionVector(WillBeHeapVector<OwnPtrWillBeMember<Expression> >* vector)
-{
-#if !ENABLE(OILPAN)
-    if (vector == 0)
-        return;
-
-    ASSERT(!m_expressionVectors.contains(vector));
-
-    m_expressionVectors.add(vector);
-#endif
-}
-
-void Parser::deleteExpressionVector(WillBeHeapVector<OwnPtrWillBeMember<Expression> >* vector)
-{
-#if !ENABLE(OILPAN)
-    if (vector == 0)
-        return;
-
-    ASSERT(m_expressionVectors.contains(vector));
-
-    m_expressionVectors.remove(vector);
-    delete vector;
-#endif
+    return result;
 }
 
 void Parser::registerString(String* s)
 {
     if (s == 0)
         return;
 
     ASSERT(!m_strings.contains(s));
 
     m_strings.add(adoptPtr(s));
 }
 
 void Parser::deleteString(String* s)
 {
     if (s == 0)
         return;
 
     ASSERT(m_strings.contains(s));
 
     m_strings.remove(s);
 }
-
-void Parser::registerNodeTest(Step::NodeTest* t)
-{
-#if !ENABLE(OILPAN)
-    if (t == 0)
-        return;
-
-    ASSERT(!m_nodeTests.contains(t));
-
-    m_nodeTests.add(adoptPtr(t));
-#endif
-}
-
-void Parser::deleteNodeTest(Step::NodeTest* t)
-{
-#if !ENABLE(OILPAN)
-    if (t == 0)
-        return;
-
-    ASSERT(m_nodeTests.contains(t));
-
-    m_nodeTests.remove(t);
-#endif
-}
-