Issue #188:

- Add a CefV8Context object and CefV8Value::ExecuteFunctionWithContext method to support asynchronous V8 ExecuteFunction callbacks.
- Add a CefFrame::GetBrowser() method.
- Ensure that V8 types are only referenced on the UI thread.
- Accept a empty |object| parameter to CefV8Value::ExecuteFunction.

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

libcef_dll/cpptoc/frame_cpptoc.cc

@@ -10,6 +10,7 @@
 // for more information.
 //
 
+#include "libcef_dll/cpptoc/browser_cpptoc.h"
 #include "libcef_dll/cpptoc/frame_cpptoc.h"
 #include "libcef_dll/cpptoc/request_cpptoc.h"
 #include "libcef_dll/cpptoc/stream_reader_cpptoc.h"
@@ -211,6 +212,19 @@ cef_string_userfree_t CEF_CALLBACK frame_get_url(struct _cef_frame_t* self)
   return urlStr.DetachToUserFree();
 }
 
+cef_browser_t* CEF_CALLBACK frame_get_browser(struct _cef_frame_t* self)
+{
+  DCHECK(self);
+  if(!self)
+    return NULL;
+
+  CefRefPtr<CefBrowser> browserPtr = 
+      CefFrameCppToC::Get(self)->GetBrowser();
+  if(browserPtr.get())
+    return CefBrowserCppToC::Wrap(browserPtr);
+  return NULL;
+}
+
 
 // CONSTRUCTOR - Do not edit by hand.
 
@@ -237,6 +251,7 @@ CefFrameCppToC::CefFrameCppToC(CefFrame* cls)
   struct_.struct_.is_focused = frame_is_focused;
   struct_.struct_.get_name = frame_get_name;
   struct_.struct_.get_url = frame_get_url;
+  struct_.struct_.get_browser = frame_get_browser;
 }
 
 #ifdef _DEBUG

libcef_dll/cpptoc/v8context_cpptoc.cc

