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

webkit/port/bindings/v8/v8_nodefilter.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
 
 #include "v8_nodefilter.h"
 #include "v8_proxy.h"
+#include "ExceptionContext.h"
 #include "NodeFilter.h"
 #include "Node.h"
 
 namespace WebCore {
 
 V8NodeFilterCondition::V8NodeFilterCondition(v8::Handle<v8::Value> filter) {
   m_filter = v8::Persistent<v8::Value>::New(filter);
 #ifndef NDEBUG
   V8Proxy::RegisterGlobalHandle(NODE_FILTER, this, m_filter);
 #endif
 }
 
 V8NodeFilterCondition::~V8NodeFilterCondition() {
 #ifndef NDEBUG
   V8Proxy::UnregisterGlobalHandle(this, m_filter);
 #endif
   m_filter.Dispose();
   m_filter.Clear();
 }
 
-short V8NodeFilterCondition::acceptNode(Node* node) const {
+short V8NodeFilterCondition::acceptNode(ExceptionContext* exception_context,
+                                        Node* node) const {
   ASSERT(v8::Context::InContext());
 
   if (!m_filter->IsFunction()) return NodeFilter::FILTER_ACCEPT;
 
-  v8::TryCatch exception_catcher;
+  ExceptionCatcher exception_catcher(exception_context);
 
   v8::Handle<v8::Object> this_obj = v8::Context::GetCurrent()->Global();
-  v8::Handle<v8::Function> callback = v8::Handle<v8::Function>::Cast(m_filter);
+  v8::Handle<v8::Function> callback =
+      v8::Handle<v8::Function>::Cast(m_filter);
   v8::Handle<v8::Value>* args = new v8::Handle<v8::Value>[1];
   args[0] = V8Proxy::ToV8Object(V8ClassIndex::NODE, node);
 
   V8Proxy* proxy = V8Proxy::retrieve();
   ASSERT(proxy);
 
   v8::Handle<v8::Value> result =
       proxy->CallFunction(callback, this_obj, 1, args);
   delete[] args;
 
-  // TODO(fqian): this code can be removed when issue 1042294 is fixed.
-  // See also 1068243.
-  if (exception_catcher.HasCaught()) {
+  if (exception_context->hadException()) {
     return NodeFilter::FILTER_REJECT;
   }
 
   ASSERT(!result.IsEmpty());
 
   return result->Int32Value();
 }
 
 }  // namespace WebCore