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

webkit/pending/NodeIterator.cpp

Index: webkit/pending/NodeIterator.cpp
===================================================================
--- webkit/pending/NodeIterator.cpp	(revision 2614)
+++ webkit/pending/NodeIterator.cpp	(working copy)
@@ -25,13 +25,11 @@
 #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()
@@ -86,8 +84,7 @@
     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;
@@ -116,7 +113,7 @@
     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;
@@ -144,7 +141,6 @@
     m_candidateNode.clear();
     return result.release();
 }
-#endif
 
 void NodeIterator::detach()
 {
@@ -228,5 +224,14 @@
     }
 }
 
+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