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

webkit/pending/Node.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Trolltech ASA
  *
  * 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
@@ skipping 21 matching lines @@
 #include "CSSStyleSelector.h"
 #include "CSSStyleSheet.h"
 #include "CString.h"
 #include "ChildNodeList.h"
 #include "ClassNodeList.h"
 #include "DOMImplementation.h"
 #include "Document.h"
 #include "DynamicNodeList.h"
 #include "Element.h"
 #include "ExceptionCode.h"
+#include "ExceptionContext.h"
 #include "Frame.h"
 #include "HTMLNames.h"
 #include "Logging.h"
 #include "NSResolver.h"
 #include "NameNodeList.h"
 #include "NamedAttrMap.h"
 #include "ProcessingInstruction.h"
 #include "RenderObject.h"
 #include "ScriptController.h"
 #include "SelectorNodeList.h"
 #include "StringBuilder.h"
 #include "TagNodeList.h"
 #include "Text.h"
 #include "XMLNames.h"
 #include "htmlediting.h"
 #include <wtf/RefCountedLeakCounter.h>
 
 #if USE(JSC)
-#include "JSDOMBinding.h"
-#include <kjs/ExecState.h>
 #include <kjs/JSLock.h>
 #endif
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 struct NodeListsNodeData {
     typedef HashSet<DynamicNodeList*> NodeListSet;
     NodeListSet m_listsWithCaches;
@@ skipping 1192 matching lines @@
     bool operator()(CSSSelector* selector)
     {
         if (selector->hasTag() && selector->m_tag.prefix() != nullAtom && selector->m_tag.prefix() != starAtom)
             return true;
         if (selector->hasAttribute() && selector->m_attr.prefix() != nullAtom && selector->m_attr.prefix() != starAtom)
             return true;
         return false;
     }
 };
 
-#if USE(JSC)
 class ResolveNamespaceFunctor {
 public:
-    ResolveNamespaceFunctor(NSResolver* resolver, ExceptionCode& ec, KJS::ExecState* exec)
+    ResolveNamespaceFunctor(NSResolver* resolver, ExceptionCode& ec, ExceptionContext* exec)
         : m_resolver(resolver)
         , m_exceptionCode(ec)
         , m_exec(exec)
     {
     }
 
     bool operator()(CSSSelector* selector)
     {
         if (selector->hasTag() && selector->m_tag.prefix() != nullAtom && selector->m_tag.prefix() != starAtom) {
             String resolvedNamespaceURI = m_resolver->lookupNamespaceURI(m_exec, selector->m_tag.prefix());
@@ skipping 17 matching lines @@
             QualifiedName newQualifiedName(selector->m_attr.prefix(), selector->m_attr.localName(), resolvedNamespaceURI);
             selector->m_attr = newQualifiedName;
         }
 
         return false;
     }
 
 private:
     NSResolver* m_resolver;
     ExceptionCode& m_exceptionCode;
-    KJS::ExecState* m_exec;
+    ExceptionContext* m_exec;
 };
 
 static bool selectorNeedsNamespaceResolution(CSSSelector* currentSelector)
 {
     SelectorNeedsNamespaceResolutionFunctor functor;
     return forEachSelector(functor, currentSelector);
 }
 
-static bool resolveNamespacesForSelector(CSSSelector* currentSelector, NSResolver* resolver, ExceptionCode& ec, KJS::ExecState* exec)
+static bool resolveNamespacesForSelector(CSSSelector* currentSelector, NSResolver* resolver, ExceptionCode& ec, ExceptionContext* exec)
 {
     ResolveNamespaceFunctor functor(resolver, ec, exec);
     return forEachSelector(functor, currentSelector);
 }
 
 PassRefPtr<Element> Node::querySelector(const String& selectors, ExceptionCode& ec)
 {
-    return querySelector(selectors, 0, ec, execStateFromNode(this));
+    return querySelector(selectors, 0, ec, ExceptionContext::createFromNode(this));
 }
 
 PassRefPtr<NodeList> Node::querySelectorAll(const String& selectors, ExceptionCode& ec)
 {
-    return querySelectorAll(selectors, 0, ec, execStateFromNode(this));
+    return querySelectorAll(selectors, 0, ec, ExceptionContext::createFromNode(this));
 }
 
-PassRefPtr<Element> Node::querySelector(const String& selectors, NSResolver* resolver, ExceptionCode& ec, KJS::ExecState* exec)
+PassRefPtr<Element> Node::querySelector(const String& selectors, NSResolver* resolver, ExceptionCode& ec, ExceptionContext* exec)
 {
     if (selectors.isEmpty()) {
         ec = SYNTAX_ERR;
         return 0;
     }
     bool strictParsing = !document()->inCompatMode();
     CSSParser p(strictParsing);
     if (resolver) {
         String defaultNamespace = resolver->lookupNamespaceURI(exec, String());
         if (exec && exec->hadException())
@@ skipping 39 matching lines @@
             for (CSSSelector* selector = querySelector.get(); selector; selector = selector->next()) {
                 if (selectorChecker.checkSelector(selector, element))
                     return element;
             }
         }
     }
     
     return 0;
 }
 
-PassRefPtr<NodeList> Node::querySelectorAll(const String& selectors, NSResolver* resolver, ExceptionCode& ec, KJS::ExecState* exec)
+PassRefPtr<NodeList> Node::querySelectorAll(const String& selectors, NSResolver* resolver, ExceptionCode& ec, ExceptionContext* exec)
 {
     if (selectors.isEmpty()) {
         ec = SYNTAX_ERR;
         return 0;
     }
     bool strictParsing = !document()->inCompatMode();
     CSSParser p(strictParsing);
     if (resolver) {
         String defaultNamespace = resolver->lookupNamespaceURI(exec, String());
         if (exec && exec->hadException())
@@ skipping 16 matching lines @@
         // No NSResolver was passed, so throw a NAMESPACE_ERR if the selector includes any 
         // namespace prefixes.
         if (selectorNeedsNamespaceResolution(querySelector.get())) {
             ec = NAMESPACE_ERR;
             return 0;
         }
     }
 
     return createSelectorNodeList(this, querySelector.get());
 }
-#endif // USE(JSC)
 
 Document *Node::ownerDocument() const
 {
     Document *doc = document();
     return doc == this ? 0 : doc;
 }
 
 bool Node::hasAttributes() const
 {
     return false;
@@ skipping 556 matching lines @@
 
 #ifndef NDEBUG
 
 void showTree(const WebCore::Node* node)
 {
     if (node)
         node->showTreeForThis();
 }
 
 #endif