Implement better JS exception handling by abstracting KJS::ExecState into an ...

webkit/pending/NodeIterator.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
  * Copyright (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2008 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "NodeIterator.h"
 
-#include <kjs/ExecState.h>
 #include "Document.h"
 #include "ExceptionCode.h"
+#include "ExceptionContext.h"
 #include "NodeFilter.h"
 
-using namespace KJS;
-
 namespace WebCore {
 
 NodeIterator::NodePointer::NodePointer()
 {
 }
 
 NodeIterator::NodePointer::NodePointer(PassRefPtr<Node> n, bool b)
     : node(n)
     , isPointerBeforeNode(b)
 {
@@ skipping 34 matching lines @@
     , m_detached(false)
 {
     root()->document()->attachNodeIterator(this);
 }
 
 NodeIterator::~NodeIterator()
 {
     root()->document()->detachNodeIterator(this);
 }
 
-#if USE(JSC)
-PassRefPtr<Node> NodeIterator::nextNode(ExecState* exec, ExceptionCode& ec)
+PassRefPtr<Node> NodeIterator::nextNode(ExceptionContext* exec, ExceptionCode& ec)
 {
     if (m_detached) {
         ec = INVALID_STATE_ERR;
         return 0;
     }
 
     RefPtr<Node> result;
 
     m_candidateNode = m_referenceNode;
     while (m_candidateNode.moveToNext(root())) {
         // NodeIterators treat the DOM tree as a flat list of nodes.
         // In other words, FILTER_REJECT does not pass over descendants
         // of the rejected node. Hence, FILTER_REJECT is the same as FILTER_SKIP.
         RefPtr<Node> provisionalResult = m_candidateNode.node;
         bool nodeWasAccepted = acceptNode(exec, provisionalResult.get()) == NodeFilter::FILTER_ACCEPT;
         if (exec && exec->hadException())
             break;
         if (nodeWasAccepted) {
             m_referenceNode = m_candidateNode;
             result = provisionalResult.release();
             break;
         }
     }
 
     m_candidateNode.clear();
     return result.release();
 }
 
-PassRefPtr<Node> NodeIterator::previousNode(ExecState* exec, ExceptionCode& ec)
+PassRefPtr<Node> NodeIterator::previousNode(ExceptionContext* exec, ExceptionCode& ec)
 {
     if (m_detached) {
         ec = INVALID_STATE_ERR;
         return 0;
     }
 
     RefPtr<Node> result;
 
     m_candidateNode = m_referenceNode;
     while (m_candidateNode.moveToPrevious(root())) {
         // NodeIterators treat the DOM tree as a flat list of nodes.
         // In other words, FILTER_REJECT does not pass over descendants
         // of the rejected node. Hence, FILTER_REJECT is the same as FILTER_SKIP.
         RefPtr<Node> provisionalResult = m_candidateNode.node;
         bool nodeWasAccepted = acceptNode(exec, provisionalResult.get()) == NodeFilter::FILTER_ACCEPT;
         if (exec && exec->hadException())
             break;
         if (nodeWasAccepted) {
             m_referenceNode = m_candidateNode;
             result = provisionalResult.release();
             break;
         }
     }
 
     m_candidateNode.clear();
     return result.release();
 }
-#endif
 
 void NodeIterator::detach()
 {
     root()->document()->detachNodeIterator(this);
     m_detached = true;
     m_referenceNode.node.clear();
 }
 
 void NodeIterator::nodeWillBeRemoved(Node* removedNode)
 {
@@ skipping 63 matching lines @@
             if (willRemoveReferenceNodeAncestor) {
                 while (node && node->isDescendantOf(removedNode))
                     node = node->traversePreviousNode(root());
             }
             if (node)
                 referenceNode.node = node;
         }
     }
 }
 
+PassRefPtr<Node> NodeIterator::nextNode(ExceptionCode& ec)
+{
+    return nextNode(ExceptionContext::createFromNode(referenceNode()), ec);
+}
+
+PassRefPtr<Node> NodeIterator::previousNode(ExceptionCode& ec)
+{
+    return previousNode(ExceptionContext::createFromNode(referenceNode()), ec);
+}
 
 } // namespace WebCore