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

webkit/pending/NodeIterator.h

Index: webkit/pending/NodeIterator.h
===================================================================
--- webkit/pending/NodeIterator.h	(revision 2614)
+++ webkit/pending/NodeIterator.h	(working copy)
@@ -25,9 +25,6 @@
 #ifndef NodeIterator_h
 #define NodeIterator_h
 
-#if USE(JSC)
-#include "JSDOMBinding.h"
-#endif
 #include "NodeFilter.h"
 #include "Traversal.h"
 #include <wtf/PassRefPtr.h>
@@ -35,6 +32,8 @@
 
 namespace WebCore {
 
+    class ExceptionContext;
+
     typedef int ExceptionCode;
 
     class NodeIterator : public RefCounted<NodeIterator>, public Traversal {
@@ -45,10 +44,8 @@
         }
         ~NodeIterator();
 
-#if USE(JSC)
-        PassRefPtr<Node> nextNode(KJS::ExecState*, ExceptionCode&);
-        PassRefPtr<Node> previousNode(KJS::ExecState*, ExceptionCode&);
-#endif
+        PassRefPtr<Node> nextNode(ExceptionContext*, ExceptionCode&);
+        PassRefPtr<Node> previousNode(ExceptionContext*, ExceptionCode&);
         void detach();
 
         Node* referenceNode() const { return m_referenceNode.node.get(); }
@@ -57,11 +54,9 @@
         // This function is called before any node is removed from the document tree.
         void nodeWillBeRemoved(Node*);
 
-#if USE(JSC)
         // For non-JS bindings. Silently ignores the JavaScript exception if any.
-        PassRefPtr<Node> nextNode(ExceptionCode& ec) { return nextNode(execStateFromNode(referenceNode()), ec); }
-        PassRefPtr<Node> previousNode(ExceptionCode& ec) { return previousNode(execStateFromNode(referenceNode()), ec); }
-#endif
+        PassRefPtr<Node> nextNode(ExceptionCode& ec);
+        PassRefPtr<Node> previousNode(ExceptionCode& ec);
 
     private:
         NodeIterator(PassRefPtr<Node>, unsigned whatToShow, PassRefPtr<NodeFilter>, bool expandEntityReferences);