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

webkit/pending/TreeWalker.h

 /*
  * 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.
  *
  */
 
 #ifndef TreeWalker_h
 #define TreeWalker_h
 
-#if USE(JSC)
-#include "JSDOMBinding.h"
-#endif
+#include "ExceptionContext.h"
 #include "NodeFilter.h"
 #include "Traversal.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
 
     typedef int ExceptionCode;
 
     class TreeWalker : public RefCounted<TreeWalker>, public Traversal {
     public:
         static PassRefPtr<TreeWalker> create(PassRefPtr<Node> rootNode, unsigned whatToShow, PassRefPtr<NodeFilter> filter, bool expandEntityReferences)
         {
             return adoptRef(new TreeWalker(rootNode, whatToShow, filter, expandEntityReferences));
         }                            
 
         Node* currentNode() const { return m_current.get(); }
         void setCurrentNode(PassRefPtr<Node>, ExceptionCode&);
 
-#if USE(JSC)
-        Node* parentNode(KJS::ExecState*);
-        Node* firstChild(KJS::ExecState*);
-        Node* lastChild(KJS::ExecState*);
-        Node* previousSibling(KJS::ExecState*);
-        Node* nextSibling(KJS::ExecState*);
-        Node* previousNode(KJS::ExecState*);
-        Node* nextNode(KJS::ExecState*);
+        Node* parentNode(ExceptionContext*);
+        Node* firstChild(ExceptionContext*);
+        Node* lastChild(ExceptionContext*);
+        Node* previousSibling(ExceptionContext*);
+        Node* nextSibling(ExceptionContext*);
+        Node* previousNode(ExceptionContext*);
+        Node* nextNode(ExceptionContext*);
 
         // For non-JS bindings. Silently ignores the JavaScript exception if any.
-        Node* parentNode() { return parentNode(execStateFromNode(m_current.get())); }
-        Node* firstChild() { return firstChild(execStateFromNode(m_current.get())); }
-        Node* lastChild() { return lastChild(execStateFromNode(m_current.get())); }
-        Node* previousSibling() { return previousSibling(execStateFromNode(m_current.get())); }
-        Node* nextSibling() { return nextSibling(execStateFromNode(m_current.get())); }
-        Node* previousNode() { return previousNode(execStateFromNode(m_current.get())); }
-        Node* nextNode() { return nextNode(execStateFromNode(m_current.get())); }
-#endif
+        Node* parentNode() { return parentNode(ExceptionContext::createFromNode(m_current.get())); }
+        Node* firstChild() { return firstChild(ExceptionContext::createFromNode(m_current.get())); }
+        Node* lastChild() { return lastChild(ExceptionContext::createFromNode(m_current.get())); }
+        Node* previousSibling() { return previousSibling(ExceptionContext::createFromNode(m_current.get())); }
+        Node* nextSibling() { return nextSibling(ExceptionContext::createFromNode(m_current.get())); }
+        Node* previousNode() { return previousNode(ExceptionContext::createFromNode(m_current.get())); }
+        Node* nextNode() { return nextNode(ExceptionContext::createFromNode(m_current.get())); }
 
     private:
         TreeWalker(PassRefPtr<Node>, unsigned whatToShow, PassRefPtr<NodeFilter>, bool expandEntityReferences);
         
         Node* setCurrent(PassRefPtr<Node>);
 
         RefPtr<Node> m_current;
     };
 
 } // namespace WebCore
 
 #endif // TreeWalker_h