@@ -0,0 +1,97 @@
+// Copyright (c) 2010 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/browser_cpptoc.h"
+#include "libcef_dll/cpptoc/frame_cpptoc.h"
+#include "libcef_dll/cpptoc/v8context_cpptoc.h"
+#include "libcef_dll/cpptoc/v8value_cpptoc.h"
+
+
+// GLOBAL FUNCTIONS - Body may be edited by hand.
+
+CEF_EXPORT cef_v8context_t* cef_v8context_get_current_context()
+{
+  CefRefPtr<CefV8Context> 
+      contextPtr( CefV8Context::GetCurrentContext() );
+  if(contextPtr.get())
+    return CefV8ContextCppToC::Wrap(contextPtr);
+  return NULL;
+}
+
+CEF_EXPORT cef_v8context_t* cef_v8context_get_entered_context()
+{
+  CefRefPtr<CefV8Context> 
+      contextPtr( CefV8Context::GetEnteredContext() );
+  if(contextPtr.get())
+    return CefV8ContextCppToC::Wrap(contextPtr);
+  return NULL;
+}
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+cef_browser_t* CEF_CALLBACK v8context_get_browser(struct _cef_v8context_t* self)
+{
+  DCHECK(self);
+  if(!self)
+    return NULL;
+
+  CefRefPtr<CefV8Context> contextPtr = CefV8ContextCppToC::Get(self);
+  CefRefPtr<CefBrowser> browserPtr = contextPtr->GetBrowser();
+  if(browserPtr.get())
+    return CefBrowserCppToC::Wrap(browserPtr);
+  return NULL;
+}
+
+cef_frame_t* CEF_CALLBACK v8context_get_frame(struct _cef_v8context_t* self)
+{
+  DCHECK(self);
+  if(!self)
+    return NULL;
+
+  CefRefPtr<CefV8Context> contextPtr = CefV8ContextCppToC::Get(self);
+  CefRefPtr<CefFrame> framePtr = contextPtr->GetFrame();
+  if(framePtr.get())
+    return CefFrameCppToC::Wrap(framePtr);
+  return NULL;
+}
+
+struct _cef_v8value_t* CEF_CALLBACK v8context_get_global(
+    struct _cef_v8context_t* self)
+{
+  DCHECK(self);
+  if(!self)
+    return NULL;
+
+  CefRefPtr<CefV8Context> contextPtr = CefV8ContextCppToC::Get(self);
+  CefRefPtr<CefV8Value> globalPtr = contextPtr->GetGlobal();
+  if(globalPtr.get())
+    return CefV8ValueCppToC::Wrap(globalPtr);
+  return NULL;
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefV8ContextCppToC::CefV8ContextCppToC(CefV8Context* cls)
+    : CefCppToC<CefV8ContextCppToC, CefV8Context, cef_v8context_t>(cls)
+{
+  struct_.struct_.get_browser = v8context_get_browser;
+  struct_.struct_.get_frame = v8context_get_frame;
+  struct_.struct_.get_global = v8context_get_global;
+}
+
+#ifdef _DEBUG
+template<> long CefCppToC<CefV8ContextCppToC, CefV8Context,
+    cef_v8context_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/v8context_cpptoc.h

@@ -0,0 +1,34 @@
+// Copyright (c) 2010 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 _V8CONTEXT_CPPTOC_H
+#define _V8CONTEXT_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 CefV8ContextCppToC
+    : public CefCppToC<CefV8ContextCppToC, CefV8Context, cef_v8context_t>
+{
+public:
+  CefV8ContextCppToC(CefV8Context* cls);
+  virtual ~CefV8ContextCppToC() {}
+};
+
+#endif // BUILDING_CEF_SHARED
+#endif // _V8CONTEXT_CPPTOC_H
+

libcef_dll/cpptoc/v8value_cpptoc.cc

@@ -10,6 +10,7 @@
 // for more information.
 //
 
+#include "libcef_dll/cpptoc/v8context_cpptoc.h"
 #include "libcef_dll/cpptoc/v8value_cpptoc.h"
 #include "libcef_dll/ctocpp/base_ctocpp.h"
 #include "libcef_dll/ctocpp/v8handler_ctocpp.h"
@@ -374,11 +375,12 @@ int CEF_CALLBACK v8value_execute_function(struct _cef_v8value_t* self,
     cef_string_t* exception)
 {
   DCHECK(self);
-  DCHECK(object);
-  if(!self || !object)
+  if(!self)
     return 0;
 
-  CefRefPtr<CefV8Value> objectPtr = CefV8ValueCppToC::Unwrap(object);
+  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]));
@@ -394,6 +396,37 @@ int CEF_CALLBACK v8value_execute_function(struct _cef_v8value_t* self,
   return rv;
 }
 
+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)
+{
+  DCHECK(self);
+  if(!self)
+    return 0;
+
+  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++) {
+    argsList.push_back(CefV8ValueCppToC::Unwrap(arguments[i]));
+  }
+  CefRefPtr<CefV8Value> retvalPtr;
+
+  CefString exceptionStr(exception);
+  bool rv = CefV8ValueCppToC::Get(self)->ExecuteFunctionWithContext(
+    contextPtr, objectPtr, argsList, retvalPtr, exceptionStr);
+  if(retvalPtr.get() && retval)
+    *retval = CefV8ValueCppToC::Wrap(retvalPtr);
+
+  return rv;
+}
+
 
 // CONSTRUCTOR - Do not edit by hand.
 
@@ -427,6 +460,8 @@ CefV8ValueCppToC::CefV8ValueCppToC(CefV8Value* cls)
   struct_.struct_.get_function_name = v8value_get_function_name;
   struct_.struct_.get_function_handler = v8value_get_function_handler;
   struct_.struct_.execute_function = v8value_execute_function;
+  struct_.struct_.execute_function_with_context =
+      v8value_execute_function_with_context;
 }
 
 #ifdef _DEBUG