Introduce CefV8Exception for returning detailed exception information from CefV8Value::ExecuteFunction*() and add the ability to re-throw exceptions. (issue #317).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@371 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef_dll/cpptoc/v8exception_cpptoc.cc

@@ -0,0 +1,117 @@
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// A portion of this file was generated by the CEF translator tool.  When
+// making changes by hand only do so within the body of existing function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/v8exception_cpptoc.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+cef_string_userfree_t CEF_CALLBACK v8exception_get_message(
+    struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  CefString str = CefV8ExceptionCppToC::Get(self)->GetMessage();
+  return str.DetachToUserFree();
+}
+
+cef_string_userfree_t CEF_CALLBACK v8exception_get_source_line(
+    struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  CefString str = CefV8ExceptionCppToC::Get(self)->GetSourceLine();
+  return str.DetachToUserFree();
+}
+
+cef_string_userfree_t CEF_CALLBACK v8exception_get_script_resource_name(
+    struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  CefString str = CefV8ExceptionCppToC::Get(self)->GetScriptResourceName();
+  return str.DetachToUserFree();
+}
+
+int CEF_CALLBACK v8exception_get_line_number(struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  return CefV8ExceptionCppToC::Get(self)->GetLineNumber();
+}
+
+int CEF_CALLBACK v8exception_get_start_position(struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  return CefV8ExceptionCppToC::Get(self)->GetStartPosition();
+}
+
+int CEF_CALLBACK v8exception_get_end_position(struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  return CefV8ExceptionCppToC::Get(self)->GetEndPosition();
+}
+
+int CEF_CALLBACK v8exception_get_start_column(struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  return CefV8ExceptionCppToC::Get(self)->GetStartColumn();
+}
+
+int CEF_CALLBACK v8exception_get_end_column(struct _cef_v8exception_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  return CefV8ExceptionCppToC::Get(self)->GetEndColumn();
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefV8ExceptionCppToC::CefV8ExceptionCppToC(CefV8Exception* cls)
+    : CefCppToC<CefV8ExceptionCppToC, CefV8Exception, cef_v8exception_t>(cls)
+{
+  struct_.struct_.get_message = v8exception_get_message;
+  struct_.struct_.get_source_line = v8exception_get_source_line;
+  struct_.struct_.get_script_resource_name =
+      v8exception_get_script_resource_name;
+  struct_.struct_.get_line_number = v8exception_get_line_number;
+  struct_.struct_.get_start_position = v8exception_get_start_position;
+  struct_.struct_.get_end_position = v8exception_get_end_position;
+  struct_.struct_.get_start_column = v8exception_get_start_column;
+  struct_.struct_.get_end_column = v8exception_get_end_column;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefV8ExceptionCppToC, CefV8Exception,
+    cef_v8exception_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/v8exception_cpptoc.h

@@ -0,0 +1,34 @@
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+#ifndef _V8EXCEPTION_CPPTOC_H
+#define _V8EXCEPTION_CPPTOC_H
+
+#ifndef BUILDING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
+#else // BUILDING_CEF_SHARED
+
+#include "include/cef.h"
+#include "include/cef_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed DLL-side only.
+class CefV8ExceptionCppToC
+    : public CefCppToC<CefV8ExceptionCppToC, CefV8Exception, cef_v8exception_t>
+{
+public:
+  CefV8ExceptionCppToC(CefV8Exception* cls);
+  virtual ~CefV8ExceptionCppToC() {}
+};
+
+#endif // BUILDING_CEF_SHARED
+#endif // _V8EXCEPTION_CPPTOC_H
+

libcef_dll/cpptoc/v8value_cpptoc.cc

@@ -11,6 +11,7 @@
 //
 
 #include "libcef_dll/cpptoc/v8context_cpptoc.h"
+#include "libcef_dll/cpptoc/v8exception_cpptoc.h"
 #include "libcef_dll/cpptoc/v8value_cpptoc.h"
 #include "libcef_dll/ctocpp/base_ctocpp.h"
 #include "libcef_dll/ctocpp/v8accessor_ctocpp.h"
@@ -445,7 +446,7 @@ cef_v8handler_t* CEF_CALLBACK v8value_get_function_handler(
 int CEF_CALLBACK v8value_execute_function(struct _cef_v8value_t* self,
     struct _cef_v8value_t* object, size_t argumentCount,
     struct _cef_v8value_t* const* arguments, struct _cef_v8value_t** retval,
-    cef_string_t* exception)
+    cef_v8exception_t** exception, int rethrow_exception)
 {
   DCHECK(self);
   if(!self)
@@ -454,17 +455,21 @@ int CEF_CALLBACK v8value_execute_function(struct _cef_v8value_t* self,
   CefRefPtr<CefV8Value> objectPtr;
   if(object)
     objectPtr = CefV8ValueCppToC::Unwrap(object);
-  CefV8ValueList argsList;
-  for(size_t i = 0; i < argumentCount; i++) {
-    argsList.push_back(CefV8ValueCppToC::Unwrap(arguments[i]));
-  }
-  CefRefPtr<CefV8Value> retvalPtr;
 
-  CefString exceptionStr(exception);
+  CefV8ValueList argsList;
+  for(size_t i = 0; i < argumentCount; i++)
+    argsList.push_back(CefV8ValueCppToC::Unwrap(arguments[i]));
+
+  CefRefPtr<CefV8Value> retvalPtr;
+  CefRefPtr<CefV8Exception> exceptionPtr;
+
   bool rv = CefV8ValueCppToC::Get(self)->ExecuteFunction(objectPtr,
-      argsList, retvalPtr, exceptionStr);
-  if(retvalPtr.get() && retval)
+      argsList, retvalPtr, exceptionPtr, rethrow_exception?true:false);
+
+  if( retvalPtr.get() && retval)
     *retval = CefV8ValueCppToC::Wrap(retvalPtr);
+  if (exceptionPtr.get() && exception)
+    *exception = CefV8ExceptionCppToC::Wrap(exceptionPtr);
 
   return rv;
 }
@@ -473,7 +478,7 @@ int CEF_CALLBACK v8value_execute_function_with_context(
     struct _cef_v8value_t* self, cef_v8context_t* context,
     struct _cef_v8value_t* object, size_t argumentCount,
     struct _cef_v8value_t* const* arguments, struct _cef_v8value_t** retval,
-    cef_string_t* exception)
+    cef_v8exception_t** exception, int rethrow_exception)
 {
   DCHECK(self);
   if(!self)
@@ -482,20 +487,26 @@ int CEF_CALLBACK v8value_execute_function_with_context(
   CefRefPtr<CefV8Context> contextPtr;
   if(context)
     contextPtr = CefV8ContextCppToC::Unwrap(context);
+  
   CefRefPtr<CefV8Value> objectPtr;
   if(object)
     objectPtr = CefV8ValueCppToC::Unwrap(object);
+  
   CefV8ValueList argsList;
-  for(size_t i = 0; i < argumentCount; i++) {
+  for(size_t i = 0; i < argumentCount; i++)
     argsList.push_back(CefV8ValueCppToC::Unwrap(arguments[i]));
-  }
-  CefRefPtr<CefV8Value> retvalPtr;
 
-  CefString exceptionStr(exception);
+  CefRefPtr<CefV8Value> retvalPtr;
+  CefRefPtr<CefV8Exception> exceptionPtr;
+
   bool rv = CefV8ValueCppToC::Get(self)->ExecuteFunctionWithContext(
-    contextPtr, objectPtr, argsList, retvalPtr, exceptionStr);
-  if(retvalPtr.get() && retval)
+      contextPtr, objectPtr, argsList, retvalPtr, exceptionPtr,
+      rethrow_exception?true:false);
+
+  if (retvalPtr.get() && retval)
     *retval = CefV8ValueCppToC::Wrap(retvalPtr);
+  if (exceptionPtr.get() && exception)
+    *exception = CefV8ExceptionCppToC::Wrap(exceptionPtr);
 
   return rv;
 }