- Auto-generate all C/C++ translation code (issue #33).

- Change index parameter types from int to size_t to make 0-based range implicit.
- Make CefPrintOptions and CefMenuInfo proper wrapper classes.
- Normalize the naming of menu-related types.
- Remove unused command_line variable from test_suite.cc.

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

cef.gyp

@@ -492,6 +492,7 @@
         'libcef_dll/ctocpp/write_handler_ctocpp.cc',
         'libcef_dll/ctocpp/write_handler_ctocpp.h',
         'libcef_dll/libcef_dll.cc',
+        'libcef_dll/libcef_dll2.cc',
         'libcef_dll/resource.h',
         'libcef_dll/transfer_util.cpp',
         'libcef_dll/transfer_util.h',

cef_paths.gypi

@@ -235,6 +235,7 @@
       'libcef_dll/wrapper/cef_xml_object.cc',
       'libcef_dll/wrapper/cef_zip_archive.cc',
       'libcef_dll/wrapper/libcef_dll_wrapper.cc',
+      'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
     ],
   },
 }

include/cef.h

@@ -90,7 +90,7 @@ class CefWebURLRequestClient;
 // empty. A return value of true indicates that it succeeded and false indicates
 // that it failed.
 ///
-/*--cef()--*/
+/*--cef(revision_check,optional_param=application)--*/
 bool CefInitialize(const CefSettings& settings, CefRefPtr<CefApp> application);
 
 ///
@@ -181,7 +181,7 @@ void CefRunMessageLoop();
 //   example.test.increment();
 // </pre>
 ///
-/*--cef()--*/
+/*--cef(optional_param=handler)--*/
 bool CefRegisterExtension(const CefString& extension_name,
                           const CefString& javascript_code,
                           CefRefPtr<CefV8Handler> handler);
@@ -249,7 +249,7 @@ bool CefRegisterCustomScheme(const CefString& scheme_name,
 // that matches the specified |scheme_name| and optional |domain_name|.
 // Returns false if an error occurs. This function may be called on any thread.
 ///
-/*--cef()--*/
+/*--cef(optional_param=domain_name,optional_param=factory)--*/
 bool CefRegisterSchemeHandlerFactory(const CefString& scheme_name,
                                     const CefString& domain_name,
                                     CefRefPtr<CefSchemeHandlerFactory> factory);
@@ -400,7 +400,7 @@ bool CefSetCookie(const CefString& url, const CefCookie& cookie);
 // invalid URL is specified or if cookies cannot be accessed. This method must
 // be called on the IO thread.
 ///
-/*--cef()--*/
+/*--cef(optional_param=url,optional_param=cookie_name)--*/
 bool CefDeleteCookies(const CefString& url, const CefString& cookie_name);
 
 ///
@@ -408,7 +408,7 @@ bool CefDeleteCookies(const CefString& url, const CefString& cookie_name);
 // is empty data will be stored in memory only. By default the cookie path is
 // the same as the cache path. Returns false if cookies cannot be accessed.
 ///
-/*--cef()--*/
+/*--cef(optional_param=path)--*/
 bool CefSetCookiePath(const CefString& path);
 
 
@@ -422,7 +422,7 @@ typedef cef_storage_type_t CefStorageType;
 // origin is specified only data currently in memory will be returned. Returns
 // false if the storage cannot be accessed.
 ///
-/*--cef()--*/
+/*--cef(optional_param=origin,optional_param=key)--*/
 bool CefVisitStorage(CefStorageType type, const CefString& origin,
                      const CefString& key,
                      CefRefPtr<CefStorageVisitor> visitor);
@@ -442,7 +442,7 @@ bool CefSetStorage(CefStorageType type, const CefString& origin,
 // will be cleared. Returns false if storage cannot be accessed. This method
 // must be called on the UI thread.
 ///
-/*--cef()--*/
+/*--cef(optional_param=origin,optional_param=key)--*/
 bool CefDeleteStorage(CefStorageType type, const CefString& origin,
                       const CefString& key);
 
@@ -453,7 +453,7 @@ bool CefDeleteStorage(CefStorageType type, const CefString& origin,
 // path is the same as the cache path. Returns false if the storage cannot be
 // accessed.
 ///
-/*--cef()--*/
+/*--cef(optional_param=path)--*/
 bool CefSetStoragePath(CefStorageType type, const CefString& path);
 
 
@@ -635,7 +635,7 @@ public:
   // |windowInfo|. All values will be copied internally and the actual window
   // will be created on the UI thread. This method call will not block.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=url)--*/
   static bool CreateBrowser(CefWindowInfo& windowInfo,
                             CefRefPtr<CefClient> client,
                             const CefString& url,
@@ -645,7 +645,7 @@ public:
   // Create a new browser window using the window parameters specified by
   // |windowInfo|. This method should only be called on the UI thread.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=url)--*/
   static CefRefPtr<CefBrowser> CreateBrowserSync(CefWindowInfo& windowInfo,
                                             CefRefPtr<CefClient> client,
                                             const CefString& url,
@@ -1013,7 +1013,7 @@ public:
   // error.  The |start_line| parameter is the base line number to use for error
   // reporting.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=scriptUrl)--*/
   virtual void ExecuteJavaScript(const CefString& jsCode, 
                                  const CefString& scriptUrl,
                                  int startLine) =0;
@@ -1084,7 +1084,7 @@ public:
 ///
 // Implement this interface to provide handler implementations.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefApp : public virtual CefBase
 {
 public:
@@ -1348,7 +1348,7 @@ public:
   ///
   // Called when the page title changes.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=title)--*/
   virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
                              const CefString& title) {}
 
@@ -1358,7 +1358,7 @@ public:
   // tooltip yourself return true. Otherwise, you can optionally modify |text|
   // and then return false to allow the browser to display the tooltip.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=text)--*/
   virtual bool OnTooltip(CefRefPtr<CefBrowser> browser,
                          CefString& text) { return false; }
 
@@ -1367,7 +1367,7 @@ public:
   // that will be displayed in the status message and |type| indicates the
   // status message type.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=value)--*/
   virtual void OnStatusMessage(CefRefPtr<CefBrowser> browser,
                                const CefString& value,
                                StatusType type) {}
@@ -1376,7 +1376,7 @@ public:
   // Called to display a console message. Return true to stop the message from
   // being output to the console.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=message,optional_param=source)--*/
   virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
                                 const CefString& message,
                                 const CefString& source,
@@ -1421,7 +1421,7 @@ public:
   // keep references to or attempt to access any DOM objects outside the scope
   // of this method.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=frame,optional_param=node)--*/
   virtual void OnFocusedNodeChanged(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
                                     CefRefPtr<CefDOMNode> node) {}
@@ -1470,8 +1470,7 @@ public:
 class CefMenuHandler : public virtual CefBase
 {
 public:
-  typedef cef_handler_menuid_t MenuId;
+  typedef cef_menu_id_t MenuId;
-  typedef cef_handler_menuinfo_t MenuInfo;
 
   ///
   // Called before a context menu is displayed. Return false to display the
@@ -1479,7 +1478,7 @@ public:
   ///
   /*--cef()--*/
   virtual bool OnBeforeMenu(CefRefPtr<CefBrowser> browser,
-                            const MenuInfo& menuInfo) { return false; }
+                            const CefMenuInfo& menuInfo) { return false; }
 
   ///
   // Called to optionally override the default text for a context menu item.
@@ -1509,8 +1508,6 @@ public:
 class CefPrintHandler : public virtual CefBase
 {
 public:
-  typedef cef_print_options_t CefPrintOptions;
-
   ///
   // Called to allow customization of standard print options before the print
   // dialog is displayed. |printOptions| allows specification of paper size,
@@ -1763,7 +1760,7 @@ public:
 ///
 // Implement this interface to provide handler implementations.
 ///
-/*--cef(source=client)--*/
+/*--cef(source=client,no_debugct_check)--*/
 class CefClient : public virtual CefBase
 {
 public:
@@ -1912,7 +1909,7 @@ public:
   ///
   // Set all values at one time.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=postData)--*/
   virtual void Set(const CefString& url,
                    const CefString& method,
                    CefRefPtr<CefPostData> postData,
@@ -1921,7 +1918,7 @@ public:
   ///
   // Get the flags used in combination with CefWebURLRequest.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=WUR_FLAG_NONE)--*/
   virtual RequestFlags GetFlags() =0;
   ///
   // Set the flags used in combination with CefWebURLRequest.
@@ -1969,7 +1966,7 @@ public:
   ///
   // Retrieve the post data elements.
   ///
-  /*--cef()--*/
+  /*--cef(count_func=elements:GetElementCount)--*/
   virtual void GetElements(ElementVector& elements) =0;
 
   ///
@@ -2034,7 +2031,7 @@ public:
   ///
   // Return the type of this post data element.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=PDE_TYPE_EMPTY)--*/
   virtual Type GetType() =0;
 
   ///
@@ -2526,7 +2523,7 @@ public:
   ///
   // Create a new CefV8Value object of type string.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=value)--*/
   static CefRefPtr<CefV8Value> CreateString(const CefString& value);
   ///
   // Create a new CefV8Value object of type object. This method should only be
@@ -2534,7 +2531,7 @@ public:
   // CefV8Accessor callback, or in combination with calling Enter() and Exit()
   // on a stored CefV8Context reference.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=user_data)--*/
   static CefRefPtr<CefV8Value> CreateObject(CefRefPtr<CefBase> user_data);
   ///
   // Create a new CefV8Value object of type object with accessors. This method
@@ -2542,7 +2539,8 @@ public:
   // CefV8Handler or CefV8Accessor callback, or in combination with calling
   // Enter() and Exit() on a stored CefV8Context reference.
   ///
-  /*--cef(capi_name=cef_v8value_create_object_with_accessor)--*/
+  /*--cef(capi_name=cef_v8value_create_object_with_accessor,
+          optional_param=user_data,optional_param=accessor)--*/
   static CefRefPtr<CefV8Value> CreateObject(CefRefPtr<CefBase> user_data, 
                                             CefRefPtr<CefV8Accessor> accessor);
   ///
@@ -2666,7 +2664,7 @@ public:
   // Returns true if the object has a value with the specified identifier.
   ///
   /*--cef(capi_name=has_value_byindex)--*/
-  virtual bool HasValue(int index) =0;
+  virtual bool HasValue(size_t index) =0;
 
   ///
   // Delete the value with the specified identifier.
@@ -2677,7 +2675,7 @@ public:
   // Delete the value with the specified identifier.
   ///
   /*--cef(capi_name=delete_value_byindex)--*/
-  virtual bool DeleteValue(int index) =0;
+  virtual bool DeleteValue(size_t index) =0;
 
   ///
   // Returns the value with the specified identifier.
@@ -2688,7 +2686,7 @@ public:
   // Returns the value with the specified identifier.
   ///
   /*--cef(capi_name=get_value_byindex)--*/
-  virtual CefRefPtr<CefV8Value> GetValue(int index) =0;
+  virtual CefRefPtr<CefV8Value> GetValue(size_t index) =0;
 
   ///
   // Associate a value with the specified identifier.
@@ -2700,7 +2698,7 @@ public:
   // Associate a value with the specified identifier.
   ///
   /*--cef(capi_name=set_value_byindex)--*/
-  virtual bool SetValue(int index, CefRefPtr<CefV8Value> value) =0;
+  virtual bool SetValue(size_t index, CefRefPtr<CefV8Value> value) =0;
 
   ///
   // Register an identifier whose access will be forwarded to the CefV8Accessor
@@ -2758,7 +2756,7 @@ public:
   // thrown. If |rethrow_exception| is true any exception will also be re-
   // thrown. This method returns false if called incorrectly.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=object)--*/
   virtual bool ExecuteFunction(CefRefPtr<CefV8Value> object,
                                const CefV8ValueList& arguments,
                                CefRefPtr<CefV8Value>& retval,
@@ -2774,7 +2772,7 @@ public:
   // |rethrow_exception| is true any exception will also be re-thrown. This 
   // method returns false if called incorrectly.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=object)--*/
   virtual bool ExecuteFunctionWithContext(CefRefPtr<CefV8Context> context,
                                           CefRefPtr<CefV8Value> object,
                                           const CefV8ValueList& arguments,
@@ -2936,7 +2934,7 @@ public:
   ///
   // Returns the current ready state of the request.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=WUR_STATE_UNSENT)--*/
   virtual RequestState GetState() =0;
 };
 
@@ -3054,7 +3052,7 @@ public:
   ///
   // Returns the node type.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=XML_NODE_UNSUPPORTED)--*/
   virtual NodeType GetType() =0;
 
   ///
@@ -3140,7 +3138,7 @@ public:
   // Returns the value of the attribute at the specified 0-based index.
   ///
   /*--cef(capi_name=get_attribute_byindex)--*/
-  virtual CefString GetAttribute(int index) =0;
+  virtual CefString GetAttribute(size_t index) =0;
 
   ///
   // Returns the value of the attribute with the specified qualified name.
@@ -3185,7 +3183,7 @@ public:
   // true if the cursor position was set successfully.
   ///
   /*--cef(capi_name=move_to_attribute_byindex)--*/
-  virtual bool MoveToAttribute(int index) =0;
+  virtual bool MoveToAttribute(size_t index) =0;
 
   ///
   // Moves the cursor to the attribute with the specified qualified name.
@@ -3295,7 +3293,7 @@ public:
   // Opens the file for reading of uncompressed data. A read password may
   // optionally be specified.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=password)--*/
   virtual bool OpenFile(const CefString& password) =0;
 
   ///
@@ -3358,7 +3356,7 @@ public:
   ///
   // Returns the document type.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=DOM_DOCUMENT_TYPE_UNKNOWN)--*/
   virtual Type GetType() =0;
 
   ///
@@ -3468,7 +3466,7 @@ public:
   ///
   // Returns the type for this node.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=DOM_NODE_TYPE_UNSUPPORTED)--*/
   virtual Type GetType() =0;
 
   ///
@@ -3652,13 +3650,13 @@ public:
   ///
   // Returns the event category.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=DOM_EVENT_CATEGORY_UNKNOWN)--*/
   virtual Category GetCategory() =0;
 
   ///
   // Returns the event processing phase.
   ///
-  /*--cef()--*/
+  /*--cef(default_retval=DOM_EVENT_PHASE_UNKNOWN)--*/
   virtual Phase GetPhase() =0;
 
   ///
@@ -3832,16 +3830,17 @@ public:
 // arguments. Switch names are considered case-insensitive. This class can be
 // used before CefInitialize() is called.
 ///
-/*--cef(source=library)--*/
+/*--cef(source=library,no_debugct_check)--*/
 class CefCommandLine : public virtual CefBase
 {
 public:
   typedef std::vector<CefString> ArgumentList;
   typedef std::map<CefString,CefString> SwitchMap;
+
   ///
   // Create a new CefCommandLine instance.
   ///
-  /*--cef()--*/
+  /*--cef(revision_check)--*/
   static CefRefPtr<CefCommandLine> CreateCommandLine();
 
   ///

include/cef_capi.h

@@ -1281,7 +1281,7 @@ typedef struct _cef_menu_handler_t
   ///
   int (CEF_CALLBACK *on_before_menu)(struct _cef_menu_handler_t* self,
       struct _cef_browser_t* browser,
-      const struct _cef_handler_menuinfo_t* menuInfo);
+      const struct _cef_menu_info_t* menuInfo);
 
   ///
   // Called to optionally override the default text for a context menu item.
@@ -1289,7 +1289,7 @@ typedef struct _cef_menu_handler_t
   // alternate text.
   ///
   void (CEF_CALLBACK *get_menu_label)(struct _cef_menu_handler_t* self,
-      struct _cef_browser_t* browser, enum cef_handler_menuid_t menuId,
+      struct _cef_browser_t* browser, enum cef_menu_id_t menuId,
       cef_string_t* label);
 
   ///
@@ -1297,7 +1297,7 @@ typedef struct _cef_menu_handler_t
   // false (0) to execute the default action or true (1) to cancel the action.
   ///
   int (CEF_CALLBACK *on_menu_action)(struct _cef_menu_handler_t* self,
-      struct _cef_browser_t* browser, enum cef_handler_menuid_t menuId);
+      struct _cef_browser_t* browser, enum cef_menu_id_t menuId);
 
 } cef_menu_handler_t;
 
@@ -1494,7 +1494,7 @@ typedef struct _cef_render_handler_t
   ///
   void (CEF_CALLBACK *on_paint)(struct _cef_render_handler_t* self,
       struct _cef_browser_t* browser, enum cef_paint_element_type_t type,
-      size_t dirtyRectCount, cef_rect_t const* dirtyRects,
+      size_t dirtyRectsCount, cef_rect_t const* dirtyRects,
       const void* buffer);
 
   ///
@@ -1745,8 +1745,8 @@ typedef struct _cef_post_data_t
   ///
   // Retrieve the post data elements.
   ///
-  struct _cef_post_data_element_t* (CEF_CALLBACK *get_elements)(
+  void (CEF_CALLBACK *get_elements)(struct _cef_post_data_t* self,
-      struct _cef_post_data_t* self, int elementIndex);
+      size_t* elementsCount, struct _cef_post_data_element_t** elements);
 
   ///
   // Remove the specified post data element.  Returns true (1) if the removal
@@ -2159,7 +2159,7 @@ typedef struct _cef_v8handler_t
   ///
   int (CEF_CALLBACK *execute)(struct _cef_v8handler_t* self,
       const cef_string_t* name, struct _cef_v8value_t* object,
-      size_t argumentCount, struct _cef_v8value_t* const* arguments,
+      size_t argumentsCount, struct _cef_v8value_t* const* arguments,
       struct _cef_v8value_t** retval, cef_string_t* exception);
 
 } cef_v8handler_t;
@@ -2375,7 +2375,8 @@ typedef struct _cef_v8value_t
   ///
   // Returns true (1) if the object has a value with the specified identifier.
   ///
-  int (CEF_CALLBACK *has_value_byindex)(struct _cef_v8value_t* self, int index);
+  int (CEF_CALLBACK *has_value_byindex)(struct _cef_v8value_t* self,
+      size_t index);
 
   ///
   // Delete the value with the specified identifier.
@@ -2387,7 +2388,7 @@ typedef struct _cef_v8value_t
   // Delete the value with the specified identifier.
   ///
   int (CEF_CALLBACK *delete_value_byindex)(struct _cef_v8value_t* self,
-      int index);
+      size_t index);
 
   ///
   // Returns the value with the specified identifier.
@@ -2399,7 +2400,7 @@ typedef struct _cef_v8value_t
   // Returns the value with the specified identifier.
   ///
   struct _cef_v8value_t* (CEF_CALLBACK *get_value_byindex)(
-      struct _cef_v8value_t* self, int index);
+      struct _cef_v8value_t* self, size_t index);
 
   ///
   // Associate a value with the specified identifier.
@@ -2411,8 +2412,8 @@ typedef struct _cef_v8value_t
   ///
   // Associate a value with the specified identifier.
   ///
-  int (CEF_CALLBACK *set_value_byindex)(struct _cef_v8value_t* self, int index,
+  int (CEF_CALLBACK *set_value_byindex)(struct _cef_v8value_t* self,
-      struct _cef_v8value_t* value);
+      size_t index, struct _cef_v8value_t* value);
 
   ///
   // Register an identifier whose access will be forwarded to the
@@ -2473,7 +2474,7 @@ typedef struct _cef_v8value_t
   // called incorrectly.
   ///
   int (CEF_CALLBACK *execute_function)(struct _cef_v8value_t* self,
-      struct _cef_v8value_t* object, size_t argumentCount,
+      struct _cef_v8value_t* object, size_t argumentsCount,
       struct _cef_v8value_t* const* arguments, struct _cef_v8value_t** retval,
       struct _cef_v8exception_t** exception, int rethrow_exception);
 
@@ -2488,7 +2489,7 @@ typedef struct _cef_v8value_t
   ///
   int (CEF_CALLBACK *execute_function_with_context)(struct _cef_v8value_t* self,
       struct _cef_v8context_t* context, struct _cef_v8value_t* object,
-      size_t argumentCount, struct _cef_v8value_t* const* arguments,
+      size_t argumentsCount, struct _cef_v8value_t* const* arguments,
       struct _cef_v8value_t** retval, struct _cef_v8exception_t** exception,
       int rethrow_exception);
 
@@ -2916,7 +2917,7 @@ typedef struct _cef_xml_reader_t
   ///
   // The resulting string must be freed by calling cef_string_userfree_free().
   cef_string_userfree_t (CEF_CALLBACK *get_attribute_byindex)(
-      struct _cef_xml_reader_t* self, int index);
+      struct _cef_xml_reader_t* self, size_t index);
 
   ///
   // Returns the value of the attribute with the specified qualified name.
@@ -2964,7 +2965,7 @@ typedef struct _cef_xml_reader_t
   // true (1) if the cursor position was set successfully.
   ///
   int (CEF_CALLBACK *move_to_attribute_byindex)(struct _cef_xml_reader_t* self,
-      int index);
+      size_t index);
 
   ///
   // Moves the cursor to the attribute with the specified qualified name.

include/internal/cef_types.h

@@ -652,7 +652,7 @@ enum cef_v8_propertyattribute_t
 ///
 // Structure representing menu information.
 ///
-typedef struct _cef_handler_menuinfo_t
+typedef struct _cef_menu_info_t
 {
   ///
   // Values from the cef_handler_menutypebits_t enumeration.
@@ -679,13 +679,13 @@ typedef struct _cef_handler_menuinfo_t
   int editFlags;
 
   cef_string_t securityInfo;
-} cef_handler_menuinfo_t;
+} cef_menu_info_t;
 
 ///
-// The cef_handler_menuinfo_t typeFlags value will be a combination of the
+// The cef_menu_info_t typeFlags value will be a combination of the
 // following values.
 ///
-enum cef_handler_menutypebits_t
+enum cef_menu_typebits_t
 {
   ///
   // No node is selected
@@ -730,10 +730,10 @@ enum cef_handler_menutypebits_t
 };
 
 ///
-// The cef_handler_menuinfo_t editFlags value will be a combination of the
+// The cef_menu_info_t editFlags value will be a combination of the
 // following values.
 ///
-enum cef_handler_menucapabilitybits_t
+enum cef_menu_capabilitybits_t
 {
   // Values from WebContextMenuData::EditFlags in WebContextMenuData.h
   MENU_CAN_DO_NONE = 0x0,
@@ -753,7 +753,7 @@ enum cef_handler_menucapabilitybits_t
 ///
 // Supported menu ID values.
 ///
-enum cef_handler_menuid_t
+enum cef_menu_id_t
 {
   MENU_ID_NAV_BACK = 10,
   MENU_ID_NAV_FORWARD = 11,

include/internal/cef_types_wrappers.h

@@ -190,6 +190,25 @@ inline bool operator!=(const CefRect& a, const CefRect& b)
 }
 
 
+struct CefPrintOptionsTraits {
+  typedef cef_print_options_t struct_type;
+
+  static inline void init(struct_type* s) {}
+  static inline void clear(struct_type* s) {}
+
+  static inline void set(const struct_type* src, struct_type* target, bool copy)
+  {
+    *target = *src;
+  }
+};
+
+///
+// Class representing print options.
+///
+typedef CefStructBase<CefPrintOptionsTraits> CefPrintOptions;
+
+
+
 struct CefPopupFeaturesTraits {
   typedef cef_popup_features_t struct_type;
 
@@ -528,6 +547,53 @@ struct CefCookieTraits {
 typedef CefStructBase<CefCookieTraits> CefCookie;
 
 
+struct CefMenuInfoTraits {
+  typedef cef_menu_info_t struct_type;
+
+  static inline void init(struct_type* s) {}
+
+  static inline void clear(struct_type* s)
+  {
+    cef_string_clear(&s->linkUrl);
+    cef_string_clear(&s->imageUrl);
+    cef_string_clear(&s->pageUrl);
+    cef_string_clear(&s->frameUrl);
+    cef_string_clear(&s->selectionText);
+    cef_string_clear(&s->misspelledWord);
+    cef_string_clear(&s->securityInfo);
+  }
+
+  static inline void set(const struct_type* src, struct_type* target, bool copy)
+  {
+    target->typeFlags = src->typeFlags;
+    target->x = src->x;
+    target->y = src->y;
+
+    cef_string_set(src->linkUrl.str, src->linkUrl.length,
+        &target->linkUrl, copy);
+    cef_string_set(src->imageUrl.str, src->imageUrl.length,
+        &target->imageUrl, copy);
+    cef_string_set(src->pageUrl.str, src->pageUrl.length,
+        &target->pageUrl, copy);
+    cef_string_set(src->frameUrl.str, src->frameUrl.length,
+        &target->frameUrl, copy);
+    cef_string_set(src->selectionText.str, src->selectionText.length,
+        &target->selectionText, copy);
+    cef_string_set(src->misspelledWord.str, src->misspelledWord.length,
+        &target->misspelledWord, copy);
+    cef_string_set(src->securityInfo.str, src->securityInfo.length,
+        &target->securityInfo, copy);
+
+    target->editFlags = src->editFlags;
+  }
+};
+
+///
+// Class representing menu info.
+///
+typedef CefStructBase<CefMenuInfoTraits> CefMenuInfo;
+
+
 struct CefProxyInfoTraits {
   typedef cef_proxy_info_t struct_type;
 

libcef/browser_impl.cc

@@ -1199,12 +1199,12 @@ void CefBrowserImpl::UIT_Show(WebKit::WebNavigationPolicy policy)
   delegate_->show(policy);
 }
 
-void CefBrowserImpl::UIT_HandleActionView(cef_handler_menuid_t menuId)
+void CefBrowserImpl::UIT_HandleActionView(cef_menu_id_t menuId)
 {
   return UIT_HandleAction(menuId, NULL);
 }
 
-void CefBrowserImpl::UIT_HandleAction(cef_handler_menuid_t menuId,
+void CefBrowserImpl::UIT_HandleAction(cef_menu_id_t menuId,
                                       CefRefPtr<CefFrame> frame)
 {
   REQUIRE_UIT();

libcef/browser_impl.h

@@ -275,8 +275,8 @@ public:
   void UIT_Show(WebKit::WebNavigationPolicy policy);
   
   // Handles most simple browser actions
-  void UIT_HandleActionView(cef_handler_menuid_t menuId);
+  void UIT_HandleActionView(cef_menu_id_t menuId);
-  void UIT_HandleAction(cef_handler_menuid_t menuId, CefRefPtr<CefFrame> frame);
+  void UIT_HandleAction(cef_menu_id_t menuId, CefRefPtr<CefFrame> frame);
 
   // Save the document HTML to a temporary file and open in the default viewing
   // application

libcef/browser_impl_win.cc

@@ -496,8 +496,7 @@ void CefBrowserImpl::UIT_PrintPages(WebKit::WebFrame* frame) {
   {
     // Make a copy of settings.
     printing::PrintSettings settings = print_context_.settings();
-    cef_print_options_t print_options;
+    CefPrintOptions print_options;
-    memset(&print_options, 0, sizeof(print_options));
     settings.UpdatePrintOptions(print_options);  
     
     CefRefPtr<CefPrintHandler> handler;

libcef/browser_webview_delegate.cc

@@ -1243,8 +1243,7 @@ bool BrowserWebViewDelegate::OnBeforeMenu(
 
   if (handler.get()) {
     // Gather menu information.
-    cef_handler_menuinfo_t menuInfo;
+    CefMenuInfo menuInfo;
-    memset(&menuInfo, 0, sizeof(menuInfo));
 
     CefString linkStr(std::string(data.linkURL.spec()));
     CefString imageStr(std::string(data.srcURL.spec()));

libcef/browser_webview_delegate_gtk.cc

@@ -345,8 +345,7 @@ void BrowserWebViewDelegate::HandleContextMenu(int selected_id)
       handler = client->GetMenuHandler();
 
     // An action was chosen
-    cef_handler_menuid_t menuId =
+    cef_menu_id_t menuId = static_cast<cef_menu_id_t>(selected_id);
-        static_cast<cef_handler_menuid_t>(selected_id);
     bool handled = false;
     if (handler.get()) {
       // Ask the handler if it wants to handle the action

libcef/browser_webview_delegate_mac.mm

@@ -48,7 +48,7 @@ namespace {
 void AddMenuItem(CefRefPtr<CefBrowser> browser,
                  CefRefPtr<CefMenuHandler> handler,
                  NSMenu* menu,
-                 cef_handler_menuid_t menuId,
+                 cef_menu_id_t menuId,
                  const std::string& label,
                  bool enabled) {
   std::string disp_str;

libcef/browser_webview_delegate_win.cc

@@ -63,7 +63,7 @@ static const wchar_t kPluginWindowClassName[] = L"WebPluginHost";
 void AddMenuItem(CefRefPtr<CefBrowser> browser,
                  CefRefPtr<CefMenuHandler> handler,
                  HMENU menu,
-                 cef_handler_menuid_t menuId,
+                 cef_menu_id_t menuId,
                  const wchar_t* label,
                  bool enabled,
                  std::list<std::wstring>& label_list)
@@ -504,8 +504,7 @@ void BrowserWebViewDelegate::showContextMenu(
 
   if (selected_id != 0) {
     // An action was chosen
-    cef_handler_menuid_t menuId =
+    cef_menu_id_t menuId = static_cast<cef_menu_id_t>(selected_id);
-        static_cast<cef_handler_menuid_t>(selected_id);
     bool handled = false;
     if (handler.get()) {
       // Ask the handler if it wants to handle the action

libcef/browser_webview_mac.mm

@@ -232,8 +232,7 @@
 }
 
 - (void)menuItemSelected:(id)sender {
-  cef_handler_menuid_t menuId =
+  cef_menu_id_t menuId = static_cast<cef_menu_id_t>([sender tag]);
-      static_cast<cef_handler_menuid_t>([sender tag]);
   bool handled = false;
 
   CefRefPtr<CefClient> client = browser_->GetClient();

libcef/printing/print_settings.cc

@@ -238,7 +238,8 @@ void PrintSettings::UpdatePrintOptions(cef_print_options_t& print_options) {
   print_options.paper_margins.footer = ConvertUnitDouble(
       requested_margins.footer, desired_dpi, 1);
 }
-void PrintSettings::UpdateFromPrintOptions(const cef_print_options_t& print_options) {
+void PrintSettings::UpdateFromPrintOptions(
+    const cef_print_options_t& print_options) {
   landscape = print_options.page_orientation == LANDSCAPE;
   page_measurements.page_type = print_options.paper_metrics.paper_type;
   if (page_measurements.page_type == PT_CUSTOM) {

libcef/v8_impl.cc

@@ -851,7 +851,7 @@ bool CefV8ValueImpl::HasValue(const CefString& key)
   return obj->Has(GetV8String(key));
 }
 
-bool CefV8ValueImpl::HasValue(int index)
+bool CefV8ValueImpl::HasValue(size_t index)
 {
   CEF_REQUIRE_UI_THREAD(false);
   if(!GetHandle()->IsObject()) {
@@ -859,11 +859,6 @@ bool CefV8ValueImpl::HasValue(int index)
     return false;
   }
 
-  if (index < 0) {
-    NOTREACHED() << "invalid input parameter";
-    return false;
-  }
-  
   v8::HandleScope handle_scope;
   v8::Local<v8::Object> obj = GetHandle()->ToObject();
   return obj->Has(index);
@@ -887,7 +882,7 @@ bool CefV8ValueImpl::DeleteValue(const CefString& key)
   return obj->Delete(GetV8String(key));
 }
 
-bool CefV8ValueImpl::DeleteValue(int index)
+bool CefV8ValueImpl::DeleteValue(size_t index)
 {
   CEF_REQUIRE_UI_THREAD(false);
   if(!GetHandle()->IsObject()) {
@@ -895,11 +890,6 @@ bool CefV8ValueImpl::DeleteValue(int index)
     return false;
   }
 
-  if (index < 0) {
-    NOTREACHED() << "invalid input parameter";
-    return false;
-  }
-  
   v8::HandleScope handle_scope;
   v8::Local<v8::Object> obj = GetHandle()->ToObject();
   return obj->Delete(index);
@@ -923,7 +913,7 @@ CefRefPtr<CefV8Value> CefV8ValueImpl::GetValue(const CefString& key)
   return new CefV8ValueImpl(obj->Get(GetV8String(key)));
 }
 
-CefRefPtr<CefV8Value> CefV8ValueImpl::GetValue(int index)
+CefRefPtr<CefV8Value> CefV8ValueImpl::GetValue(size_t index)
 {
   CEF_REQUIRE_UI_THREAD(NULL);
   if(!GetHandle()->IsObject()) {
@@ -931,11 +921,6 @@ CefRefPtr<CefV8Value> CefV8ValueImpl::GetValue(int index)
     return NULL;
   }
 
-  if (index < 0) {
-    NOTREACHED() << "invalid input parameter";
-    return NULL;
-  }
-
   v8::HandleScope handle_scope;
   v8::Local<v8::Object> obj = GetHandle()->ToObject();
   return new CefV8ValueImpl(obj->Get(v8::Number::New(index)));
@@ -963,7 +948,7 @@ bool CefV8ValueImpl::SetValue(const CefString& key,
   }
 }
 
-bool CefV8ValueImpl::SetValue(int index, CefRefPtr<CefV8Value> value)
+bool CefV8ValueImpl::SetValue(size_t index, CefRefPtr<CefV8Value> value)
 {
   CEF_REQUIRE_UI_THREAD(false);
 
@@ -972,11 +957,6 @@ bool CefV8ValueImpl::SetValue(int index, CefRefPtr<CefV8Value> value)
     return false;
   }
 
-  if (index < 0) {
-    NOTREACHED() << "invalid input parameter";
-    return false;
-  }
-
   CefV8ValueImpl *impl = static_cast<CefV8ValueImpl*>(value.get());
   if(impl) {
     v8::HandleScope handle_scope;

libcef/v8_impl.h

@@ -127,14 +127,14 @@ public:
   virtual CefTime GetDateValue() OVERRIDE;
   virtual CefString GetStringValue() OVERRIDE;
   virtual bool HasValue(const CefString& key) OVERRIDE;
-  virtual bool HasValue(int index) OVERRIDE;
+  virtual bool HasValue(size_t index) OVERRIDE;
   virtual bool DeleteValue(const CefString& key) OVERRIDE;
-  virtual bool DeleteValue(int index) OVERRIDE;
+  virtual bool DeleteValue(size_t index) OVERRIDE;
   virtual CefRefPtr<CefV8Value> GetValue(const CefString& key) OVERRIDE;
-  virtual CefRefPtr<CefV8Value> GetValue(int index) OVERRIDE;
+  virtual CefRefPtr<CefV8Value> GetValue(size_t index) OVERRIDE;
   virtual bool SetValue(const CefString& key, CefRefPtr<CefV8Value> value,
                         PropertyAttribute attribute) OVERRIDE;
-  virtual bool SetValue(int index, CefRefPtr<CefV8Value> value) OVERRIDE;
+  virtual bool SetValue(size_t index, CefRefPtr<CefV8Value> value) OVERRIDE;
   virtual bool SetValue(const CefString& key, AccessControl settings, 
                         PropertyAttribute attribute) OVERRIDE;
   virtual bool GetKeys(std::vector<CefString>& keys) OVERRIDE;

libcef/xml_reader_impl.cc

@@ -355,7 +355,7 @@ size_t CefXmlReaderImpl::GetAttributeCount()
   return xmlTextReaderAttributeCount(reader_);
 }
 
-CefString CefXmlReaderImpl::GetAttribute(int index)
+CefString CefXmlReaderImpl::GetAttribute(size_t index)
 {
   if (!VerifyContext())
     return CefString();
@@ -409,7 +409,7 @@ int CefXmlReaderImpl::GetLineNumber()
   return xmlTextReaderGetParserLineNumber(reader_);
 }
 
-bool CefXmlReaderImpl::MoveToAttribute(int index)
+bool CefXmlReaderImpl::MoveToAttribute(size_t index)
 {
   if (!VerifyContext())
     return false;

libcef/xml_reader_impl.h

@@ -21,37 +21,37 @@ public:
   bool Initialize(CefRefPtr<CefStreamReader> stream,
                   EncodingType encodingType, const CefString& URI);
 
-  virtual bool MoveToNextNode();
+  virtual bool MoveToNextNode() OVERRIDE;
-  virtual bool Close();
+  virtual bool Close() OVERRIDE;
-  virtual bool HasError();
+  virtual bool HasError() OVERRIDE;
-  virtual CefString GetError();
+  virtual CefString GetError() OVERRIDE;
-  virtual NodeType GetType();
+  virtual NodeType GetType() OVERRIDE;
-  virtual int GetDepth();
+  virtual int GetDepth() OVERRIDE;
-  virtual CefString GetLocalName();
+  virtual CefString GetLocalName() OVERRIDE;
-  virtual CefString GetPrefix();
+  virtual CefString GetPrefix() OVERRIDE;
-  virtual CefString GetQualifiedName();
+  virtual CefString GetQualifiedName() OVERRIDE;
-  virtual CefString GetNamespaceURI();
+  virtual CefString GetNamespaceURI() OVERRIDE;
-  virtual CefString GetBaseURI();
+  virtual CefString GetBaseURI() OVERRIDE;
-  virtual CefString GetXmlLang();
+  virtual CefString GetXmlLang() OVERRIDE;
-  virtual bool IsEmptyElement();
+  virtual bool IsEmptyElement() OVERRIDE;
-  virtual bool HasValue();
+  virtual bool HasValue() OVERRIDE;
-  virtual CefString GetValue();
+  virtual CefString GetValue() OVERRIDE;
-  virtual bool HasAttributes();
+  virtual bool HasAttributes() OVERRIDE;
-  virtual size_t GetAttributeCount();
+  virtual size_t GetAttributeCount() OVERRIDE;
-  virtual CefString GetAttribute(int index);
+  virtual CefString GetAttribute(size_t index) OVERRIDE;
-  virtual CefString GetAttribute(const CefString& qualifiedName);
+  virtual CefString GetAttribute(const CefString& qualifiedName) OVERRIDE;
   virtual CefString GetAttribute(const CefString& localName,
-                                 const CefString& namespaceURI);
+                                 const CefString& namespaceURI) OVERRIDE;
-  virtual CefString GetInnerXml();
+  virtual CefString GetInnerXml() OVERRIDE;
-  virtual CefString GetOuterXml();
+  virtual CefString GetOuterXml() OVERRIDE;
-  virtual int GetLineNumber();
+  virtual int GetLineNumber() OVERRIDE;
-  virtual bool MoveToAttribute(int index);
+  virtual bool MoveToAttribute(size_t index) OVERRIDE;
-  virtual bool MoveToAttribute(const CefString& qualifiedName);
+  virtual bool MoveToAttribute(const CefString& qualifiedName) OVERRIDE;
   virtual bool MoveToAttribute(const CefString& localName,
-                               const CefString& namespaceURI);
+                               const CefString& namespaceURI) OVERRIDE;
-  virtual bool MoveToFirstAttribute();
+  virtual bool MoveToFirstAttribute() OVERRIDE;
-  virtual bool MoveToNextAttribute();
+  virtual bool MoveToNextAttribute() OVERRIDE;
-  virtual bool MoveToCarryingElement();
+  virtual bool MoveToCarryingElement() OVERRIDE;
 
   // Add another line to the error string.
   void AppendError(const CefString& error_str);

libcef_dll/cpptoc/app_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,19 +18,22 @@
 
 cef_proxy_handler_t* CEF_CALLBACK app_get_proxy_handler(struct _cef_app_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefProxyHandler> handlerPtr =
+  // Execute
-      CefAppCppToC::Get(self)->GetProxyHandler();
+  CefRefPtr<CefProxyHandler> _retval = CefAppCppToC::Get(self)->GetProxyHandler(
-  if(handlerPtr.get())
+      );
-    return CefProxyHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefProxyHandlerCppToC::Wrap(_retval);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefAppCppToC::CefAppCppToC(CefApp* cls)

libcef_dll/cpptoc/app_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _APP_CPPTOC_H
 #define _APP_CPPTOC_H
 

libcef_dll/cpptoc/base_cpptoc.h

@@ -20,6 +20,8 @@ public:
   // is done in this case.
   static CefRefPtr<CefBase> Get(cef_base_t* s)
   {
+    DCHECK(s);
+
     // Cast our structure to the wrapper structure type.
     CefBaseCppToC::Struct* wrapperStruct =
         reinterpret_cast<CefBaseCppToC::Struct*>(s);
@@ -31,6 +33,9 @@ public:
   // instance to the other side.
   static cef_base_t* Wrap(CefRefPtr<CefBase> c)
   {
+    if (!c.get())
+      return NULL;
+
     // Wrap our object with the CefCppToC class.
     CefBaseCppToC* wrapper = new CefBaseCppToC(c);
     // Add a reference to our wrapper object that will be released once our
@@ -44,6 +49,9 @@ public:
   // our wrapper structure back from the other side.
   static CefRefPtr<CefBase> Unwrap(cef_base_t* s)
   {
+    if (!s)
+      return NULL;
+
     // Cast our structure to the wrapper structure type.
     CefBaseCppToC::Struct* wrapperStruct =
         reinterpret_cast<CefBaseCppToC::Struct*>(s);

libcef_dll/cpptoc/browser_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -22,455 +22,760 @@ CEF_EXPORT int cef_browser_create(cef_window_info_t* windowInfo,
     struct _cef_client_t* client, const cef_string_t* url,
     const struct _cef_browser_settings_t* settings)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: windowInfo; type: struct_byref
   DCHECK(windowInfo);
   if (!windowInfo)
     return 0;
+  // Verify param: client; type: refptr_diff
+  DCHECK(client);
+  if (!client)
+    return 0;
+  // Verify param: settings; type: struct_byref_const
+  DCHECK(settings);
+  if (!settings)
+    return 0;
+  // Unverified params: url
 
-  CefRefPtr<CefClient> clientPtr;
+  // Translate param: windowInfo; type: struct_byref
   CefWindowInfo windowInfoObj;
-  CefBrowserSettings browserSettingsObj;
+  if (windowInfo)
-  
+    windowInfoObj.AttachTo(*windowInfo);
-  windowInfoObj.Set(*windowInfo, false);
+  // Translate param: settings; type: struct_byref_const
-  if(client)
+  CefBrowserSettings settingsObj;
-    clientPtr = CefClientCToCpp::Wrap(client);
   if (settings)
-    browserSettingsObj.Set(*settings, false);
+    settingsObj.Set(*settings, false);
- 
+
-  return CefBrowser::CreateBrowser(windowInfoObj, clientPtr, CefString(url),
+  // Execute
-      browserSettingsObj);
+  bool _retval = CefBrowser::CreateBrowser(
+      windowInfoObj,
+      CefClientCToCpp::Wrap(client),
+      CefString(url),
+      settingsObj);
+
+  // Restore param: windowInfo; type: struct_byref
+  if (windowInfo)
+    windowInfoObj.DetachTo(*windowInfo);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 CEF_EXPORT cef_browser_t* cef_browser_create_sync(cef_window_info_t* windowInfo,
     struct _cef_client_t* client, const cef_string_t* url,
     const struct _cef_browser_settings_t* settings)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: windowInfo; type: struct_byref
   DCHECK(windowInfo);
   if (!windowInfo)
     return NULL;
+  // Verify param: client; type: refptr_diff
+  DCHECK(client);
+  if (!client)
+    return NULL;
+  // Verify param: settings; type: struct_byref_const
+  DCHECK(settings);
+  if (!settings)
+    return NULL;
+  // Unverified params: url
 
-  CefRefPtr<CefClient> clientPtr;
+  // Translate param: windowInfo; type: struct_byref
   CefWindowInfo windowInfoObj;
-  CefBrowserSettings browserSettingsObj;
+  if (windowInfo)
-  
+    windowInfoObj.AttachTo(*windowInfo);
-  windowInfoObj.Set(*windowInfo, false);
+  // Translate param: settings; type: struct_byref_const
-  if(client)
+  CefBrowserSettings settingsObj;
-    clientPtr = CefClientCToCpp::Wrap(client);
   if (settings)
-    browserSettingsObj.Set(*settings, false);
+    settingsObj.Set(*settings, false);
-  
+
-  CefRefPtr<CefBrowser> browserPtr(
+  // Execute
-      CefBrowser::CreateBrowserSync(windowInfoObj, clientPtr, CefString(url),
+  CefRefPtr<CefBrowser> _retval = CefBrowser::CreateBrowserSync(
-                                    browserSettingsObj));
+      windowInfoObj,
-  if(browserPtr.get())
+      CefClientCToCpp::Wrap(client),
-    return CefBrowserCppToC::Wrap(browserPtr);
+      CefString(url),
-  return NULL;
+      settingsObj);
+
+  // Restore param: windowInfo; type: struct_byref
+  if (windowInfo)
+    windowInfoObj.DetachTo(*windowInfo);
+
+  // Return type: refptr_same
+  return CefBrowserCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 void CEF_CALLBACK browser_parent_window_will_close(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->ParentWindowWillClose();
 }
 
+
 void CEF_CALLBACK browser_close_browser(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->CloseBrowser();
 }
 
+
 int CEF_CALLBACK browser_can_go_back(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefBrowserCppToC::Get(self)->CanGoBack();
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->CanGoBack();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK browser_go_back(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->GoBack();
 }
 
+
 int CEF_CALLBACK browser_can_go_forward(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefBrowserCppToC::Get(self)->CanGoForward();
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->CanGoForward();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK browser_go_forward(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->GoForward();
 }
 
+
 void CEF_CALLBACK browser_reload(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->Reload();
 }
 
+
 void CEF_CALLBACK browser_reload_ignore_cache(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->ReloadIgnoreCache();
 }
 
+
 void CEF_CALLBACK browser_stop_load(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->StopLoad();
 }
 
+
 void CEF_CALLBACK browser_set_focus(struct _cef_browser_t* self, int enable)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->SetFocus(enable ? true : false);
+  // Execute
+  CefBrowserCppToC::Get(self)->SetFocus(
+      enable?true:false);
 }
 
+
 cef_window_handle_t CEF_CALLBACK browser_get_window_handle(
     struct _cef_browser_t* self)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(!self)
-    return NULL;
 
-  return CefBrowserCppToC::Get(self)->GetWindowHandle();
-}
-
-cef_window_handle_t CEF_CALLBACK browser_get_opener_window_handle(
-    struct _cef_browser_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return NULL;
-
-  return CefBrowserCppToC::Get(self)->GetOpenerWindowHandle();
-}
-
-int CEF_CALLBACK browser_is_popup(struct _cef_browser_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return 0;
-
-  return CefBrowserCppToC::Get(self)->IsPopup();
-}
-
-int CEF_CALLBACK browser_has_document(struct _cef_browser_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return 0;
-
-  return CefBrowserCppToC::Get(self)->HasDocument();
-}
-
-struct _cef_client_t* CEF_CALLBACK browser_get_client(
-    struct _cef_browser_t* self)
-{
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefClient> clientPtr = CefBrowserCppToC::Get(self)->GetClient();
+  // Execute
-  if(clientPtr.get())
+  cef_window_handle_t _retval = CefBrowserCppToC::Get(self)->GetWindowHandle();
-    return CefClientCToCpp::Unwrap(clientPtr);
 
-  return NULL;
+  // Return type: simple
+  return _retval;
 }
 
+
+cef_window_handle_t CEF_CALLBACK browser_get_opener_window_handle(
+    struct _cef_browser_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  cef_window_handle_t _retval = CefBrowserCppToC::Get(
+      self)->GetOpenerWindowHandle();
+
+  // Return type: simple
+  return _retval;
+}
+
+
+int CEF_CALLBACK browser_is_popup(struct _cef_browser_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->IsPopup();
+
+  // Return type: bool
+  return _retval;
+}
+
+
+int CEF_CALLBACK browser_has_document(struct _cef_browser_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->HasDocument();
+
+  // Return type: bool
+  return _retval;
+}
+
+
+struct _cef_client_t* CEF_CALLBACK browser_get_client(
+    struct _cef_browser_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefClient> _retval = CefBrowserCppToC::Get(self)->GetClient();
+
+  // Return type: refptr_diff
+  return CefClientCToCpp::Unwrap(_retval);
+}
+
+
 struct _cef_frame_t* CEF_CALLBACK browser_get_main_frame(
     struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefBrowser> browserPtr = CefBrowserCppToC::Get(self);
+  // Execute
-  CefRefPtr<CefFrame> framePtr = browserPtr->GetMainFrame();
+  CefRefPtr<CefFrame> _retval = CefBrowserCppToC::Get(self)->GetMainFrame();
-  if(framePtr.get())
+
-    return CefFrameCppToC::Wrap(framePtr);
+  // Return type: refptr_same
-  return NULL;    
+  return CefFrameCppToC::Wrap(_retval);
 }
 
+
 struct _cef_frame_t* CEF_CALLBACK browser_get_focused_frame(
     struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefBrowser> browserPtr = CefBrowserCppToC::Get(self);
+  // Execute
-  CefRefPtr<CefFrame> framePtr = browserPtr->GetFocusedFrame();
+  CefRefPtr<CefFrame> _retval = CefBrowserCppToC::Get(self)->GetFocusedFrame();
-  if(framePtr.get())
+
-    return CefFrameCppToC::Wrap(framePtr);
+  // Return type: refptr_same
-  return NULL; 
+  return CefFrameCppToC::Wrap(_retval);
 }
 
+
 struct _cef_frame_t* CEF_CALLBACK browser_get_frame(struct _cef_browser_t* self,
     const cef_string_t* name)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return NULL;
+  // Verify param: name; type: string_byref_const
+  DCHECK(name);
+  if (!name)
     return NULL;
 
-  CefRefPtr<CefBrowser> browserPtr = CefBrowserCppToC::Get(self);
+  // Execute
-  CefRefPtr<CefFrame> framePtr = browserPtr->GetFrame(CefString(name));
+  CefRefPtr<CefFrame> _retval = CefBrowserCppToC::Get(self)->GetFrame(
-  if(framePtr.get())
+      CefString(name));
-    return CefFrameCppToC::Wrap(framePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefFrameCppToC::Wrap(_retval);
 }
 
+
 void CEF_CALLBACK browser_get_frame_names(struct _cef_browser_t* self,
     cef_string_list_t names)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: names; type: string_vec_byref
   DCHECK(names);
-  if(!self || !names)
+  if (!names)
     return;
 
-  CefRefPtr<CefBrowser> browserPtr = CefBrowserCppToC::Get(self);
+  // Translate param: names; type: string_vec_byref
-  std::vector<CefString> stringList;
+  std::vector<CefString> namesList;
-  browserPtr->GetFrameNames(stringList);
+  transfer_string_list_contents(names, namesList);
-  transfer_string_list_contents(stringList, names);
+
+  // Execute
+  CefBrowserCppToC::Get(self)->GetFrameNames(
+      namesList);
+
+  // Restore param: names; type: string_vec_byref
+  cef_string_list_clear(names);
+  transfer_string_list_contents(namesList, names);
 }
 
+
 void CEF_CALLBACK browser_find(struct _cef_browser_t* self, int identifier,
     const cef_string_t* searchText, int forward, int matchCase, int findNext)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: searchText; type: string_byref_const
+  DCHECK(searchText);
+  if (!searchText)
     return;
 
-  CefBrowserCppToC::Get(self)->Find(identifier, CefString(searchText),
+  // Execute
-      forward?true:false, matchCase?true:false, findNext?true:false);
+  CefBrowserCppToC::Get(self)->Find(
+      identifier,
+      CefString(searchText),
+      forward?true:false,
+      matchCase?true:false,
+      findNext?true:false);
 }
 
+
 void CEF_CALLBACK browser_stop_finding(struct _cef_browser_t* self,
     int clearSelection)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->StopFinding(clearSelection?true:false);
+  // Execute
+  CefBrowserCppToC::Get(self)->StopFinding(
+      clearSelection?true:false);
 }
 
+
 double CEF_CALLBACK browser_get_zoom_level(struct _cef_browser_t* self)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(!self)
-    return 0.0;
 
-  return CefBrowserCppToC::Get(self)->GetZoomLevel();
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  double _retval = CefBrowserCppToC::Get(self)->GetZoomLevel();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 void CEF_CALLBACK browser_set_zoom_level(struct _cef_browser_t* self,
     double zoomLevel)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  return CefBrowserCppToC::Get(self)->SetZoomLevel(zoomLevel);
+  // Execute
+  CefBrowserCppToC::Get(self)->SetZoomLevel(
+      zoomLevel);
 }
 
+
 void CEF_CALLBACK browser_clear_history(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->ClearHistory();
 }
 
+
 void CEF_CALLBACK browser_show_dev_tools(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->ShowDevTools();
 }
 
+
 void CEF_CALLBACK browser_close_dev_tools(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->CloseDevTools();
 }
 
+
 int CEF_CALLBACK browser_is_window_rendering_disabled(
     struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefBrowserCppToC::Get(self)->IsWindowRenderingDisabled();
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->IsWindowRenderingDisabled();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK browser_get_size(struct _cef_browser_t* self,
     enum cef_paint_element_type_t type, int* width, int* height)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: width; type: simple_byref
   DCHECK(width);
+  if (!width)
+    return 0;
+  // Verify param: height; type: simple_byref
   DCHECK(height);
-  if(!self || !width || !height)
+  if (!height)
     return 0;
 
-  return CefBrowserCppToC::Get(self)->GetSize(type, *width, *height);
+  // Translate param: width; type: simple_byref
+  int widthVal = width?*width:0;
+  // Translate param: height; type: simple_byref
+  int heightVal = height?*height:0;
+
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->GetSize(
+      type,
+      widthVal,
+      heightVal);
+
+  // Restore param: width; type: simple_byref
+  if (width)
+    *width = widthVal;
+  // Restore param: height; type: simple_byref
+  if (height)
+    *height = heightVal;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK browser_set_size(struct _cef_browser_t* self,
     enum cef_paint_element_type_t type, int width, int height)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  return CefBrowserCppToC::Get(self)->SetSize(type, width, height);
+  // Execute
+  CefBrowserCppToC::Get(self)->SetSize(
+      type,
+      width,
+      height);
 }
 
+
 int CEF_CALLBACK browser_is_popup_visible(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefBrowserCppToC::Get(self)->IsPopupVisible();
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->IsPopupVisible();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK browser_hide_popup(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->HidePopup();
 }
 
+
 void CEF_CALLBACK browser_invalidate(struct _cef_browser_t* self,
     const cef_rect_t* dirtyRect)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: dirtyRect; type: simple_byref_const
   DCHECK(dirtyRect);
-  if(!self || !dirtyRect)
+  if (!dirtyRect)
     return;
 
-  CefRect rect(*dirtyRect);
+  // Translate param: dirtyRect; type: simple_byref_const
-  CefBrowserCppToC::Get(self)->Invalidate(rect);
+  CefRect dirtyRectVal = dirtyRect?*dirtyRect:CefRect();
+
+  // Execute
+  CefBrowserCppToC::Get(self)->Invalidate(
+      dirtyRectVal);
 }
 
+
 int CEF_CALLBACK browser_get_image(struct _cef_browser_t* self,
     enum cef_paint_element_type_t type, int width, int height, void* buffer)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: buffer; type: simple_byaddr
   DCHECK(buffer);
-  if(!self || !buffer)
+  if (!buffer)
     return 0;
 
-  return CefBrowserCppToC::Get(self)->GetImage(type, width, height, buffer);
+  // Execute
+  bool _retval = CefBrowserCppToC::Get(self)->GetImage(
+      type,
+      width,
+      height,
+      buffer);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK browser_send_key_event(struct _cef_browser_t* self,
     enum cef_key_type_t type, int key, int modifiers, int sysChar,
     int imeChar)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->SendKeyEvent(type, key, modifiers,
+  // Execute
-      sysChar?true:false, imeChar?true:false);
+  CefBrowserCppToC::Get(self)->SendKeyEvent(
+      type,
+      key,
+      modifiers,
+      sysChar?true:false,
+      imeChar?true:false);
 }
 
+
 void CEF_CALLBACK browser_send_mouse_click_event(struct _cef_browser_t* self,
     int x, int y, enum cef_mouse_button_type_t type, int mouseUp,
     int clickCount)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->SendMouseClickEvent(x, y, type,
+  // Execute
-      mouseUp?true:false, clickCount);
+  CefBrowserCppToC::Get(self)->SendMouseClickEvent(
+      x,
+      y,
+      type,
+      mouseUp?true:false,
+      clickCount);
 }
 
+
 void CEF_CALLBACK browser_send_mouse_move_event(struct _cef_browser_t* self,
     int x, int y, int mouseLeave)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->SendMouseMoveEvent(x, y, mouseLeave?true:false);
+  // Execute
+  CefBrowserCppToC::Get(self)->SendMouseMoveEvent(
+      x,
+      y,
+      mouseLeave?true:false);
 }
 
+
 void CEF_CALLBACK browser_send_mouse_wheel_event(struct _cef_browser_t* self,
     int x, int y, int delta)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->SendMouseWheelEvent(x, y, delta);
+  // Execute
+  CefBrowserCppToC::Get(self)->SendMouseWheelEvent(
+      x,
+      y,
+      delta);
 }
 
+
 void CEF_CALLBACK browser_send_focus_event(struct _cef_browser_t* self,
     int setFocus)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefBrowserCppToC::Get(self)->SendFocusEvent(setFocus?true:false);
+  // Execute
+  CefBrowserCppToC::Get(self)->SendFocusEvent(
+      setFocus?true:false);
 }
 
+
 void CEF_CALLBACK browser_send_capture_lost_event(struct _cef_browser_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefBrowserCppToC::Get(self)->SendCaptureLostEvent();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefBrowserCppToC::CefBrowserCppToC(CefBrowser* cls)

libcef_dll/cpptoc/browser_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _BROWSER_CPPTOC_H
 #define _BROWSER_CPPTOC_H
 

libcef_dll/cpptoc/client_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -31,199 +31,238 @@
 cef_life_span_handler_t* CEF_CALLBACK client_get_life_span_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefLifeSpanHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetLifeSpanHandler();
+  CefRefPtr<CefLifeSpanHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetLifeSpanHandler();
-    return CefLifeSpanHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefLifeSpanHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_load_handler_t* CEF_CALLBACK client_get_load_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefLoadHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetLoadHandler();
+  CefRefPtr<CefLoadHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetLoadHandler();
-    return CefLoadHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefLoadHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_request_handler_t* CEF_CALLBACK client_get_request_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefRequestHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetRequestHandler();
+  CefRefPtr<CefRequestHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetRequestHandler();
-    return CefRequestHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefRequestHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_display_handler_t* CEF_CALLBACK client_get_display_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefDisplayHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetDisplayHandler();
+  CefRefPtr<CefDisplayHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetDisplayHandler();
-    return CefDisplayHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefDisplayHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_focus_handler_t* CEF_CALLBACK client_get_focus_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefFocusHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetFocusHandler();
+  CefRefPtr<CefFocusHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetFocusHandler();
-    return CefFocusHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefFocusHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_keyboard_handler_t* CEF_CALLBACK client_get_keyboard_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefKeyboardHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetKeyboardHandler();
+  CefRefPtr<CefKeyboardHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetKeyboardHandler();
-    return CefKeyboardHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefKeyboardHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_menu_handler_t* CEF_CALLBACK client_get_menu_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefMenuHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetMenuHandler();
+  CefRefPtr<CefMenuHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetMenuHandler();
-    return CefMenuHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefMenuHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_print_handler_t* CEF_CALLBACK client_get_print_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefPrintHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetPrintHandler();
+  CefRefPtr<CefPrintHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetPrintHandler();
-    return CefPrintHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefPrintHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_find_handler_t* CEF_CALLBACK client_get_find_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefFindHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetFindHandler();
+  CefRefPtr<CefFindHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetFindHandler();
-    return CefFindHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefFindHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefJSDialogHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetJSDialogHandler();
+  CefRefPtr<CefJSDialogHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetJSDialogHandler();
-    return CefJSDialogHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefJSDialogHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_v8context_handler_t* CEF_CALLBACK client_get_v8context_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefV8ContextHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetV8ContextHandler();
+  CefRefPtr<CefV8ContextHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetV8ContextHandler();
-    return CefV8ContextHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefV8ContextHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_render_handler_t* CEF_CALLBACK client_get_render_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefRenderHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetRenderHandler();
+  CefRefPtr<CefRenderHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetRenderHandler();
-    return CefRenderHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefRenderHandlerCppToC::Wrap(_retval);
 }
 
+
 cef_drag_handler_t* CEF_CALLBACK client_get_drag_handler(
     struct _cef_client_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefDragHandler> handlerPtr =
+  // Execute
-      CefClientCppToC::Get(self)->GetDragHandler();
+  CefRefPtr<CefDragHandler> _retval = CefClientCppToC::Get(
-  if(handlerPtr.get())
+      self)->GetDragHandler();
-    return CefDragHandlerCppToC::Wrap(handlerPtr);
 
-  return NULL;
+  // Return type: refptr_same
+  return CefDragHandlerCppToC::Wrap(_retval);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefClientCppToC::CefClientCppToC(CefClient* cls)

libcef_dll/cpptoc/client_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _CLIENT_CPPTOC_H
 #define _CLIENT_CPPTOC_H
 

libcef_dll/cpptoc/command_line_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,171 +18,305 @@
 
 CEF_EXPORT cef_command_line_t* cef_command_line_create()
 {
-  CefRefPtr<CefCommandLine> impl = CefCommandLine::CreateCommandLine();
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(impl.get())
+
-    return CefCommandLineCppToC::Wrap(impl);
+  // Execute
-  return NULL;
+  CefRefPtr<CefCommandLine> _retval = CefCommandLine::CreateCommandLine();
+
+  // Return type: refptr_same
+  return CefCommandLineCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 void CEF_CALLBACK command_line_init_from_argv(struct _cef_command_line_t* self,
     int argc, const char* const* argv)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
+  // Verify param: argv; type: simple_byaddr
+  DCHECK(argv);
+  if (!argv)
+    return;
 
-  CefCommandLineCppToC::Get(self)->InitFromArgv(argc, argv);
+  // Execute
+  CefCommandLineCppToC::Get(self)->InitFromArgv(
+      argc,
+      argv);
 }
 
+
 void CEF_CALLBACK command_line_init_from_string(
     struct _cef_command_line_t* self, const cef_string_t* command_line)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
+  // Verify param: command_line; type: string_byref_const
+  DCHECK(command_line);
+  if (!command_line)
+    return;
 
-  CefCommandLineCppToC::Get(self)->InitFromString(CefString(command_line));
+  // Execute
+  CefCommandLineCppToC::Get(self)->InitFromString(
+      CefString(command_line));
 }
 
+
 cef_string_userfree_t CEF_CALLBACK command_line_get_command_line_string(
     struct _cef_command_line_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefCommandLineCppToC::Get(self)->GetCommandLineString();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefCommandLineCppToC::Get(self)->GetCommandLineString();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK command_line_get_program(
     struct _cef_command_line_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefCommandLineCppToC::Get(self)->GetProgram();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefCommandLineCppToC::Get(self)->GetProgram();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK command_line_set_program(struct _cef_command_line_t* self,
     const cef_string_t* program)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
+  // Verify param: program; type: string_byref_const
+  DCHECK(program);
+  if (!program)
+    return;
 
-  CefCommandLineCppToC::Get(self)->SetProgram(CefString(program));
+  // Execute
+  CefCommandLineCppToC::Get(self)->SetProgram(
+      CefString(program));
 }
 
+
 int CEF_CALLBACK command_line_has_switches(struct _cef_command_line_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return 0;
 
-  return CefCommandLineCppToC::Get(self)->HasSwitches();
+  // Execute
+  bool _retval = CefCommandLineCppToC::Get(self)->HasSwitches();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK command_line_has_switch(struct _cef_command_line_t* self,
     const cef_string_t* name)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: name; type: string_byref_const
   DCHECK(name);
-  if (!self || !name)
+  if (!name)
     return 0;
 
-  return CefCommandLineCppToC::Get(self)->HasSwitch(CefString(name));
+  // Execute
+  bool _retval = CefCommandLineCppToC::Get(self)->HasSwitch(
+      CefString(name));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK command_line_get_switch_value(
     struct _cef_command_line_t* self, const cef_string_t* name)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return NULL;
+  // Verify param: name; type: string_byref_const
   DCHECK(name);
-  if (!self || !name)
+  if (!name)
     return NULL;
 
-  CefString str = CefCommandLineCppToC::Get(self)->GetSwitchValue(
+  // Execute
+  CefString _retval = CefCommandLineCppToC::Get(self)->GetSwitchValue(
       CefString(name));
-  return str.DetachToUserFree();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK command_line_get_switches(struct _cef_command_line_t* self,
     cef_string_map_t switches)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: switches; type: string_map_single_byref
   DCHECK(switches);
-  if (!self || !switches)
+  if (!switches)
     return;
 
-  CefCommandLine::SwitchMap map;
+  // Translate param: switches; type: string_map_single_byref
-  CefCommandLineCppToC::Get(self)->GetSwitches(map);
+  std::map<CefString,CefString> switchesMap;
-  transfer_string_map_contents(map, switches);
+  transfer_string_map_contents(switches, switchesMap);
+
+  // Execute
+  CefCommandLineCppToC::Get(self)->GetSwitches(
+      switchesMap);
+
+  // Restore param: switches; type: string_map_single_byref
+  cef_string_map_clear(switches);
+  transfer_string_map_contents(switchesMap, switches);
 }
 
+
 void CEF_CALLBACK command_line_append_switch(struct _cef_command_line_t* self,
     const cef_string_t* name)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: name; type: string_byref_const
   DCHECK(name);
-  if (!self || !name)
+  if (!name)
     return;
 
-  CefCommandLineCppToC::Get(self)->AppendSwitch(CefString(name));
+  // Execute
+  CefCommandLineCppToC::Get(self)->AppendSwitch(
+      CefString(name));
 }
 
+
 void CEF_CALLBACK command_line_append_switch_with_value(
     struct _cef_command_line_t* self, const cef_string_t* name,
     const cef_string_t* value)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: name; type: string_byref_const
   DCHECK(name);
+  if (!name)
+    return;
+  // Verify param: value; type: string_byref_const
   DCHECK(value);
-  if (!self || !name || !value)
+  if (!value)
     return;
 
-  CefCommandLineCppToC::Get(self)->AppendSwitchWithValue(CefString(name),
+  // Execute
+  CefCommandLineCppToC::Get(self)->AppendSwitchWithValue(
+      CefString(name),
       CefString(value));
 }
 
+
 int CEF_CALLBACK command_line_has_arguments(struct _cef_command_line_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return 0;
 
-  return CefCommandLineCppToC::Get(self)->HasArguments();
+  // Execute
+  bool _retval = CefCommandLineCppToC::Get(self)->HasArguments();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK command_line_get_arguments(struct _cef_command_line_t* self,
     cef_string_list_t arguments)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
+  // Verify param: arguments; type: string_vec_byref
+  DCHECK(arguments);
+  if (!arguments)
+    return;
 
-  CefCommandLine::ArgumentList list;
+  // Translate param: arguments; type: string_vec_byref
-  CefCommandLineCppToC::Get(self)->GetArguments(list);
+  std::vector<CefString> argumentsList;
-  transfer_string_list_contents(list, arguments);
+  transfer_string_list_contents(arguments, argumentsList);
+
+  // Execute
+  CefCommandLineCppToC::Get(self)->GetArguments(
+      argumentsList);
+
+  // Restore param: arguments; type: string_vec_byref
+  cef_string_list_clear(arguments);
+  transfer_string_list_contents(argumentsList, arguments);
 }
 
+
 void CEF_CALLBACK command_line_append_argument(struct _cef_command_line_t* self,
     const cef_string_t* argument)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: argument; type: string_byref_const
   DCHECK(argument);
-  if (!self || !argument)
+  if (!argument)
     return;
 
-  CefCommandLineCppToC::Get(self)->AppendArgument(CefString(argument));
+  // Execute
+  CefCommandLineCppToC::Get(self)->AppendArgument(
+      CefString(argument));
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefCommandLineCppToC::CefCommandLineCppToC(CefCommandLine* cls)

libcef_dll/cpptoc/command_line_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _COMMANDLINE_CPPTOC_H
 #define _COMMANDLINE_CPPTOC_H
 

libcef_dll/cpptoc/content_filter_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,38 +20,82 @@ void CEF_CALLBACK content_filter_process_data(
     struct _cef_content_filter_t* self, const void* data, int data_size,
     cef_stream_reader_t** substitute_data)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: data; type: simple_byaddr
   DCHECK(data);
+  if (!data)
+    return;
+  // Verify param: substitute_data; type: refptr_diff_byref
   DCHECK(substitute_data);
-  if (!self || !data || !substitute_data)
+  if (!substitute_data)
     return;
 
-  CefRefPtr<CefStreamReader> substituteDataPtr;
+  // Translate param: substitute_data; type: refptr_diff_byref
+  CefRefPtr<CefStreamReader> substitute_dataPtr;
+  if (substitute_data && *substitute_data)
+    substitute_dataPtr = CefStreamReaderCToCpp::Wrap(*substitute_data);
+  CefStreamReader* substitute_dataOrig = substitute_dataPtr.get();
 
-  CefContentFilterCppToC::Get(self)->ProcessData(data, data_size,
+  // Execute
-      substituteDataPtr);
+  CefContentFilterCppToC::Get(self)->ProcessData(
+      data,
+      data_size,
+      substitute_dataPtr);
 
-  if(substituteDataPtr.get())
+  // Restore param: substitute_data; type: refptr_diff_byref
-      *substitute_data = CefStreamReaderCToCpp::Unwrap(substituteDataPtr);
+  if (substitute_data) {
+    if (substitute_dataPtr.get()) {
+      if (substitute_dataPtr.get() != substitute_dataOrig) {
+        *substitute_data = CefStreamReaderCToCpp::Unwrap(substitute_dataPtr);
+      }
+    } else {
+      *substitute_data = NULL;
+    }
+  }
 }
 
+
 void CEF_CALLBACK content_filter_drain(struct _cef_content_filter_t* self,
     cef_stream_reader_t** remainder)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: remainder; type: refptr_diff_byref
   DCHECK(remainder);
-  if (!self || !remainder)
+  if (!remainder)
     return;
 
+  // Translate param: remainder; type: refptr_diff_byref
   CefRefPtr<CefStreamReader> remainderPtr;
+  if (remainder && *remainder)
+    remainderPtr = CefStreamReaderCToCpp::Wrap(*remainder);
+  CefStreamReader* remainderOrig = remainderPtr.get();
 
-  CefContentFilterCppToC::Get(self)->Drain(remainderPtr);
+  // Execute
+  CefContentFilterCppToC::Get(self)->Drain(
+      remainderPtr);
 
-  if(remainderPtr.get())
+  // Restore param: remainder; type: refptr_diff_byref
-      *remainder = CefStreamReaderCToCpp::Unwrap(remainderPtr);
+  if (remainder) {
+    if (remainderPtr.get()) {
+      if (remainderPtr.get() != remainderOrig) {
+        *remainder = CefStreamReaderCToCpp::Unwrap(remainderPtr);
+      }
+    } else {
+      *remainder = NULL;
+    }
+  }
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefContentFilterCppToC::CefContentFilterCppToC(CefContentFilter* cls)

libcef_dll/cpptoc/content_filter_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _CONTENTFILTER_CPPTOC_H
 #define _CONTENTFILTER_CPPTOC_H
 

libcef_dll/cpptoc/cookie_visitor_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,24 +19,44 @@ int CEF_CALLBACK cookie_visitor_visit(struct _cef_cookie_visitor_t* self,
     const struct _cef_cookie_t* cookie, int count, int total,
     int* deleteCookie)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: cookie; type: struct_byref_const
   DCHECK(cookie);
-  if(!self || !cookie)
+  if (!cookie)
+    return 0;
+  // Verify param: deleteCookie; type: bool_byref
+  DCHECK(deleteCookie);
+  if (!deleteCookie)
     return 0;
 
-  // Reference the existing values without copying.
+  // Translate param: cookie; type: struct_byref_const
   CefCookie cookieObj;
-  cookieObj.Set(*cookie, false);
+  if (cookie)
+    cookieObj.Set(*cookie, false);
+  // Translate param: deleteCookie; type: bool_byref
+  bool deleteCookieBool = (deleteCookie && *deleteCookie)?true:false;
 
-  bool delVal = (*deleteCookie)?true:false;
+  // Execute
-  bool retVal = CefCookieVisitorCppToC::Get(self)->Visit(cookieObj, count,
+  bool _retval = CefCookieVisitorCppToC::Get(self)->Visit(
-      total, delVal);
+      cookieObj,
-  *deleteCookie = delVal;
+      count,
+      total,
+      deleteCookieBool);
 
-  return retVal;
+  // Restore param: deleteCookie; type: bool_byref
+  if (deleteCookie)
+    *deleteCookie = deleteCookieBool?true:false;
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefCookieVisitorCppToC::CefCookieVisitorCppToC(CefCookieVisitor* cls)

libcef_dll/cpptoc/cookie_visitor_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _COOKIEVISITOR_CPPTOC_H
 #define _COOKIEVISITOR_CPPTOC_H
 

libcef_dll/cpptoc/cpptoc.h

@@ -30,6 +30,8 @@ public:
   // is done in this case.
   static CefRefPtr<BaseName> Get(StructName* s)
   {
+    DCHECK(s);
+
     // Cast our structure to the wrapper structure type.
     Struct* wrapperStruct = reinterpret_cast<Struct*>(s);
     // Return the underlying object instance.
@@ -56,7 +58,8 @@ public:
   // our wrapper structure back from the other side.
   static CefRefPtr<BaseName> Unwrap(StructName* s)
   {
-    DCHECK(s);
+    if (!s)
+      return NULL;
 
     // Cast our structure to the wrapper structure type.
     Struct* wrapperStruct = reinterpret_cast<Struct*>(s);

libcef_dll/cpptoc/display_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,101 +21,181 @@ void CEF_CALLBACK display_handler_on_nav_state_change(
     struct _cef_display_handler_t* self, cef_browser_t* browser, int canGoBack,
     int canGoForward)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return;
 
+  // Execute
   CefDisplayHandlerCppToC::Get(self)->OnNavStateChange(
-      CefBrowserCToCpp::Wrap(browser), (canGoBack?true:false),
+      CefBrowserCToCpp::Wrap(browser),
-      (canGoForward?true:false));
+      canGoBack?true:false,
+      canGoForward?true:false);
 }
 
+
 void CEF_CALLBACK display_handler_on_address_change(
     struct _cef_display_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, const cef_string_t* url)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return;
+  // Verify param: url; type: string_byref_const
   DCHECK(url);
-  if (!self || !browser || !frame || !url)
+  if (!url)
     return;
 
+  // Execute
   CefDisplayHandlerCppToC::Get(self)->OnAddressChange(
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
       CefString(url));
 }
 
+
 void CEF_CALLBACK display_handler_on_contents_size_change(
     struct _cef_display_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, int width, int height)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
-  if (!self || !browser || !frame)
+  if (!frame)
     return;
 
+  // Execute
   CefDisplayHandlerCppToC::Get(self)->OnContentsSizeChange(
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame), width,
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      width,
       height);
 }
 
+
 void CEF_CALLBACK display_handler_on_title_change(
     struct _cef_display_handler_t* self, cef_browser_t* browser,
     const cef_string_t* title)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  DCHECK(browser);
-  if (!self || !browser)
-    return;
 
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+  // Unverified params: title
+
+  // Execute
   CefDisplayHandlerCppToC::Get(self)->OnTitleChange(
-      CefBrowserCToCpp::Wrap(browser), CefString(title));
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(title));
 }
 
+
 int CEF_CALLBACK display_handler_on_tooltip(struct _cef_display_handler_t* self,
     cef_browser_t* browser, cef_string_t* text)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  DCHECK(browser);
-  if (!self || !browser)
-    return 0;
 
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Unverified params: text
+
+  // Translate param: text; type: string_byref
   CefString textStr(text);
-  return CefDisplayHandlerCppToC::Get(self)->OnTooltip(
+
-      CefBrowserCToCpp::Wrap(browser), textStr);
+  // Execute
+  bool _retval = CefDisplayHandlerCppToC::Get(self)->OnTooltip(
+      CefBrowserCToCpp::Wrap(browser),
+      textStr);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK display_handler_on_status_message(
     struct _cef_display_handler_t* self, cef_browser_t* browser,
     const cef_string_t* value, enum cef_handler_statustype_t type)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  DCHECK(browser);
-  if (!self || !browser)
-    return;
 
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+  // Unverified params: value
+
+  // Execute
   CefDisplayHandlerCppToC::Get(self)->OnStatusMessage(
-      CefBrowserCToCpp::Wrap(browser), CefString(value), type);
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(value),
+      type);
 }
 
+
 int CEF_CALLBACK display_handler_on_console_message(
     struct _cef_display_handler_t* self, cef_browser_t* browser,
     const cef_string_t* message, const cef_string_t* source, int line)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  DCHECK(browser);
-  if (!self || !browser)
-    return 0;
 
-  return CefDisplayHandlerCppToC::Get(self)->OnConsoleMessage(
+  DCHECK(self);
-      CefBrowserCToCpp::Wrap(browser), CefString(message), CefString(source),
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Unverified params: message, source
+
+  // Execute
+  bool _retval = CefDisplayHandlerCppToC::Get(self)->OnConsoleMessage(
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(message),
+      CefString(source),
       line);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDisplayHandlerCppToC::CefDisplayHandlerCppToC(CefDisplayHandler* cls)

libcef_dll/cpptoc/display_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DISPLAYHANDLER_CPPTOC_H
 #define _DISPLAYHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/domdocument_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,196 +19,290 @@
 enum cef_dom_document_type_t CEF_CALLBACK domdocument_get_type(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return DOM_DOCUMENT_TYPE_UNKNOWN;
 
-  return CefDOMDocumentCppToC::Get(self)->GetType();
+  // Execute
+  cef_dom_document_type_t _retval = CefDOMDocumentCppToC::Get(self)->GetType();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_document(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr =
+  // Execute
-      CefDOMDocumentCppToC::Get(self)->GetDocument();
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(self)->GetDocument(
-  if (nodePtr.get())
+      );
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_body(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr = CefDOMDocumentCppToC::Get(self)->GetBody();
+  // Execute
-  if (nodePtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(self)->GetBody();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_head(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> elementPtr = CefDOMDocumentCppToC::Get(self)->GetHead();
+  // Execute
-  if (elementPtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(self)->GetHead();
-    return CefDOMNodeCppToC::Wrap(elementPtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domdocument_get_title(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMDocumentCppToC::Get(self)->GetTitle();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMDocumentCppToC::Get(self)->GetTitle();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_element_by_id(
     struct _cef_domdocument_t* self, const cef_string_t* id)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return NULL;
+  // Verify param: id; type: string_byref_const
   DCHECK(id);
-  if(!self || !id)
+  if (!id)
     return NULL;
 
-  CefRefPtr<CefDOMNode> elementPtr =
+  // Execute
-      CefDOMDocumentCppToC::Get(self)->GetElementById(CefString(id));
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(
-  if (elementPtr.get())
+      self)->GetElementById(
-    return CefDOMNodeCppToC::Wrap(elementPtr);
+      CefString(id));
-  return NULL;
+
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_focused_node(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> elementPtr =
+  // Execute
-      CefDOMDocumentCppToC::Get(self)->GetFocusedNode();
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(
-  if (elementPtr.get())
+      self)->GetFocusedNode();
-    return CefDOMNodeCppToC::Wrap(elementPtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 int CEF_CALLBACK domdocument_has_selection(struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMDocumentCppToC::Get(self)->HasSelection();
+  // Execute
+  bool _retval = CefDOMDocumentCppToC::Get(self)->HasSelection();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_selection_start_node(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> elementPtr =
+  // Execute
-      CefDOMDocumentCppToC::Get(self)->GetSelectionStartNode();
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(
-  if (elementPtr.get())
+      self)->GetSelectionStartNode();
-    return CefDOMNodeCppToC::Wrap(elementPtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 int CEF_CALLBACK domdocument_get_selection_start_offset(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMDocumentCppToC::Get(self)->GetSelectionStartOffset();
+  // Execute
+  int _retval = CefDOMDocumentCppToC::Get(self)->GetSelectionStartOffset();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domdocument_get_selection_end_node(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> elementPtr =
+  // Execute
-      CefDOMDocumentCppToC::Get(self)->GetSelectionEndNode();
+  CefRefPtr<CefDOMNode> _retval = CefDOMDocumentCppToC::Get(
-  if (elementPtr.get())
+      self)->GetSelectionEndNode();
-    return CefDOMNodeCppToC::Wrap(elementPtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 int CEF_CALLBACK domdocument_get_selection_end_offset(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMDocumentCppToC::Get(self)->GetSelectionEndOffset();
+  // Execute
+  int _retval = CefDOMDocumentCppToC::Get(self)->GetSelectionEndOffset();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domdocument_get_selection_as_markup(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMDocumentCppToC::Get(self)->GetSelectionAsMarkup();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMDocumentCppToC::Get(self)->GetSelectionAsMarkup();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domdocument_get_selection_as_text(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMDocumentCppToC::Get(self)->GetSelectionAsText();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMDocumentCppToC::Get(self)->GetSelectionAsText();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domdocument_get_base_url(
     struct _cef_domdocument_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMDocumentCppToC::Get(self)->GetBaseURL();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMDocumentCppToC::Get(self)->GetBaseURL();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domdocument_get_complete_url(
     struct _cef_domdocument_t* self, const cef_string_t* partialURL)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return NULL;
+  // Verify param: partialURL; type: string_byref_const
+  DCHECK(partialURL);
+  if (!partialURL)
     return NULL;
 
-  CefString str =
+  // Execute
-      CefDOMDocumentCppToC::Get(self)->GetCompleteURL(CefString(partialURL));
+  CefString _retval = CefDOMDocumentCppToC::Get(self)->GetCompleteURL(
-  return str.DetachToUserFree();
+      CefString(partialURL));
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDOMDocumentCppToC::CefDOMDocumentCppToC(CefDOMDocument* cls)

libcef_dll/cpptoc/domdocument_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DOMDOCUMENT_CPPTOC_H
 #define _DOMDOCUMENT_CPPTOC_H
 

libcef_dll/cpptoc/domevent_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,93 +20,140 @@
 cef_string_userfree_t CEF_CALLBACK domevent_get_type(
     struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMEventCppToC::Get(self)->GetType();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMEventCppToC::Get(self)->GetType();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 enum cef_dom_event_category_t CEF_CALLBACK domevent_get_category(
     struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return DOM_EVENT_CATEGORY_UNKNOWN;
 
-  return CefDOMEventCppToC::Get(self)->GetCategory();
+  // Execute
+  cef_dom_event_category_t _retval = CefDOMEventCppToC::Get(self)->GetCategory(
+      );
+
+  // Return type: simple
+  return _retval;
 }
 
+
 enum cef_dom_event_phase_t CEF_CALLBACK domevent_get_phase(
     struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return DOM_EVENT_PHASE_UNKNOWN;
 
-  return CefDOMEventCppToC::Get(self)->GetPhase();
+  // Execute
+  cef_dom_event_phase_t _retval = CefDOMEventCppToC::Get(self)->GetPhase();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK domevent_can_bubble(struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMEventCppToC::Get(self)->CanBubble();
+  // Execute
+  bool _retval = CefDOMEventCppToC::Get(self)->CanBubble();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK domevent_can_cancel(struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMEventCppToC::Get(self)->CanCancel();
+  // Execute
+  bool _retval = CefDOMEventCppToC::Get(self)->CanCancel();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_domdocument_t* CEF_CALLBACK domevent_get_document(
     struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMDocument> documentPtr =
+  // Execute
-      CefDOMEventCppToC::Get(self)->GetDocument();
+  CefRefPtr<CefDOMDocument> _retval = CefDOMEventCppToC::Get(self)->GetDocument(
-  if (documentPtr.get())
+      );
-    return CefDOMDocumentCppToC::Wrap(documentPtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMDocumentCppToC::Wrap(_retval);
 }
 
+
 cef_domnode_t* CEF_CALLBACK domevent_get_target(struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr = CefDOMEventCppToC::Get(self)->GetTarget();
+  // Execute
-  if (nodePtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMEventCppToC::Get(self)->GetTarget();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 cef_domnode_t* CEF_CALLBACK domevent_get_current_target(
     struct _cef_domevent_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr =
+  // Execute
-      CefDOMEventCppToC::Get(self)->GetCurrentTarget();
+  CefRefPtr<CefDOMNode> _retval = CefDOMEventCppToC::Get(
-  if (nodePtr.get())
+      self)->GetCurrentTarget();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDOMEventCppToC::CefDOMEventCppToC(CefDOMEvent* cls)

libcef_dll/cpptoc/domevent_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DOMEVENT_CPPTOC_H
 #define _DOMEVENT_CPPTOC_H
 

libcef_dll/cpptoc/domevent_listener_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,18 +19,23 @@
 void CEF_CALLBACK domevent_listener_handle_event(
     struct _cef_domevent_listener_t* self, cef_domevent_t* event)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: event; type: refptr_diff
+  DCHECK(event);
+  if (!event)
     return;
 
-  CefRefPtr<CefDOMEvent> eventPtr;
+  // Execute
-  if (event)
+  CefDOMEventListenerCppToC::Get(self)->HandleEvent(
-    eventPtr = CefDOMEventCToCpp::Wrap(event);
+      CefDOMEventCToCpp::Wrap(event));
-
-  CefDOMEventListenerCppToC::Get(self)->HandleEvent(eventPtr);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDOMEventListenerCppToC::CefDOMEventListenerCppToC(CefDOMEventListener* cls)

libcef_dll/cpptoc/domevent_listener_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DOMEVENTLISTENER_CPPTOC_H
 #define _DOMEVENTLISTENER_CPPTOC_H
 

libcef_dll/cpptoc/domnode_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,289 +21,474 @@
 enum cef_dom_node_type_t CEF_CALLBACK domnode_get_type(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return DOM_NODE_TYPE_UNSUPPORTED;
 
-  return CefDOMNodeCppToC::Get(self)->GetType();
+  // Execute
+  cef_dom_node_type_t _retval = CefDOMNodeCppToC::Get(self)->GetType();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK domnode_is_text(struct _cef_domnode_t* self)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(!self)
-    return 0;
 
-  return CefDOMNodeCppToC::Get(self)->IsText();
-}
-
-int CEF_CALLBACK domnode_is_element(struct _cef_domnode_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return 0;
-
-  return CefDOMNodeCppToC::Get(self)->IsElement();
-}
-
-int CEF_CALLBACK domnode_is_form_control_element(struct _cef_domnode_t* self)
-{
   DCHECK(self);
   if (!self)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->IsFormControlElement();
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->IsText();
+
+  // Return type: bool
+  return _retval;
 }
 
+
+int CEF_CALLBACK domnode_is_element(struct _cef_domnode_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->IsElement();
+
+  // Return type: bool
+  return _retval;
+}
+
+
+int CEF_CALLBACK domnode_is_form_control_element(struct _cef_domnode_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->IsFormControlElement();
+
+  // Return type: bool
+  return _retval;
+}
+
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_form_control_element_type(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDOMNodeCppToC::Get(self)->GetFormControlElementType();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetFormControlElementType();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 int CEF_CALLBACK domnode_is_same(struct _cef_domnode_t* self,
     struct _cef_domnode_t* that)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: that; type: refptr_same
   DCHECK(that);
-  if (!self || !that)
+  if (!that)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->IsSame(CefDOMNodeCppToC::Unwrap(that));
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->IsSame(
+      CefDOMNodeCppToC::Unwrap(that));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_name(struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMNodeCppToC::Get(self)->GetName();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetName();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_value(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMNodeCppToC::Get(self)->GetValue();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetValue();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 int CEF_CALLBACK domnode_set_value(struct _cef_domnode_t* self,
     const cef_string_t* value)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: value; type: string_byref_const
   DCHECK(value);
-  if(!self || !value)
+  if (!value)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->SetValue(CefString(value));
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->SetValue(
+      CefString(value));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_as_markup(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMNodeCppToC::Get(self)->GetAsMarkup();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetAsMarkup();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_domdocument_t* CEF_CALLBACK domnode_get_document(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMDocument> documentPtr =
+  // Execute
-      CefDOMNodeCppToC::Get(self)->GetDocument();
+  CefRefPtr<CefDOMDocument> _retval = CefDOMNodeCppToC::Get(self)->GetDocument(
-  if(documentPtr.get())
+      );
-    return CefDOMDocumentCppToC::Wrap(documentPtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMDocumentCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domnode_get_parent(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr = CefDOMNodeCppToC::Get(self)->GetParent();
+  // Execute
-  if(nodePtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMNodeCppToC::Get(self)->GetParent();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domnode_get_previous_sibling(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr =
+  // Execute
-      CefDOMNodeCppToC::Get(self)->GetPreviousSibling();
+  CefRefPtr<CefDOMNode> _retval = CefDOMNodeCppToC::Get(
-  if(nodePtr.get())
+      self)->GetPreviousSibling();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domnode_get_next_sibling(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr = CefDOMNodeCppToC::Get(self)->GetNextSibling();
+  // Execute
-  if(nodePtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMNodeCppToC::Get(self)->GetNextSibling();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 int CEF_CALLBACK domnode_has_children(struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->HasChildren();
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->HasChildren();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domnode_get_first_child(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr = CefDOMNodeCppToC::Get(self)->GetFirstChild();
+  // Execute
-  if(nodePtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMNodeCppToC::Get(self)->GetFirstChild();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 struct _cef_domnode_t* CEF_CALLBACK domnode_get_last_child(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefDOMNode> nodePtr = CefDOMNodeCppToC::Get(self)->GetLastChild();
+  // Execute
-  if(nodePtr.get())
+  CefRefPtr<CefDOMNode> _retval = CefDOMNodeCppToC::Get(self)->GetLastChild();
-    return CefDOMNodeCppToC::Wrap(nodePtr);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefDOMNodeCppToC::Wrap(_retval);
 }
 
+
 void CEF_CALLBACK domnode_add_event_listener(struct _cef_domnode_t* self,
     const cef_string_t* eventType, struct _cef_domevent_listener_t* listener,
     int useCapture)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: eventType; type: string_byref_const
   DCHECK(eventType);
+  if (!eventType)
+    return;
+  // Verify param: listener; type: refptr_diff
   DCHECK(listener);
-  if(!self || !eventType || !listener)
+  if (!listener)
     return;
 
-  CefDOMNodeCppToC::Get(self)->AddEventListener(CefString(eventType),
+  // Execute
-      CefDOMEventListenerCToCpp::Wrap(listener), useCapture?true:false);
+  CefDOMNodeCppToC::Get(self)->AddEventListener(
+      CefString(eventType),
+      CefDOMEventListenerCToCpp::Wrap(listener),
+      useCapture?true:false);
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_element_tag_name(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMNodeCppToC::Get(self)->GetElementTagName();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetElementTagName();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 int CEF_CALLBACK domnode_has_element_attributes(struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->HasElementAttributes();
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->HasElementAttributes();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK domnode_has_element_attribute(struct _cef_domnode_t* self,
     const cef_string_t* attrName)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: attrName; type: string_byref_const
   DCHECK(attrName);
-  if(!self || !attrName)
+  if (!attrName)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->HasElementAttribute(CefString(attrName));
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->HasElementAttribute(
+      CefString(attrName));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_element_attribute(
     struct _cef_domnode_t* self, const cef_string_t* attrName)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return NULL;
+  // Verify param: attrName; type: string_byref_const
   DCHECK(attrName);
-  if(!self || !attrName)
+  if (!attrName)
     return NULL;
 
-  CefString str =
+  // Execute
-      CefDOMNodeCppToC::Get(self)->GetElementAttribute(CefString(attrName));
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetElementAttribute(
-  return str.DetachToUserFree();
+      CefString(attrName));
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK domnode_get_element_attributes(struct _cef_domnode_t* self,
     cef_string_map_t attrMap)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: attrMap; type: string_map_single_byref
+  DCHECK(attrMap);
+  if (!attrMap)
     return;
 
-  CefDOMNode::AttributeMap map;
+  // Translate param: attrMap; type: string_map_single_byref
-  CefDOMNodeCppToC::Get(self)->GetElementAttributes(map);
+  std::map<CefString,CefString> attrMapMap;
-  transfer_string_map_contents(map, attrMap);
+  transfer_string_map_contents(attrMap, attrMapMap);
+
+  // Execute
+  CefDOMNodeCppToC::Get(self)->GetElementAttributes(
+      attrMapMap);
+
+  // Restore param: attrMap; type: string_map_single_byref
+  cef_string_map_clear(attrMap);
+  transfer_string_map_contents(attrMapMap, attrMap);
 }
 
+
 int CEF_CALLBACK domnode_set_element_attribute(struct _cef_domnode_t* self,
     const cef_string_t* attrName, const cef_string_t* value)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: attrName; type: string_byref_const
   DCHECK(attrName);
+  if (!attrName)
+    return 0;
+  // Verify param: value; type: string_byref_const
   DCHECK(value);
-  if(!self || !attrName || !value)
+  if (!value)
     return 0;
 
-  return CefDOMNodeCppToC::Get(self)->SetElementAttribute(CefString(attrName),
+  // Execute
+  bool _retval = CefDOMNodeCppToC::Get(self)->SetElementAttribute(
+      CefString(attrName),
       CefString(value));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK domnode_get_element_inner_text(
     struct _cef_domnode_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString str = CefDOMNodeCppToC::Get(self)->GetElementInnerText();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDOMNodeCppToC::Get(self)->GetElementInnerText();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDOMNodeCppToC::CefDOMNodeCppToC(CefDOMNode* cls)

libcef_dll/cpptoc/domnode_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DOMNODE_CPPTOC_H
 #define _DOMNODE_CPPTOC_H
 

libcef_dll/cpptoc/domvisitor_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,18 +19,23 @@
 void CEF_CALLBACK domvisitor_visit(struct _cef_domvisitor_t* self,
     struct _cef_domdocument_t* document)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: document; type: refptr_diff
+  DCHECK(document);
+  if (!document)
     return;
 
-  CefRefPtr<CefDOMDocument> documentPtr;
+  // Execute
-  if (document)
+  CefDOMVisitorCppToC::Get(self)->Visit(
-    documentPtr = CefDOMDocumentCToCpp::Wrap(document);
+      CefDOMDocumentCToCpp::Wrap(document));
-
-  CefDOMVisitorCppToC::Get(self)->Visit(documentPtr);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDOMVisitorCppToC::CefDOMVisitorCppToC(CefDOMVisitor* cls)

libcef_dll/cpptoc/domvisitor_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DOMVISITOR_CPPTOC_H
 #define _DOMVISITOR_CPPTOC_H
 

libcef_dll/cpptoc/download_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,24 +18,41 @@
 int CEF_CALLBACK download_handler_received_data(
     struct _cef_download_handler_t* self, void* data, int data_size)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: data; type: simple_byaddr
+  DCHECK(data);
+  if (!data)
     return 0;
 
-  return CefDownloadHandlerCppToC::Get(self)->ReceivedData(data, data_size);
+  // Execute
+  bool _retval = CefDownloadHandlerCppToC::Get(self)->ReceivedData(
+      data,
+      data_size);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK download_handler_complete(
     struct _cef_download_handler_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefDownloadHandlerCppToC::Get(self)->Complete();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDownloadHandlerCppToC::CefDownloadHandlerCppToC(CefDownloadHandler* cls)

libcef_dll/cpptoc/download_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DOWNLOADHANDLER_CPPTOC_H
 #define _DOWNLOADHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/drag_data_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,136 +18,219 @@
 
 int CEF_CALLBACK drag_data_is_link(struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return 0;
 
-  return CefDragDataCppToC::Get(self)->IsLink();
+  // Execute
+  bool _retval = CefDragDataCppToC::Get(self)->IsLink();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK drag_data_is_fragment(struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return 0;
 
-  return CefDragDataCppToC::Get(self)->IsFragment();
+  // Execute
+  bool _retval = CefDragDataCppToC::Get(self)->IsFragment();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK drag_data_is_file(struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return 0;
 
-  return CefDragDataCppToC::Get(self)->IsFile();
+  // Execute
+  bool _retval = CefDragDataCppToC::Get(self)->IsFile();
+
+  // Return type: bool
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_link_url(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetLinkURL();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetLinkURL();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_link_title(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetLinkTitle();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetLinkTitle();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_link_metadata(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetLinkMetadata();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetLinkMetadata();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_fragment_text(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetFragmentText();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetFragmentText();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_fragment_html(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetFragmentHtml();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetFragmentHtml();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_fragment_base_url(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetFragmentBaseURL();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetFragmentBaseURL();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_file_extension(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetFileExtension();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetFileExtension();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK drag_data_get_file_name(
     struct _cef_drag_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefString str = CefDragDataCppToC::Get(self)->GetFileName();
+  // Execute
-  return str.DetachToUserFree();
+  CefString _retval = CefDragDataCppToC::Get(self)->GetFileName();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 int CEF_CALLBACK drag_data_get_file_names(struct _cef_drag_data_t* self,
     cef_string_list_t names)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return 0;
+  // Verify param: names; type: string_vec_byref
+  DCHECK(names);
+  if (!names)
+    return 0;
 
-  StringList file_names;
+  // Translate param: names; type: string_vec_byref
-  if (CefDragDataCppToC::Get(self)->GetFileNames(file_names)) {
+  std::vector<CefString> namesList;
-    transfer_string_list_contents(file_names, names);
+  transfer_string_list_contents(names, namesList);
-    return 1;
-  }
 
-  return 0;
+  // Execute
+  bool _retval = CefDragDataCppToC::Get(self)->GetFileNames(
+      namesList);
+
+  // Restore param: names; type: string_vec_byref
+  cef_string_list_clear(names);
+  transfer_string_list_contents(namesList, names);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDragDataCppToC::CefDragDataCppToC(CefDragData* cls)

libcef_dll/cpptoc/drag_data_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DRAGDATA_CPPTOC_H
 #define _DRAGDATA_CPPTOC_H
 

libcef_dll/cpptoc/drag_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,31 +21,61 @@ int CEF_CALLBACK drag_handler_on_drag_start(struct _cef_drag_handler_t* self,
     cef_browser_t* browser, struct _cef_drag_data_t* dragData,
     enum cef_drag_operations_mask_t mask)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: dragData; type: refptr_diff
   DCHECK(dragData);
-  if (!self || !browser || !dragData)
+  if (!dragData)
     return 0;
 
-  return CefDragHandlerCppToC::Get(self)->OnDragStart(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), CefDragDataCToCpp::Wrap(dragData), mask);
+  bool _retval = CefDragHandlerCppToC::Get(self)->OnDragStart(
+      CefBrowserCToCpp::Wrap(browser),
+      CefDragDataCToCpp::Wrap(dragData),
+      mask);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK drag_handler_on_drag_enter(struct _cef_drag_handler_t* self,
     cef_browser_t* browser, struct _cef_drag_data_t* dragData,
     enum cef_drag_operations_mask_t mask)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: dragData; type: refptr_diff
   DCHECK(dragData);
-  if (!self || !browser || !dragData)
+  if (!dragData)
     return 0;
 
-  return CefDragHandlerCppToC::Get(self)->OnDragEnter(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), CefDragDataCToCpp::Wrap(dragData), mask);
+  bool _retval = CefDragHandlerCppToC::Get(self)->OnDragEnter(
+      CefBrowserCToCpp::Wrap(browser),
+      CefDragDataCToCpp::Wrap(dragData),
+      mask);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefDragHandlerCppToC::CefDragHandlerCppToC(CefDragHandler* cls)

libcef_dll/cpptoc/drag_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _DRAGHANDLER_CPPTOC_H
 #define _DRAGHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/find_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,19 +20,35 @@ void CEF_CALLBACK find_handler_on_find_result(struct _cef_find_handler_t* self,
     cef_browser_t* browser, int identifier, int count,
     const cef_rect_t* selectionRect, int activeMatchOrdinal, int finalUpdate)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: selectionRect; type: simple_byref_const
   DCHECK(selectionRect);
-  if (!self || !browser || !selectionRect)
+  if (!selectionRect)
     return;
 
-  CefRect rect(*selectionRect);
+  // Translate param: selectionRect; type: simple_byref_const
+  CefRect selectionRectVal = selectionRect?*selectionRect:CefRect();
+
+  // Execute
   CefFindHandlerCppToC::Get(self)->OnFindResult(
-      CefBrowserCToCpp::Wrap(browser), identifier, count, rect,
+      CefBrowserCToCpp::Wrap(browser),
-      activeMatchOrdinal, finalUpdate?true:false);
+      identifier,
+      count,
+      selectionRectVal,
+      activeMatchOrdinal,
+      finalUpdate?true:false);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefFindHandlerCppToC::CefFindHandlerCppToC(CefFindHandler* cls)

libcef_dll/cpptoc/find_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _FINDHANDLER_CPPTOC_H
 #define _FINDHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/focus_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,43 +21,70 @@
 void CEF_CALLBACK focus_handler_on_take_focus(struct _cef_focus_handler_t* self,
     cef_browser_t* browser, int next)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return;
 
+  // Execute
   CefFocusHandlerCppToC::Get(self)->OnTakeFocus(
-      CefBrowserCToCpp::Wrap(browser), next?true:false);
+      CefBrowserCToCpp::Wrap(browser),
+      next?true:false);
 }
 
+
 int CEF_CALLBACK focus_handler_on_set_focus(struct _cef_focus_handler_t* self,
     cef_browser_t* browser, enum cef_handler_focus_source_t source)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return 0;
 
-  return CefFocusHandlerCppToC::Get(self)->OnSetFocus(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), source);
+  bool _retval = CefFocusHandlerCppToC::Get(self)->OnSetFocus(
+      CefBrowserCToCpp::Wrap(browser),
+      source);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK focus_handler_on_focused_node_changed(
     struct _cef_focus_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, struct _cef_domnode_t* node)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  DCHECK(browser);
-  DCHECK(frame);
-  if (!self || !browser || !frame)
-    return;
 
-  return CefFocusHandlerCppToC::Get(self)->OnFocusedNodeChanged(
+  DCHECK(self);
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+  // Unverified params: frame, node
+
+  // Execute
+  CefFocusHandlerCppToC::Get(self)->OnFocusedNodeChanged(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
       CefDOMNodeCToCpp::Wrap(node));
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefFocusHandlerCppToC::CefFocusHandlerCppToC(CefFocusHandler* cls)

libcef_dll/cpptoc/focus_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _FOCUSHANDLER_CPPTOC_H
 #define _FOCUSHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/frame_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -22,238 +22,378 @@
 
 void CEF_CALLBACK frame_undo(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Undo();
 }
 
+
 void CEF_CALLBACK frame_redo(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Redo();
 }
 
+
 void CEF_CALLBACK frame_cut(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Cut();
 }
 
+
 void CEF_CALLBACK frame_copy(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Copy();
 }
 
+
 void CEF_CALLBACK frame_paste(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Paste();
 }
 
+
 void CEF_CALLBACK frame_del(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Delete();
 }
 
+
 void CEF_CALLBACK frame_select_all(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->SelectAll();
 }
 
+
 void CEF_CALLBACK frame_print(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->Print();
 }
 
+
 void CEF_CALLBACK frame_view_source(struct _cef_frame_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefFrameCppToC::Get(self)->ViewSource();
 }
 
+
 cef_string_userfree_t CEF_CALLBACK frame_get_source(struct _cef_frame_t* self)
 {
-  DCHECK(self);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(!self)
-    return NULL;
 
-  CefString sourceStr = CefFrameCppToC::Get(self)->GetSource();
-  return sourceStr.DetachToUserFree();
-}
-
-cef_string_userfree_t CEF_CALLBACK frame_get_text(struct _cef_frame_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return NULL;
-
-  CefString textStr = CefFrameCppToC::Get(self)->GetText();
-  return textStr.DetachToUserFree();
-}
-
-void CEF_CALLBACK frame_load_request(struct _cef_frame_t* self,
-    struct _cef_request_t* request)
-{
-  DCHECK(self);
-  DCHECK(request);
-  if(!self || !request)
-    return;
-
-  CefRefPtr<CefRequest> requestPtr = CefRequestCppToC::Unwrap(request);
-  CefFrameCppToC::Get(self)->LoadRequest(requestPtr);
-}
-
-void CEF_CALLBACK frame_load_url(struct _cef_frame_t* self,
-    const cef_string_t* url)
-{
-  DCHECK(self);
-  if(!self)
-    return;
-
-  CefFrameCppToC::Get(self)->LoadURL(CefString(url));
-}
-
-void CEF_CALLBACK frame_load_string(struct _cef_frame_t* self,
-    const cef_string_t* string, const cef_string_t* url)
-{
-  DCHECK(self);
-  if(!self)
-    return;
-
-  CefFrameCppToC::Get(self)->LoadString(CefString(string), CefString(url));
-}
-
-void CEF_CALLBACK frame_load_stream(struct _cef_frame_t* self,
-    struct _cef_stream_reader_t* stream, const cef_string_t* url)
-{
-  DCHECK(self);
-  DCHECK(stream);
-  if(!self || !stream)
-    return;
-
-  CefFrameCppToC::Get(self)->LoadStream(CefStreamReaderCppToC::Unwrap(stream),
-      CefString(url));
-}
-
-void CEF_CALLBACK frame_execute_java_script(struct _cef_frame_t* self,
-    const cef_string_t* jsCode, const cef_string_t* scriptUrl, int startLine)
-{
-  DCHECK(self);
-  if(!self)
-    return;
-
-  CefFrameCppToC::Get(self)->ExecuteJavaScript(CefString(jsCode),
-      CefString(scriptUrl), startLine);
-}
-
-int CEF_CALLBACK frame_is_main(struct _cef_frame_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return 0;
-
-  return CefFrameCppToC::Get(self)->IsMain();
-}
-
-int CEF_CALLBACK frame_is_focused(struct _cef_frame_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return 0;
-
-  return CefFrameCppToC::Get(self)->IsFocused();
-}
-
-cef_string_userfree_t CEF_CALLBACK frame_get_name(struct _cef_frame_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return 0;
-
-  CefString nameStr = CefFrameCppToC::Get(self)->GetName();
-  return nameStr.DetachToUserFree();
-}
-
-cef_string_userfree_t CEF_CALLBACK frame_get_url(struct _cef_frame_t* self)
-{
-  DCHECK(self);
-  if(!self)
-    return NULL;
-
-  CefString urlStr = CefFrameCppToC::Get(self)->GetURL();
-  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;
-}
-
-void CEF_CALLBACK frame_visit_dom(struct _cef_frame_t* self,
-    struct _cef_domvisitor_t* visitor)
-{
-  DCHECK(self);
-  DCHECK(visitor);
-  if(!self || !visitor)
-    return;
-
-  CefFrameCppToC::Get(self)->VisitDOM(CefDOMVisitorCToCpp::Wrap(visitor));
-}
-
-struct _cef_v8context_t* CEF_CALLBACK frame_get_v8context(
-    struct _cef_frame_t* self)
-{
   DCHECK(self);
   if (!self)
     return NULL;
 
-  CefRefPtr<CefFrame> framePtr = CefFrameCppToC::Get(self);
+  // Execute
-  CefRefPtr<CefV8Context> v8ContextPtr = framePtr->GetV8Context();
+  CefString _retval = CefFrameCppToC::Get(self)->GetSource();
-  if (v8ContextPtr.get())
-    return CefV8ContextCppToC::Wrap(v8ContextPtr);
 
-  return NULL;
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
 
+cef_string_userfree_t CEF_CALLBACK frame_get_text(struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefFrameCppToC::Get(self)->GetText();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+
+void CEF_CALLBACK frame_load_request(struct _cef_frame_t* self,
+    struct _cef_request_t* request)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: request; type: refptr_same
+  DCHECK(request);
+  if (!request)
+    return;
+
+  // Execute
+  CefFrameCppToC::Get(self)->LoadRequest(
+      CefRequestCppToC::Unwrap(request));
+}
+
+
+void CEF_CALLBACK frame_load_url(struct _cef_frame_t* self,
+    const cef_string_t* url)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
+    return;
+
+  // Execute
+  CefFrameCppToC::Get(self)->LoadURL(
+      CefString(url));
+}
+
+
+void CEF_CALLBACK frame_load_string(struct _cef_frame_t* self,
+    const cef_string_t* string, const cef_string_t* url)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: string; type: string_byref_const
+  DCHECK(string);
+  if (!string)
+    return;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
+    return;
+
+  // Execute
+  CefFrameCppToC::Get(self)->LoadString(
+      CefString(string),
+      CefString(url));
+}
+
+
+void CEF_CALLBACK frame_load_stream(struct _cef_frame_t* self,
+    struct _cef_stream_reader_t* stream, const cef_string_t* url)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: stream; type: refptr_same
+  DCHECK(stream);
+  if (!stream)
+    return;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
+    return;
+
+  // Execute
+  CefFrameCppToC::Get(self)->LoadStream(
+      CefStreamReaderCppToC::Unwrap(stream),
+      CefString(url));
+}
+
+
+void CEF_CALLBACK frame_execute_java_script(struct _cef_frame_t* self,
+    const cef_string_t* jsCode, const cef_string_t* scriptUrl, int startLine)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: jsCode; type: string_byref_const
+  DCHECK(jsCode);
+  if (!jsCode)
+    return;
+  // Unverified params: scriptUrl
+
+  // Execute
+  CefFrameCppToC::Get(self)->ExecuteJavaScript(
+      CefString(jsCode),
+      CefString(scriptUrl),
+      startLine);
+}
+
+
+int CEF_CALLBACK frame_is_main(struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefFrameCppToC::Get(self)->IsMain();
+
+  // Return type: bool
+  return _retval;
+}
+
+
+int CEF_CALLBACK frame_is_focused(struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefFrameCppToC::Get(self)->IsFocused();
+
+  // Return type: bool
+  return _retval;
+}
+
+
+cef_string_userfree_t CEF_CALLBACK frame_get_name(struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefFrameCppToC::Get(self)->GetName();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+
+cef_string_userfree_t CEF_CALLBACK frame_get_url(struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefFrameCppToC::Get(self)->GetURL();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+
+cef_browser_t* CEF_CALLBACK frame_get_browser(struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefBrowser> _retval = CefFrameCppToC::Get(self)->GetBrowser();
+
+  // Return type: refptr_same
+  return CefBrowserCppToC::Wrap(_retval);
+}
+
+
+void CEF_CALLBACK frame_visit_dom(struct _cef_frame_t* self,
+    struct _cef_domvisitor_t* visitor)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: visitor; type: refptr_diff
+  DCHECK(visitor);
+  if (!visitor)
+    return;
+
+  // Execute
+  CefFrameCppToC::Get(self)->VisitDOM(
+      CefDOMVisitorCToCpp::Wrap(visitor));
+}
+
+
+struct _cef_v8context_t* CEF_CALLBACK frame_get_v8context(
+    struct _cef_frame_t* self)
+{
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefV8Context> _retval = CefFrameCppToC::Get(self)->GetV8Context();
+
+  // Return type: refptr_same
+  return CefV8ContextCppToC::Wrap(_retval);
+}
+
+
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefFrameCppToC::CefFrameCppToC(CefFrame* cls)

libcef_dll/cpptoc/frame_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _FRAME_CPPTOC_H
 #define _FRAME_CPPTOC_H
 

libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,66 +21,139 @@ int CEF_CALLBACK jsdialog_handler_on_jsalert(
     struct _cef_jsdialog_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, const cef_string_t* message)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: message; type: string_byref_const
   DCHECK(message);
-  if (!self || !browser || !frame || !message)
+  if (!message)
     return 0;
 
-  return CefJSDialogHandlerCppToC::Get(self)->OnJSAlert(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
+  bool _retval = CefJSDialogHandlerCppToC::Get(self)->OnJSAlert(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
       CefString(message));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK jsdialog_handler_on_jsconfirm(
     struct _cef_jsdialog_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, const cef_string_t* message, int* retval)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: message; type: string_byref_const
   DCHECK(message);
+  if (!message)
+    return 0;
+  // Verify param: retval; type: bool_byref
   DCHECK(retval);
-  if (!self || !browser || !frame || !message || !retval)
+  if (!retval)
     return 0;
 
-  bool ret = false;
+  // Translate param: retval; type: bool_byref
-  int rv = CefJSDialogHandlerCppToC::Get(self)->OnJSConfirm(
+  bool retvalBool = (retval && *retval)?true:false;
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
-      CefString(message), ret);
-  *retval = (ret ? 1 : 0);
 
-  return rv;
+  // Execute
+  bool _retval = CefJSDialogHandlerCppToC::Get(self)->OnJSConfirm(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      CefString(message),
+      retvalBool);
+
+  // Restore param: retval; type: bool_byref
+  if (retval)
+    *retval = retvalBool?true:false;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK jsdialog_handler_on_jsprompt(
     struct _cef_jsdialog_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, const cef_string_t* message,
     const cef_string_t* defaultValue, int* retval, cef_string_t* result)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: message; type: string_byref_const
   DCHECK(message);
+  if (!message)
+    return 0;
+  // Verify param: defaultValue; type: string_byref_const
   DCHECK(defaultValue);
+  if (!defaultValue)
+    return 0;
+  // Verify param: retval; type: bool_byref
   DCHECK(retval);
+  if (!retval)
+    return 0;
+  // Verify param: result; type: string_byref
   DCHECK(result);
-  if (!self || !browser || !frame || !message || !defaultValue || !retval ||
+  if (!result)
-      !result)
     return 0;
 
-  bool ret = false;
+  // Translate param: retval; type: bool_byref
+  bool retvalBool = (retval && *retval)?true:false;
+  // Translate param: result; type: string_byref
   CefString resultStr(result);
-  int rv = CefJSDialogHandlerCppToC::Get(self)->OnJSPrompt(
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
-      CefString(message), CefString(defaultValue), ret, resultStr);
-  *retval = (ret ? 1 : 0);
 
-  return rv;
+  // Execute
+  bool _retval = CefJSDialogHandlerCppToC::Get(self)->OnJSPrompt(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      CefString(message),
+      CefString(defaultValue),
+      retvalBool,
+      resultStr);
+
+  // Restore param: retval; type: bool_byref
+  if (retval)
+    *retval = retvalBool?true:false;
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefJSDialogHandlerCppToC::CefJSDialogHandlerCppToC(CefJSDialogHandler* cls)

libcef_dll/cpptoc/jsdialog_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _JSDIALOGHANDLER_CPPTOC_H
 #define _JSDIALOGHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/keyboard_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,17 +21,31 @@ int CEF_CALLBACK keyboard_handler_on_key_event(
     enum cef_handler_keyevent_type_t type, int code, int modifiers,
     int isSystemKey, int isAfterJavaScript)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return 0;
 
-  return CefKeyboardHandlerCppToC::Get(self)->OnKeyEvent(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), type, code,
+  bool _retval = CefKeyboardHandlerCppToC::Get(self)->OnKeyEvent(
-      modifiers, isSystemKey?true:false, isAfterJavaScript?true:false);
+      CefBrowserCToCpp::Wrap(browser),
+      type,
+      code,
+      modifiers,
+      isSystemKey?true:false,
+      isAfterJavaScript?true:false);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefKeyboardHandlerCppToC::CefKeyboardHandlerCppToC(CefKeyboardHandler* cls)

libcef_dll/cpptoc/keyboard_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _KEYBOARDHANDLER_CPPTOC_H
 #define _KEYBOARDHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/life_span_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -23,105 +23,168 @@ int CEF_CALLBACK life_span_handler_on_before_popup(
     cef_window_info_t* windowInfo, const cef_string_t* url,
     struct _cef_client_t** client, struct _cef_browser_settings_t* settings)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: parentBrowser; type: refptr_diff
   DCHECK(parentBrowser);
+  if (!parentBrowser)
+    return 0;
+  // Verify param: popupFeatures; type: struct_byref_const
   DCHECK(popupFeatures);
+  if (!popupFeatures)
+    return 0;
+  // Verify param: windowInfo; type: struct_byref
   DCHECK(windowInfo);
+  if (!windowInfo)
+    return 0;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
+    return 0;
+  // Verify param: client; type: refptr_same_byref
   DCHECK(client);
+  if (!client)
+    return 0;
+  // Verify param: settings; type: struct_byref
   DCHECK(settings);
-  if (!self || !parentBrowser || !popupFeatures || !windowInfo || !client ||
+  if (!settings)
-      !settings)
     return 0;
 
-  CefWindowInfo wndInfo;
+  // Translate param: popupFeatures; type: struct_byref_const
-  CefBrowserSettings browserSettings;
+  CefPopupFeatures popupFeaturesObj;
-  CefPopupFeatures features;
+  if (popupFeatures)
-
+    popupFeaturesObj.Set(*popupFeatures, false);
-  // Take ownership of the values.
+  // Translate param: windowInfo; type: struct_byref
-  wndInfo.AttachTo(*windowInfo);
+  CefWindowInfo windowInfoObj;
-  browserSettings.AttachTo(*settings);
+  if (windowInfo)
-
+    windowInfoObj.AttachTo(*windowInfo);
-  // Reference the existing values instead of copying.
+  // Translate param: client; type: refptr_same_byref
-  features.Set(*popupFeatures, false);
-
-  // |newHandler| will start off pointing to the current handler.
   CefRefPtr<CefClient> clientPtr;
-  if (*client)
+  if (client && *client)
     clientPtr = CefClientCppToC::Unwrap(*client);
-  CefClient* origClient = clientPtr.get();
+  CefClient* clientOrig = clientPtr.get();
+  // Translate param: settings; type: struct_byref
+  CefBrowserSettings settingsObj;
+  if (settings)
+    settingsObj.AttachTo(*settings);
 
-  // |parentBrowser| will be NULL if this is a top-level browser window.
+  // Execute
-  CefRefPtr<CefBrowser> browserPtr(CefBrowserCToCpp::Wrap(parentBrowser));
+  bool _retval = CefLifeSpanHandlerCppToC::Get(self)->OnBeforePopup(
+      CefBrowserCToCpp::Wrap(parentBrowser),
+      popupFeaturesObj,
+      windowInfoObj,
+      CefString(url),
+      clientPtr,
+      settingsObj);
 
-  bool rv = CefLifeSpanHandlerCppToC::Get(self)->OnBeforePopup(
+  // Restore param: windowInfo; type: struct_byref
-      browserPtr, features, wndInfo, CefString(url), clientPtr,
+  if (windowInfo)
-      browserSettings);
+    windowInfoObj.DetachTo(*windowInfo);
-
+  // Restore param: client; type: refptr_same_byref
-  if (clientPtr.get()) {
+  if (client) {
-    if (clientPtr.get() != origClient) {
+    if (clientPtr.get()) {
-      // The handler has been changed.
+      if (clientPtr.get() != clientOrig) {
-      *client = CefClientCppToC::Wrap(clientPtr);
+        *client = CefClientCppToC::Wrap(clientPtr);
+      }
+    } else {
+      *client = NULL;
     }
-  } else {
-    *client = NULL;
   }
+  // Restore param: settings; type: struct_byref
+  if (settings)
+    settingsObj.DetachTo(*settings);
 
-  // Return the values to the structures.
+  // Return type: bool
-  wndInfo.DetachTo(*windowInfo);
+  return _retval;
-  browserSettings.DetachTo(*settings);
-
-  return rv;
 }
 
+
 void CEF_CALLBACK life_span_handler_on_after_created(
     struct _cef_life_span_handler_t* self, cef_browser_t* browser)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return;
 
+  // Execute
   CefLifeSpanHandlerCppToC::Get(self)->OnAfterCreated(
       CefBrowserCToCpp::Wrap(browser));
 }
 
+
 int CEF_CALLBACK life_span_handler_run_modal(
     struct _cef_life_span_handler_t* self, cef_browser_t* browser)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return 0;
 
-  return CefLifeSpanHandlerCppToC::Get(self)->RunModal(
+  // Execute
+  bool _retval = CefLifeSpanHandlerCppToC::Get(self)->RunModal(
       CefBrowserCToCpp::Wrap(browser));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK life_span_handler_do_close(
     struct _cef_life_span_handler_t* self, cef_browser_t* browser)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return 0;
 
-  return CefLifeSpanHandlerCppToC::Get(self)->DoClose(
+  // Execute
+  bool _retval = CefLifeSpanHandlerCppToC::Get(self)->DoClose(
       CefBrowserCToCpp::Wrap(browser));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK life_span_handler_on_before_close(
     struct _cef_life_span_handler_t* self, cef_browser_t* browser)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return;
 
+  // Execute
   CefLifeSpanHandlerCppToC::Get(self)->OnBeforeClose(
       CefBrowserCToCpp::Wrap(browser));
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefLifeSpanHandlerCppToC::CefLifeSpanHandlerCppToC(CefLifeSpanHandler* cls)

libcef_dll/cpptoc/life_span_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _LIFESPANHANDLER_CPPTOC_H
 #define _LIFESPANHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/load_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,50 +20,96 @@
 void CEF_CALLBACK load_handler_on_load_start(struct _cef_load_handler_t* self,
     cef_browser_t* browser, cef_frame_t* frame)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
-  if (!self || !browser || !frame)
+  if (!frame)
     return;
 
+  // Execute
   CefLoadHandlerCppToC::Get(self)->OnLoadStart(
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame));
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame));
 }
 
+
 void CEF_CALLBACK load_handler_on_load_end(struct _cef_load_handler_t* self,
     cef_browser_t* browser, cef_frame_t* frame, int httpStatusCode)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
-  if (!self || !browser || !frame)
+  if (!frame)
     return;
 
+  // Execute
   CefLoadHandlerCppToC::Get(self)->OnLoadEnd(
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
       httpStatusCode);
 }
 
+
 int CEF_CALLBACK load_handler_on_load_error(struct _cef_load_handler_t* self,
     cef_browser_t* browser, cef_frame_t* frame,
     enum cef_handler_errorcode_t errorCode, const cef_string_t* failedUrl,
     cef_string_t* errorText)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: failedUrl; type: string_byref_const
   DCHECK(failedUrl);
+  if (!failedUrl)
+    return 0;
+  // Verify param: errorText; type: string_byref
   DCHECK(errorText);
-  if (!self || !browser || !frame || !failedUrl || !errorText)
+  if (!errorText)
     return 0;
 
+  // Translate param: errorText; type: string_byref
   CefString errorTextStr(errorText);
-  return CefLoadHandlerCppToC::Get(self)->OnLoadError(
+
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame), errorCode,
+  // Execute
-      CefString(failedUrl), errorTextStr);
+  bool _retval = CefLoadHandlerCppToC::Get(self)->OnLoadError(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      errorCode,
+      CefString(failedUrl),
+      errorTextStr);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefLoadHandlerCppToC::CefLoadHandlerCppToC(CefLoadHandler* cls)

libcef_dll/cpptoc/load_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _LOADHANDLER_CPPTOC_H
 #define _LOADHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/menu_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -17,46 +17,89 @@
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 int CEF_CALLBACK menu_handler_on_before_menu(struct _cef_menu_handler_t* self,
-    cef_browser_t* browser, const cef_handler_menuinfo_t* menuInfo)
+    cef_browser_t* browser, const struct _cef_menu_info_t* menuInfo)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: menuInfo; type: struct_byref_const
   DCHECK(menuInfo);
-  if (!self || !browser || !menuInfo)
+  if (!menuInfo)
     return 0;
 
-  return CefMenuHandlerCppToC::Get(self)->OnBeforeMenu(
+  // Translate param: menuInfo; type: struct_byref_const
-      CefBrowserCToCpp::Wrap(browser), *menuInfo);
+  CefMenuInfo menuInfoObj;
+  if (menuInfo)
+    menuInfoObj.Set(*menuInfo, false);
+
+  // Execute
+  bool _retval = CefMenuHandlerCppToC::Get(self)->OnBeforeMenu(
+      CefBrowserCToCpp::Wrap(browser),
+      menuInfoObj);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK menu_handler_get_menu_label(struct _cef_menu_handler_t* self,
-    cef_browser_t* browser, enum cef_handler_menuid_t menuId,
+    cef_browser_t* browser, enum cef_menu_id_t menuId, cef_string_t* label)
-    cef_string_t* label)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: label; type: string_byref
   DCHECK(label);
-  if (!self || !browser || !label)
+  if (!label)
     return;
 
+  // Translate param: label; type: string_byref
   CefString labelStr(label);
+
+  // Execute
   CefMenuHandlerCppToC::Get(self)->GetMenuLabel(
-      CefBrowserCToCpp::Wrap(browser), menuId, labelStr);
+      CefBrowserCToCpp::Wrap(browser),
+      menuId,
+      labelStr);
 }
 
+
 int CEF_CALLBACK menu_handler_on_menu_action(struct _cef_menu_handler_t* self,
-    cef_browser_t* browser, enum cef_handler_menuid_t menuId)
+    cef_browser_t* browser, enum cef_menu_id_t menuId)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return 0;
 
-  return CefMenuHandlerCppToC::Get(self)->OnMenuAction(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), menuId);
+  bool _retval = CefMenuHandlerCppToC::Get(self)->OnMenuAction(
+      CefBrowserCToCpp::Wrap(browser),
+      menuId);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefMenuHandlerCppToC::CefMenuHandlerCppToC(CefMenuHandler* cls)

libcef_dll/cpptoc/menu_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _MENUHANDLER_CPPTOC_H
 #define _MENUHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/post_data_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,76 +18,130 @@
 
 CEF_EXPORT cef_post_data_t* cef_post_data_create()
 {
-  CefRefPtr<CefPostData> impl = CefPostData::CreatePostData();
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(impl.get())
+
-    return CefPostDataCppToC::Wrap(impl);
+  // Execute
-  return NULL;
+  CefRefPtr<CefPostData> _retval = CefPostData::CreatePostData();
+
+  // Return type: refptr_same
+  return CefPostDataCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 size_t CEF_CALLBACK post_data_get_element_count(struct _cef_post_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefPostDataCppToC::Get(self)->GetElementCount();
+  // Execute
+  size_t _retval = CefPostDataCppToC::Get(self)->GetElementCount();
+
+  // Return type: simple
+  return _retval;
 }
 
-struct _cef_post_data_element_t* CEF_CALLBACK post_data_get_elements(
+
-    struct _cef_post_data_t* self, int elementIndex)
+void CEF_CALLBACK post_data_get_elements(struct _cef_post_data_t* self,
+    size_t* elementsCount, struct _cef_post_data_element_t** elements)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
-    return NULL;
+    return;
+  // Verify param: elements; type: refptr_vec_same_byref
+  DCHECK(elementsCount && (*elementsCount == 0 || elements));
+  if (!elementsCount || (*elementsCount > 0 && !elements))
+    return;
 
-  CefPostData::ElementVector elements;
+  // Translate param: elements; type: refptr_vec_same_byref
-  CefPostDataCppToC::Get(self)->GetElements(elements);
+  std::vector<CefRefPtr<CefPostDataElement> > elementsList;
+  if (elementsCount && *elementsCount > 0 && elements) {
+    for (size_t i = 0; i < *elementsCount; ++i) {
+      elementsList.push_back(CefPostDataElementCppToC::Unwrap(elements[i]));
+    }
+  }
 
-  if(elementIndex < 0 || elementIndex >= (int)elements.size())
+  // Execute
-    return NULL;
+  CefPostDataCppToC::Get(self)->GetElements(
+      elementsList);
 
-  return CefPostDataElementCppToC::Wrap(elements[elementIndex]);
+  // Restore param: elements; type: refptr_vec_same_byref
+  if (elementsCount && elements) {
+    *elementsCount = std::min(elementsList.size(), *elementsCount);
+    if (*elementsCount > 0) {
+      for (size_t i = 0; i < *elementsCount; ++i) {
+        elements[i] = CefPostDataElementCppToC::Wrap(elementsList[i]);
+      }
+    }
+  }
 }
 
+
 int CEF_CALLBACK post_data_remove_element(struct _cef_post_data_t* self,
     struct _cef_post_data_element_t* element)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: element; type: refptr_same
   DCHECK(element);
-  if(!self || !element)
+  if (!element)
     return 0;
 
-  CefRefPtr<CefPostDataElement> selfElementPtr =
+  // Execute
-      CefPostDataElementCppToC::Unwrap(element);
+  bool _retval = CefPostDataCppToC::Get(self)->RemoveElement(
-  return CefPostDataCppToC::Get(self)->RemoveElement(selfElementPtr);
+      CefPostDataElementCppToC::Unwrap(element));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK post_data_add_element(struct _cef_post_data_t* self,
     struct _cef_post_data_element_t* element)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: element; type: refptr_same
   DCHECK(element);
-  if(!self || !element)
+  if (!element)
     return 0;
 
-  CefRefPtr<CefPostDataElement> selfElementPtr =
+  // Execute
-      CefPostDataElementCppToC::Unwrap(element);
+  bool _retval = CefPostDataCppToC::Get(self)->AddElement(
-  return CefPostDataCppToC::Get(self)->AddElement(selfElementPtr);
+      CefPostDataElementCppToC::Unwrap(element));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK post_data_remove_elements(struct _cef_post_data_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefPostDataCppToC::Get(self)->RemoveElements();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefPostDataCppToC::CefPostDataCppToC(CefPostData* cls)

libcef_dll/cpptoc/post_data_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _POSTDATA_CPPTOC_H
 #define _POSTDATA_CPPTOC_H
 

libcef_dll/cpptoc/post_data_element_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -17,88 +17,149 @@
 
 CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create()
 {
-  CefRefPtr<CefPostDataElement> impl =
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Execute
+  CefRefPtr<CefPostDataElement> _retval =
       CefPostDataElement::CreatePostDataElement();
-  if(impl.get())
+
-    return CefPostDataElementCppToC::Wrap(impl);
+  // Return type: refptr_same
-  return NULL;
+  return CefPostDataElementCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 void CEF_CALLBACK post_data_element_set_to_empty(
     struct _cef_post_data_element_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefPostDataElementCppToC::Get(self)->SetToEmpty();
 }
 
+
 void CEF_CALLBACK post_data_element_set_to_file(
     struct _cef_post_data_element_t* self, const cef_string_t* fileName)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: fileName; type: string_byref_const
+  DCHECK(fileName);
+  if (!fileName)
     return;
 
-  CefPostDataElementCppToC::Get(self)->SetToFile(CefString(fileName));
+  // Execute
+  CefPostDataElementCppToC::Get(self)->SetToFile(
+      CefString(fileName));
 }
 
+
 void CEF_CALLBACK post_data_element_set_to_bytes(
     struct _cef_post_data_element_t* self, size_t size, const void* bytes)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: bytes; type: simple_byaddr
+  DCHECK(bytes);
+  if (!bytes)
     return;
 
-  CefPostDataElementCppToC::Get(self)->SetToBytes(size, bytes);
+  // Execute
+  CefPostDataElementCppToC::Get(self)->SetToBytes(
+      size,
+      bytes);
 }
 
+
 enum cef_postdataelement_type_t CEF_CALLBACK post_data_element_get_type(
     struct _cef_post_data_element_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return PDE_TYPE_EMPTY;
 
-  return CefPostDataElementCppToC::Get(self)->GetType();
+  // Execute
+  cef_postdataelement_type_t _retval = CefPostDataElementCppToC::Get(
+      self)->GetType();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 cef_string_userfree_t CEF_CALLBACK post_data_element_get_file(
     struct _cef_post_data_element_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString fileNameStr = CefPostDataElementCppToC::Get(self)->GetFile();
+  // Execute
-  return fileNameStr.DetachToUserFree();
+  CefString _retval = CefPostDataElementCppToC::Get(self)->GetFile();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 size_t CEF_CALLBACK post_data_element_get_bytes_count(
     struct _cef_post_data_element_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefPostDataElementCppToC::Get(self)->GetBytesCount();
+  // Execute
+  size_t _retval = CefPostDataElementCppToC::Get(self)->GetBytesCount();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 size_t CEF_CALLBACK post_data_element_get_bytes(
     struct _cef_post_data_element_t* self, size_t size, void* bytes)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: bytes; type: simple_byaddr
+  DCHECK(bytes);
+  if (!bytes)
     return 0;
 
-  return CefPostDataElementCppToC::Get(self)->GetBytes(size, bytes);
+  // Execute
+  size_t _retval = CefPostDataElementCppToC::Get(self)->GetBytes(
+      size,
+      bytes);
+
+  // Return type: simple
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefPostDataElementCppToC::CefPostDataElementCppToC(CefPostDataElement* cls)

libcef_dll/cpptoc/post_data_element_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _POSTDATAELEMENT_CPPTOC_H
 #define _POSTDATAELEMENT_CPPTOC_H
 

libcef_dll/cpptoc/print_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -21,16 +21,39 @@ int CEF_CALLBACK print_handler_get_print_options(
     struct _cef_print_handler_t* self, cef_browser_t* browser,
     struct _cef_print_options_t* printOptions)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: printOptions; type: struct_byref
   DCHECK(printOptions);
-  if (!self || !browser || !printOptions)
+  if (!printOptions)
     return 0;
 
-  return CefPrintHandlerCppToC::Get(self)->GetPrintOptions(
+  // Translate param: printOptions; type: struct_byref
-      CefBrowserCToCpp::Wrap(browser), *printOptions);
+  CefPrintOptions printOptionsObj;
+  if (printOptions)
+    printOptionsObj.AttachTo(*printOptions);
+
+  // Execute
+  bool _retval = CefPrintHandlerCppToC::Get(self)->GetPrintOptions(
+      CefBrowserCToCpp::Wrap(browser),
+      printOptionsObj);
+
+  // Restore param: printOptions; type: struct_byref
+  if (printOptions)
+    printOptionsObj.DetachTo(*printOptions);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK print_handler_get_print_header_footer(
     struct _cef_print_handler_t* self, cef_browser_t* browser,
     cef_frame_t* frame, const cef_print_info_t* printInfo,
@@ -39,36 +62,95 @@ int CEF_CALLBACK print_handler_get_print_header_footer(
     cef_string_t* topRight, cef_string_t* bottomLeft,
     cef_string_t* bottomCenter, cef_string_t* bottomRight)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: printInfo; type: struct_byref_const
   DCHECK(printInfo);
+  if (!printInfo)
+    return 0;
+  // Verify param: url; type: string_byref_const
   DCHECK(url);
+  if (!url)
+    return 0;
+  // Verify param: title; type: string_byref_const
   DCHECK(title);
+  if (!title)
+    return 0;
+  // Verify param: topLeft; type: string_byref
   DCHECK(topLeft);
+  if (!topLeft)
+    return 0;
+  // Verify param: topCenter; type: string_byref
   DCHECK(topCenter);
+  if (!topCenter)
+    return 0;
+  // Verify param: topRight; type: string_byref
   DCHECK(topRight);
+  if (!topRight)
+    return 0;
+  // Verify param: bottomLeft; type: string_byref
   DCHECK(bottomLeft);
+  if (!bottomLeft)
+    return 0;
+  // Verify param: bottomCenter; type: string_byref
   DCHECK(bottomCenter);
+  if (!bottomCenter)
+    return 0;
+  // Verify param: bottomRight; type: string_byref
   DCHECK(bottomRight);
-  if (!self || !browser || !frame || !printInfo || !url || !title || !topLeft ||
+  if (!bottomRight)
-      !topCenter || !topRight || !bottomLeft || !bottomCenter || !bottomRight)
     return 0;
 
+  // Translate param: printInfo; type: struct_byref_const
+  CefPrintInfo printInfoObj;
+  if (printInfo)
+    printInfoObj.Set(*printInfo, false);
+  // Translate param: topLeft; type: string_byref
   CefString topLeftStr(topLeft);
+  // Translate param: topCenter; type: string_byref
   CefString topCenterStr(topCenter);
+  // Translate param: topRight; type: string_byref
   CefString topRightStr(topRight);
+  // Translate param: bottomLeft; type: string_byref
   CefString bottomLeftStr(bottomLeft);
+  // Translate param: bottomCenter; type: string_byref
   CefString bottomCenterStr(bottomCenter);
+  // Translate param: bottomRight; type: string_byref
   CefString bottomRightStr(bottomRight);
-  return CefPrintHandlerCppToC::Get(self)->GetPrintHeaderFooter(
+
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame), *printInfo,
+  // Execute
-      CefString(url), CefString(title), currentPage, maxPages, topLeftStr,
+  bool _retval = CefPrintHandlerCppToC::Get(self)->GetPrintHeaderFooter(
-      topCenterStr, topRightStr, bottomLeftStr, bottomCenterStr,
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      printInfoObj,
+      CefString(url),
+      CefString(title),
+      currentPage,
+      maxPages,
+      topLeftStr,
+      topCenterStr,
+      topRightStr,
+      bottomLeftStr,
+      bottomCenterStr,
       bottomRightStr);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefPrintHandlerCppToC::CefPrintHandlerCppToC(CefPrintHandler* cls)

libcef_dll/cpptoc/print_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _PRINTHANDLER_CPPTOC_H
 #define _PRINTHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/proxy_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,24 +19,37 @@ void CEF_CALLBACK proxy_handler_get_proxy_for_url(
     struct _cef_proxy_handler_t* self, const cef_string_t* url,
     struct _cef_proxy_info_t* proxy_info)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: url; type: string_byref_const
   DCHECK(url);
+  if (!url)
+    return;
+  // Verify param: proxy_info; type: struct_byref
   DCHECK(proxy_info);
-  if (!self || !url || !proxy_info)
+  if (!proxy_info)
     return;
 
-  CefProxyInfo info;
+  // Translate param: proxy_info; type: struct_byref
+  CefProxyInfo proxy_infoObj;
+  if (proxy_info)
+    proxy_infoObj.AttachTo(*proxy_info);
 
-  // Take ownership of the values.
+  // Execute
-  info.AttachTo(*proxy_info);
+  CefProxyHandlerCppToC::Get(self)->GetProxyForUrl(
+      CefString(url),
+      proxy_infoObj);
 
-  CefProxyHandlerCppToC::Get(self)->GetProxyForUrl(CefString(url), info);
+  // Restore param: proxy_info; type: struct_byref
-
+  if (proxy_info)
-  // Return the values to the structure.
+    proxy_infoObj.DetachTo(*proxy_info);
-  info.DetachTo(*proxy_info);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefProxyHandlerCppToC::CefProxyHandlerCppToC(CefProxyHandler* cls)

libcef_dll/cpptoc/proxy_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _PROXYHANDLER_CPPTOC_H
 #define _PROXYHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/read_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,42 +18,79 @@
 size_t CEF_CALLBACK read_handler_read(struct _cef_read_handler_t* self,
     void* ptr, size_t size, size_t n)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: ptr; type: simple_byaddr
+  DCHECK(ptr);
+  if (!ptr)
     return 0;
 
-  return CefReadHandlerCppToC::Get(self)->Read(ptr, size, n);
+  // Execute
+  size_t _retval = CefReadHandlerCppToC::Get(self)->Read(
+      ptr,
+      size,
+      n);
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK read_handler_seek(struct _cef_read_handler_t* self,
     long offset, int whence)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefReadHandlerCppToC::Get(self)->Seek(offset, whence);
+  // Execute
+  int _retval = CefReadHandlerCppToC::Get(self)->Seek(
+      offset,
+      whence);
+
+  // Return type: simple
+  return _retval;
 }
 
+
 long CEF_CALLBACK read_handler_tell(struct _cef_read_handler_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefReadHandlerCppToC::Get(self)->Tell();
+  // Execute
+  long _retval = CefReadHandlerCppToC::Get(self)->Tell();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK read_handler_eof(struct _cef_read_handler_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefReadHandlerCppToC::Get(self)->Eof();
+  // Execute
+  int _retval = CefReadHandlerCppToC::Get(self)->Eof();
+
+  // Return type: simple
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefReadHandlerCppToC::CefReadHandlerCppToC(CefReadHandler* cls)

libcef_dll/cpptoc/read_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _READHANDLER_CPPTOC_H
 #define _READHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/render_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,112 +20,228 @@ int CEF_CALLBACK render_handler_get_view_rect(
     struct _cef_render_handler_t* self, cef_browser_t* browser,
     cef_rect_t* rect)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: rect; type: simple_byref
   DCHECK(rect);
-  if (!self || !browser || !rect)
+  if (!rect)
     return 0;
 
-  CefRect changeRect(*rect);
+  // Translate param: rect; type: simple_byref
-  int rv = CefRenderHandlerCppToC::Get(self)->GetViewRect(
+  CefRect rectVal = rect?*rect:CefRect();
-      CefBrowserCToCpp::Wrap(browser), changeRect);
+
-  *rect = changeRect;
+  // Execute
-  return rv;
+  bool _retval = CefRenderHandlerCppToC::Get(self)->GetViewRect(
+      CefBrowserCToCpp::Wrap(browser),
+      rectVal);
+
+  // Restore param: rect; type: simple_byref
+  if (rect)
+    *rect = rectVal;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK render_handler_get_screen_rect(
     struct _cef_render_handler_t* self, cef_browser_t* browser,
     cef_rect_t* rect)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: rect; type: simple_byref
   DCHECK(rect);
-  if (!self || !browser || !rect)
+  if (!rect)
     return 0;
 
-  CefRect changeRect(*rect);
+  // Translate param: rect; type: simple_byref
-  int rv = CefRenderHandlerCppToC::Get(self)->GetScreenRect(
+  CefRect rectVal = rect?*rect:CefRect();
-      CefBrowserCToCpp::Wrap(browser), changeRect);
+
-  *rect = changeRect;
+  // Execute
-  return rv;
+  bool _retval = CefRenderHandlerCppToC::Get(self)->GetScreenRect(
+      CefBrowserCToCpp::Wrap(browser),
+      rectVal);
+
+  // Restore param: rect; type: simple_byref
+  if (rect)
+    *rect = rectVal;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK render_handler_get_screen_point(
     struct _cef_render_handler_t* self, cef_browser_t* browser, int viewX,
     int viewY, int* screenX, int* screenY)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: screenX; type: simple_byref
   DCHECK(screenX);
+  if (!screenX)
+    return 0;
+  // Verify param: screenY; type: simple_byref
   DCHECK(screenY);
-  if (!self || !browser || !screenX || !screenY)
+  if (!screenY)
     return 0;
 
-  return CefRenderHandlerCppToC::Get(self)->GetScreenPoint(
+  // Translate param: screenX; type: simple_byref
-      CefBrowserCToCpp::Wrap(browser), viewX, viewY, *screenX, *screenY);
+  int screenXVal = screenX?*screenX:0;
+  // Translate param: screenY; type: simple_byref
+  int screenYVal = screenY?*screenY:0;
+
+  // Execute
+  bool _retval = CefRenderHandlerCppToC::Get(self)->GetScreenPoint(
+      CefBrowserCToCpp::Wrap(browser),
+      viewX,
+      viewY,
+      screenXVal,
+      screenYVal);
+
+  // Restore param: screenX; type: simple_byref
+  if (screenX)
+    *screenX = screenXVal;
+  // Restore param: screenY; type: simple_byref
+  if (screenY)
+    *screenY = screenYVal;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK render_handler_on_popup_show(
     struct _cef_render_handler_t* self, cef_browser_t* browser, int show)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return;
 
+  // Execute
   CefRenderHandlerCppToC::Get(self)->OnPopupShow(
-      CefBrowserCToCpp::Wrap(browser), show?true:false);
+      CefBrowserCToCpp::Wrap(browser),
+      show?true:false);
 }
 
+
 void CEF_CALLBACK render_handler_on_popup_size(
     struct _cef_render_handler_t* self, cef_browser_t* browser,
     const cef_rect_t* rect)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: rect; type: simple_byref_const
   DCHECK(rect);
-  if (!self || !browser || !rect)
+  if (!rect)
     return;
 
-  CefRect sizeRect(*rect);
+  // Translate param: rect; type: simple_byref_const
-  return CefRenderHandlerCppToC::Get(self)->OnPopupSize(
+  CefRect rectVal = rect?*rect:CefRect();
-      CefBrowserCToCpp::Wrap(browser), sizeRect);
+
+  // Execute
+  CefRenderHandlerCppToC::Get(self)->OnPopupSize(
+      CefBrowserCToCpp::Wrap(browser),
+      rectVal);
 }
 
+
 void CEF_CALLBACK render_handler_on_paint(struct _cef_render_handler_t* self,
     cef_browser_t* browser, enum cef_paint_element_type_t type,
-    size_t dirtyRectCount, cef_rect_t const* dirtyRects, const void* buffer)
+    size_t dirtyRectsCount, cef_rect_t const* dirtyRects, const void* buffer)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  DCHECK(dirtyRectCount > 0);
+  if (!browser)
-  DCHECK(dirtyRects);
+    return;
+  // Verify param: dirtyRects; type: simple_vec_byref_const
+  DCHECK(dirtyRectsCount == 0 || dirtyRects);
+  if (dirtyRectsCount > 0 && !dirtyRects)
+    return;
+  // Verify param: buffer; type: simple_byaddr
   DCHECK(buffer);
-  if (!self || !browser || dirtyRectCount == 0 || !dirtyRects || !buffer)
+  if (!buffer)
     return;
 
-  CefRenderHandler::RectList rectList;
+  // Translate param: dirtyRects; type: simple_vec_byref_const
-  for (size_t i = 0; i < dirtyRectCount; ++i)
+  std::vector<CefRect > dirtyRectsList;
-    rectList.push_back(dirtyRects[i]);
+  if (dirtyRectsCount > 0) {
+    for (size_t i = 0; i < dirtyRectsCount; ++i) {
+      dirtyRectsList.push_back(dirtyRects[i]);
+    }
+  }
 
-  return CefRenderHandlerCppToC::Get(self)->OnPaint(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), type, rectList, buffer);
+  CefRenderHandlerCppToC::Get(self)->OnPaint(
+      CefBrowserCToCpp::Wrap(browser),
+      type,
+      dirtyRectsList,
+      buffer);
 }
 
+
 void CEF_CALLBACK render_handler_on_cursor_change(
     struct _cef_render_handler_t* self, cef_browser_t* browser,
     cef_cursor_handle_t cursor)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
-  if (!self || !browser)
+  if (!browser)
     return;
 
-  return CefRenderHandlerCppToC::Get(self)->OnCursorChange(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), cursor);
+  CefRenderHandlerCppToC::Get(self)->OnCursorChange(
+      CefBrowserCToCpp::Wrap(browser),
+      cursor);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefRenderHandlerCppToC::CefRenderHandlerCppToC(CefRenderHandler* cls)

libcef_dll/cpptoc/render_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _RENDERHANDLER_CPPTOC_H
 #define _RENDERHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/request_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,173 +19,281 @@
 
 CEF_EXPORT cef_request_t* cef_request_create()
 {
-  CefRefPtr<CefRequest> impl = CefRequest::CreateRequest();
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(impl.get())
+
-    return CefRequestCppToC::Wrap(impl);
+  // Execute
-  return NULL;
+  CefRefPtr<CefRequest> _retval = CefRequest::CreateRequest();
+
+  // Return type: refptr_same
+  return CefRequestCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 cef_string_userfree_t CEF_CALLBACK request_get_url(struct _cef_request_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString urlStr = CefRequestCppToC::Get(self)->GetURL();
+  // Execute
-  return urlStr.DetachToUserFree();
+  CefString _retval = CefRequestCppToC::Get(self)->GetURL();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK request_set_url(struct _cef_request_t* self,
     const cef_string_t* url)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
     return;
 
-  CefRequestCppToC::Get(self)->SetURL(CefString(url));
+  // Execute
+  CefRequestCppToC::Get(self)->SetURL(
+      CefString(url));
 }
 
+
 cef_string_userfree_t CEF_CALLBACK request_get_method(
     struct _cef_request_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString methodStr = CefRequestCppToC::Get(self)->GetMethod();
+  // Execute
-  return methodStr.DetachToUserFree();
+  CefString _retval = CefRequestCppToC::Get(self)->GetMethod();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK request_set_method(struct _cef_request_t* self,
     const cef_string_t* method)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: method; type: string_byref_const
+  DCHECK(method);
+  if (!method)
     return;
 
-  CefRequestCppToC::Get(self)->SetMethod(CefString(method));
+  // Execute
+  CefRequestCppToC::Get(self)->SetMethod(
+      CefString(method));
 }
 
+
 struct _cef_post_data_t* CEF_CALLBACK request_get_post_data(
     struct _cef_request_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefRefPtr<CefPostData> postDataPtr =
+  // Execute
-      CefRequestCppToC::Get(self)->GetPostData();
+  CefRefPtr<CefPostData> _retval = CefRequestCppToC::Get(self)->GetPostData();
-  if(!postDataPtr.get())
-    return NULL;
 
-  return CefPostDataCppToC::Wrap(postDataPtr);
+  // Return type: refptr_same
+  return CefPostDataCppToC::Wrap(_retval);
 }
 
+
 void CEF_CALLBACK request_set_post_data(struct _cef_request_t* self,
     struct _cef_post_data_t* postData)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: postData; type: refptr_same
+  DCHECK(postData);
+  if (!postData)
     return;
 
-  CefRefPtr<CefPostData> postDataPtr;
+  // Execute
-  if(postData)
+  CefRequestCppToC::Get(self)->SetPostData(
-    postDataPtr = CefPostDataCppToC::Unwrap(postData);
+      CefPostDataCppToC::Unwrap(postData));
-  
-  CefRequestCppToC::Get(self)->SetPostData(postDataPtr);
 }
 
+
 void CEF_CALLBACK request_get_header_map(struct _cef_request_t* self,
     cef_string_multimap_t headerMap)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: headerMap; type: string_map_multi_byref
+  DCHECK(headerMap);
+  if (!headerMap)
     return;
 
-  CefRequest::HeaderMap map;
+  // Translate param: headerMap; type: string_map_multi_byref
-  CefRequestCppToC::Get(self)->GetHeaderMap(map);
+  std::multimap<CefString,CefString> headerMapMultimap;
-  transfer_string_multimap_contents(map, headerMap);
+  transfer_string_multimap_contents(headerMap, headerMapMultimap);
+
+  // Execute
+  CefRequestCppToC::Get(self)->GetHeaderMap(
+      headerMapMultimap);
+
+  // Restore param: headerMap; type: string_map_multi_byref
+  cef_string_multimap_clear(headerMap);
+  transfer_string_multimap_contents(headerMapMultimap, headerMap);
 }
 
+
 void CEF_CALLBACK request_set_header_map(struct _cef_request_t* self,
     cef_string_multimap_t headerMap)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: headerMap; type: string_map_multi_byref_const
+  DCHECK(headerMap);
+  if (!headerMap)
     return;
 
-  CefRequest::HeaderMap map;
+  // Translate param: headerMap; type: string_map_multi_byref_const
-  if(headerMap)
+  std::multimap<CefString,CefString> headerMapMultimap;
-    transfer_string_multimap_contents(headerMap, map);
+  transfer_string_multimap_contents(headerMap, headerMapMultimap);
 
-  CefRequestCppToC::Get(self)->SetHeaderMap(map);
+  // Execute
+  CefRequestCppToC::Get(self)->SetHeaderMap(
+      headerMapMultimap);
 }
 
+
 void CEF_CALLBACK request_set(struct _cef_request_t* self,
     const cef_string_t* url, const cef_string_t* method,
     struct _cef_post_data_t* postData, cef_string_multimap_t headerMap)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
+    return;
+  // Verify param: method; type: string_byref_const
+  DCHECK(method);
+  if (!method)
+    return;
+  // Verify param: headerMap; type: string_map_multi_byref_const
+  DCHECK(headerMap);
+  if (!headerMap)
+    return;
+  // Unverified params: postData
 
-  CefRefPtr<CefPostData> postDataPtr;
+  // Translate param: headerMap; type: string_map_multi_byref_const
-  CefRequest::HeaderMap map;
+  std::multimap<CefString,CefString> headerMapMultimap;
+  transfer_string_multimap_contents(headerMap, headerMapMultimap);
 
-  if(postData)
+  // Execute
-    postDataPtr = CefPostDataCppToC::Unwrap(postData);
+  CefRequestCppToC::Get(self)->Set(
-  if(headerMap)
+      CefString(url),
-    transfer_string_multimap_contents(headerMap, map);
+      CefString(method),
-
+      CefPostDataCppToC::Unwrap(postData),
-  CefRequestCppToC::Get(self)->Set(CefString(url), CefString(method),
+      headerMapMultimap);
-      postDataPtr, map);
 }
 
+
 enum cef_weburlrequest_flags_t CEF_CALLBACK request_get_flags(
     struct _cef_request_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return WUR_FLAG_NONE;
 
-  return CefRequestCppToC::Get(self)->GetFlags();
+  // Execute
+  cef_weburlrequest_flags_t _retval = CefRequestCppToC::Get(self)->GetFlags();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 void CEF_CALLBACK request_set_flags(struct _cef_request_t* self,
     enum cef_weburlrequest_flags_t flags)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefRequestCppToC::Get(self)->SetFlags(flags);
+  // Execute
+  CefRequestCppToC::Get(self)->SetFlags(
+      flags);
 }
 
+
 cef_string_userfree_t CEF_CALLBACK request_get_first_party_for_cookies(
     struct _cef_request_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString urlStr = CefRequestCppToC::Get(self)->GetFirstPartyForCookies();
+  // Execute
-  return urlStr.DetachToUserFree();
+  CefString _retval = CefRequestCppToC::Get(self)->GetFirstPartyForCookies();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK request_set_first_party_for_cookies(
     struct _cef_request_t* self, const cef_string_t* url)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: url; type: string_byref_const
+  DCHECK(url);
+  if (!url)
     return;
 
-  CefRequestCppToC::Get(self)->SetFirstPartyForCookies(CefString(url));
+  // Execute
+  CefRequestCppToC::Get(self)->SetFirstPartyForCookies(
+      CefString(url));
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefRequestCppToC::CefRequestCppToC(CefRequest* cls)

libcef_dll/cpptoc/request_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _REQUEST_CPPTOC_H
 #define _REQUEST_CPPTOC_H
 

libcef_dll/cpptoc/request_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -27,139 +27,311 @@ int CEF_CALLBACK request_handler_on_before_browse(
     cef_frame_t* frame, struct _cef_request_t* request,
     enum cef_handler_navtype_t navType, int isRedirect)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: frame; type: refptr_diff
   DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: request; type: refptr_diff
   DCHECK(request);
-  if (!self || !browser || !frame || !request)
+  if (!request)
     return 0;
 
-  return CefRequestHandlerCppToC::Get(self)->OnBeforeBrowse(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
+  bool _retval = CefRequestHandlerCppToC::Get(self)->OnBeforeBrowse(
-      CefRequestCToCpp::Wrap(request), navType, (isRedirect ? true : false));
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      CefRequestCToCpp::Wrap(request),
+      navType,
+      isRedirect?true:false);
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK request_handler_on_before_resource_load(
     struct _cef_request_handler_t* self, cef_browser_t* browser,
     struct _cef_request_t* request, cef_string_t* redirectUrl,
     struct _cef_stream_reader_t** resourceStream,
     struct _cef_response_t* response, int loadFlags)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: request; type: refptr_diff
   DCHECK(request);
+  if (!request)
+    return 0;
+  // Verify param: redirectUrl; type: string_byref
   DCHECK(redirectUrl);
+  if (!redirectUrl)
+    return 0;
+  // Verify param: resourceStream; type: refptr_diff_byref
   DCHECK(resourceStream);
+  if (!resourceStream)
+    return 0;
+  // Verify param: response; type: refptr_diff
   DCHECK(response);
-  if (!self || !browser || !request || !redirectUrl || !resourceStream ||
+  if (!response)
-      !response)
     return 0;
 
-  CefRefPtr<CefStreamReader> streamPtr;
+  // Translate param: redirectUrl; type: string_byref
-
   CefString redirectUrlStr(redirectUrl);
-  int rv = CefRequestHandlerCppToC::Get(self)->OnBeforeResourceLoad(
+  // Translate param: resourceStream; type: refptr_diff_byref
-      CefBrowserCToCpp::Wrap(browser), CefRequestCToCpp::Wrap(request),
+  CefRefPtr<CefStreamReader> resourceStreamPtr;
-      redirectUrlStr, streamPtr, CefResponseCToCpp::Wrap(response), loadFlags);
+  if (resourceStream && *resourceStream)
+    resourceStreamPtr = CefStreamReaderCToCpp::Wrap(*resourceStream);
+  CefStreamReader* resourceStreamOrig = resourceStreamPtr.get();
 
-  if(streamPtr.get())
+  // Execute
-    *resourceStream = CefStreamReaderCToCpp::Unwrap(streamPtr);
+  bool _retval = CefRequestHandlerCppToC::Get(self)->OnBeforeResourceLoad(
+      CefBrowserCToCpp::Wrap(browser),
+      CefRequestCToCpp::Wrap(request),
+      redirectUrlStr,
+      resourceStreamPtr,
+      CefResponseCToCpp::Wrap(response),
+      loadFlags);
 
-  return rv;
+  // Restore param: resourceStream; type: refptr_diff_byref
+  if (resourceStream) {
+    if (resourceStreamPtr.get()) {
+      if (resourceStreamPtr.get() != resourceStreamOrig) {
+        *resourceStream = CefStreamReaderCToCpp::Unwrap(resourceStreamPtr);
+      }
+    } else {
+      *resourceStream = NULL;
+    }
+  }
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK request_handler_on_resource_response(
     struct _cef_request_handler_t* self, cef_browser_t* browser,
     const cef_string_t* url, struct _cef_response_t* response,
     struct _cef_content_filter_t** filter)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: url; type: string_byref_const
   DCHECK(url);
+  if (!url)
+    return;
+  // Verify param: response; type: refptr_diff
   DCHECK(response);
+  if (!response)
+    return;
+  // Verify param: filter; type: refptr_same_byref
   DCHECK(filter);
-  if (!self || !browser || !url || !response || !filter)
+  if (!filter)
     return;
 
+  // Translate param: filter; type: refptr_same_byref
   CefRefPtr<CefContentFilter> filterPtr;
+  if (filter && *filter)
+    filterPtr = CefContentFilterCppToC::Unwrap(*filter);
+  CefContentFilter* filterOrig = filterPtr.get();
 
+  // Execute
   CefRequestHandlerCppToC::Get(self)->OnResourceResponse(
-      CefBrowserCToCpp::Wrap(browser), url, CefResponseCToCpp::Wrap(response),
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(url),
+      CefResponseCToCpp::Wrap(response),
       filterPtr);
 
-  if(filterPtr.get())
+  // Restore param: filter; type: refptr_same_byref
-    *filter = CefContentFilterCppToC::Wrap(filterPtr);
+  if (filter) {
+    if (filterPtr.get()) {
+      if (filterPtr.get() != filterOrig) {
+        *filter = CefContentFilterCppToC::Wrap(filterPtr);
+      }
+    } else {
+      *filter = NULL;
+    }
+  }
 }
 
+
 int CEF_CALLBACK request_handler_on_protocol_execution(
     struct _cef_request_handler_t* self, cef_browser_t* browser,
     const cef_string_t* url, int* allowOSExecution)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: url; type: string_byref_const
   DCHECK(url);
+  if (!url)
+    return 0;
+  // Verify param: allowOSExecution; type: bool_byref
   DCHECK(allowOSExecution);
-  if (!self || !browser || !url || !allowOSExecution)
+  if (!allowOSExecution)
     return 0;
 
-  bool allowExec = *allowOSExecution?true:false;
+  // Translate param: allowOSExecution; type: bool_byref
-  int rv = CefRequestHandlerCppToC::Get(self)->OnProtocolExecution(
+  bool allowOSExecutionBool = (
-      CefBrowserCToCpp::Wrap(browser), CefString(url), allowExec);
+      allowOSExecution && *allowOSExecution)?true:false;
-  *allowOSExecution = allowExec;
 
-  return rv;
+  // Execute
+  bool _retval = CefRequestHandlerCppToC::Get(self)->OnProtocolExecution(
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(url),
+      allowOSExecutionBool);
+
+  // Restore param: allowOSExecution; type: bool_byref
+  if (allowOSExecution)
+    *allowOSExecution = allowOSExecutionBool?true:false;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK request_handler_get_download_handler(
     struct _cef_request_handler_t* self, cef_browser_t* browser,
     const cef_string_t* mimeType, const cef_string_t* fileName,
     int64 contentLength, struct _cef_download_handler_t** handler)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: mimeType; type: string_byref_const
   DCHECK(mimeType);
+  if (!mimeType)
+    return 0;
+  // Verify param: fileName; type: string_byref_const
   DCHECK(fileName);
+  if (!fileName)
+    return 0;
+  // Verify param: handler; type: refptr_same_byref
   DCHECK(handler);
-  if (!self || !browser || !mimeType || !fileName || !handler)
+  if (!handler)
     return 0;
 
-  CefRefPtr<CefDownloadHandler> downloadPtr;
+  // Translate param: handler; type: refptr_same_byref
+  CefRefPtr<CefDownloadHandler> handlerPtr;
+  if (handler && *handler)
+    handlerPtr = CefDownloadHandlerCppToC::Unwrap(*handler);
+  CefDownloadHandler* handlerOrig = handlerPtr.get();
 
-  int rv = CefRequestHandlerCppToC::Get(self)->GetDownloadHandler(
+  // Execute
-      CefBrowserCToCpp::Wrap(browser), CefString(mimeType), CefString(fileName),
+  bool _retval = CefRequestHandlerCppToC::Get(self)->GetDownloadHandler(
-      contentLength, downloadPtr);
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(mimeType),
+      CefString(fileName),
+      contentLength,
+      handlerPtr);
 
-  if(downloadPtr.get())
+  // Restore param: handler; type: refptr_same_byref
-    *handler = CefDownloadHandlerCppToC::Wrap(downloadPtr);
+  if (handler) {
+    if (handlerPtr.get()) {
+      if (handlerPtr.get() != handlerOrig) {
+        *handler = CefDownloadHandlerCppToC::Wrap(handlerPtr);
+      }
+    } else {
+      *handler = NULL;
+    }
+  }
 
-  return rv;
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK request_handler_get_auth_credentials(
     struct _cef_request_handler_t* self, cef_browser_t* browser, int isProxy,
     const cef_string_t* host, int port, const cef_string_t* realm,
     const cef_string_t* scheme, cef_string_t* username,
     cef_string_t* password)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
   DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: host; type: string_byref_const
   DCHECK(host);
+  if (!host)
+    return 0;
+  // Verify param: realm; type: string_byref_const
   DCHECK(realm);
+  if (!realm)
+    return 0;
+  // Verify param: scheme; type: string_byref_const
   DCHECK(scheme);
+  if (!scheme)
+    return 0;
+  // Verify param: username; type: string_byref
   DCHECK(username);
+  if (!username)
+    return 0;
+  // Verify param: password; type: string_byref
   DCHECK(password);
-  if (!self || !browser || !host || !realm || !scheme || !username || !password)
+  if (!password)
     return 0;
 
+  // Translate param: username; type: string_byref
   CefString usernameStr(username);
+  // Translate param: password; type: string_byref
   CefString passwordStr(password);
-  return CefRequestHandlerCppToC::Get(self)->GetAuthCredentials(
+
-      CefBrowserCToCpp::Wrap(browser), (isProxy ? true : false),
+  // Execute
-      CefString(host), port, CefString(realm), CefString(scheme), usernameStr,
+  bool _retval = CefRequestHandlerCppToC::Get(self)->GetAuthCredentials(
+      CefBrowserCToCpp::Wrap(browser),
+      isProxy?true:false,
+      CefString(host),
+      port,
+      CefString(realm),
+      CefString(scheme),
+      usernameStr,
       passwordStr);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefRequestHandlerCppToC::CefRequestHandlerCppToC(CefRequestHandler* cls)

libcef_dll/cpptoc/request_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _REQUESTHANDLER_CPPTOC_H
 #define _REQUESTHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/response_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,102 +18,179 @@
 
 int CEF_CALLBACK response_get_status(struct _cef_response_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefResponseCppToC::Get(self)->GetStatus();
+  // Execute
+  int _retval = CefResponseCppToC::Get(self)->GetStatus();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 void CEF_CALLBACK response_set_status(struct _cef_response_t* self, int status)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefResponseCppToC::Get(self)->SetStatus(status);
+  // Execute
+  CefResponseCppToC::Get(self)->SetStatus(
+      status);
 }
 
+
 cef_string_userfree_t CEF_CALLBACK response_get_status_text(
     struct _cef_response_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString text = CefResponseCppToC::Get(self)->GetStatusText();
+  // Execute
-  return text.DetachToUserFree();
+  CefString _retval = CefResponseCppToC::Get(self)->GetStatusText();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK response_set_status_text(struct _cef_response_t* self,
     const cef_string_t* statusText)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: statusText; type: string_byref_const
+  DCHECK(statusText);
+  if (!statusText)
     return;
 
-  CefResponseCppToC::Get(self)->SetStatusText(CefString(statusText));
+  // Execute
+  CefResponseCppToC::Get(self)->SetStatusText(
+      CefString(statusText));
 }
 
+
 cef_string_userfree_t CEF_CALLBACK response_get_mime_type(
     struct _cef_response_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return NULL;
 
-  CefString text = CefResponseCppToC::Get(self)->GetMimeType();
+  // Execute
-  return text.DetachToUserFree();
+  CefString _retval = CefResponseCppToC::Get(self)->GetMimeType();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK response_set_mime_type(struct _cef_response_t* self,
     const cef_string_t* mimeType)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: mimeType; type: string_byref_const
+  DCHECK(mimeType);
+  if (!mimeType)
     return;
 
-  CefResponseCppToC::Get(self)->SetMimeType(CefString(mimeType));
+  // Execute
+  CefResponseCppToC::Get(self)->SetMimeType(
+      CefString(mimeType));
 }
 
+
 cef_string_userfree_t CEF_CALLBACK response_get_header(
     struct _cef_response_t* self, const cef_string_t* name)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return NULL;
+  // Verify param: name; type: string_byref_const
+  DCHECK(name);
+  if (!name)
     return NULL;
 
-  CefString text = CefResponseCppToC::Get(self)->GetHeader(CefString(name));
+  // Execute
-  return text.DetachToUserFree();
+  CefString _retval = CefResponseCppToC::Get(self)->GetHeader(
+      CefString(name));
+
+  // Return type: string
+  return _retval.DetachToUserFree();
 }
 
+
 void CEF_CALLBACK response_get_header_map(struct _cef_response_t* self,
     cef_string_multimap_t headerMap)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: headerMap; type: string_map_multi_byref
+  DCHECK(headerMap);
+  if (!headerMap)
     return;
 
-  CefResponse::HeaderMap map;
+  // Translate param: headerMap; type: string_map_multi_byref
-  CefResponseCppToC::Get(self)->GetHeaderMap(map);
+  std::multimap<CefString,CefString> headerMapMultimap;
-  transfer_string_multimap_contents(map, headerMap);
+  transfer_string_multimap_contents(headerMap, headerMapMultimap);
+
+  // Execute
+  CefResponseCppToC::Get(self)->GetHeaderMap(
+      headerMapMultimap);
+
+  // Restore param: headerMap; type: string_map_multi_byref
+  cef_string_multimap_clear(headerMap);
+  transfer_string_multimap_contents(headerMapMultimap, headerMap);
 }
 
+
 void CEF_CALLBACK response_set_header_map(struct _cef_response_t* self,
     cef_string_multimap_t headerMap)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return;
+  // Verify param: headerMap; type: string_map_multi_byref_const
+  DCHECK(headerMap);
+  if (!headerMap)
     return;
 
-  CefResponse::HeaderMap map;
+  // Translate param: headerMap; type: string_map_multi_byref_const
-  if(headerMap)
+  std::multimap<CefString,CefString> headerMapMultimap;
-    transfer_string_multimap_contents(headerMap, map);
+  transfer_string_multimap_contents(headerMap, headerMapMultimap);
 
-  CefResponseCppToC::Get(self)->SetHeaderMap(map);
+  // Execute
+  CefResponseCppToC::Get(self)->SetHeaderMap(
+      headerMapMultimap);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefResponseCppToC::CefResponseCppToC(CefResponse* cls)

libcef_dll/cpptoc/response_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _RESPONSE_CPPTOC_H
 #define _RESPONSE_CPPTOC_H
 

libcef_dll/cpptoc/scheme_handler_callback_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,34 +18,46 @@
 void CEF_CALLBACK scheme_handler_callback_headers_available(
     struct _cef_scheme_handler_callback_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
 
+  // Execute
   CefSchemeHandlerCallbackCppToC::Get(self)->HeadersAvailable();
 }
 
+
 void CEF_CALLBACK scheme_handler_callback_bytes_available(
     struct _cef_scheme_handler_callback_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
 
+  // Execute
   CefSchemeHandlerCallbackCppToC::Get(self)->BytesAvailable();
 }
 
+
 void CEF_CALLBACK scheme_handler_callback_cancel(
     struct _cef_scheme_handler_callback_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
   if (!self)
     return;
 
+  // Execute
   CefSchemeHandlerCallbackCppToC::Get(self)->Cancel();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefSchemeHandlerCallbackCppToC::CefSchemeHandlerCallbackCppToC(

libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _SCHEMEHANDLERCALLBACK_CPPTOC_H
 #define _SCHEMEHANDLERCALLBACK_CPPTOC_H
 

libcef_dll/cpptoc/scheme_handler_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -22,57 +22,124 @@ int CEF_CALLBACK scheme_handler_process_request(
     struct _cef_scheme_handler_t* self, cef_request_t* request,
     cef_scheme_handler_callback_t* callback)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: request; type: refptr_diff
   DCHECK(request);
-  if(!self || !request)
+  if (!request)
+    return 0;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback);
+  if (!callback)
     return 0;
 
-  return CefSchemeHandlerCppToC::Get(self)->ProcessRequest(
+  // Execute
+  bool _retval = CefSchemeHandlerCppToC::Get(self)->ProcessRequest(
       CefRequestCToCpp::Wrap(request),
       CefSchemeHandlerCallbackCToCpp::Wrap(callback));
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK scheme_handler_get_response_headers(
     struct _cef_scheme_handler_t* self, cef_response_t* response,
     int64* response_length, cef_string_t* redirectUrl)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: response; type: refptr_diff
   DCHECK(response);
+  if (!response)
+    return;
+  // Verify param: response_length; type: simple_byref
   DCHECK(response_length);
+  if (!response_length)
+    return;
+  // Verify param: redirectUrl; type: string_byref
   DCHECK(redirectUrl);
-  if (!self || !response || !response_length || !redirectUrl)
+  if (!redirectUrl)
     return;
 
+  // Translate param: response_length; type: simple_byref
+  int64 response_lengthVal = response_length?*response_length:0;
+  // Translate param: redirectUrl; type: string_byref
   CefString redirectUrlStr(redirectUrl);
+
+  // Execute
   CefSchemeHandlerCppToC::Get(self)->GetResponseHeaders(
-      CefResponseCToCpp::Wrap(response), *response_length, redirectUrlStr);
+      CefResponseCToCpp::Wrap(response),
+      response_lengthVal,
+      redirectUrlStr);
+
+  // Restore param: response_length; type: simple_byref
+  if (response_length)
+    *response_length = response_lengthVal;
 }
 
+
 int CEF_CALLBACK scheme_handler_read_response(
     struct _cef_scheme_handler_t* self, void* data_out, int bytes_to_read,
     int* bytes_read, cef_scheme_handler_callback_t* callback)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: data_out; type: simple_byaddr
   DCHECK(data_out);
+  if (!data_out)
+    return 0;
+  // Verify param: bytes_read; type: simple_byref
   DCHECK(bytes_read);
-  if(!self || !data_out || !bytes_read)
+  if (!bytes_read)
+    return 0;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback);
+  if (!callback)
     return 0;
 
-  return CefSchemeHandlerCppToC::Get(self)->ReadResponse(
+  // Translate param: bytes_read; type: simple_byref
-      data_out, bytes_to_read, *bytes_read,
+  int bytes_readVal = bytes_read?*bytes_read:0;
-      CefSchemeHandlerCallbackCToCpp::Wrap(callback)) ? 1 : 0;
+
+  // Execute
+  bool _retval = CefSchemeHandlerCppToC::Get(self)->ReadResponse(
+      data_out,
+      bytes_to_read,
+      bytes_readVal,
+      CefSchemeHandlerCallbackCToCpp::Wrap(callback));
+
+  // Restore param: bytes_read; type: simple_byref
+  if (bytes_read)
+    *bytes_read = bytes_readVal;
+
+  // Return type: bool
+  return _retval;
 }
 
+
 void CEF_CALLBACK scheme_handler_cancel(struct _cef_scheme_handler_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
+  // Execute
   CefSchemeHandlerCppToC::Get(self)->Cancel();
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefSchemeHandlerCppToC::CefSchemeHandlerCppToC(CefSchemeHandler* cls)

libcef_dll/cpptoc/scheme_handler_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _SCHEMEHANDLER_CPPTOC_H
 #define _SCHEMEHANDLER_CPPTOC_H
 

libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -22,20 +22,37 @@ struct _cef_scheme_handler_t* CEF_CALLBACK scheme_handler_factory_create(
     struct _cef_scheme_handler_factory_t* self, cef_browser_t* browser,
     const cef_string_t* scheme_name, cef_request_t* request)
 {
-  CefRefPtr<CefBrowser> browserPtr;
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if (browser)
-    browserPtr = CefBrowserCToCpp::Wrap(browser);
 
-  CefRefPtr<CefSchemeHandler> rv =
+  DCHECK(self);
-      CefSchemeHandlerFactoryCppToC::Get(self)->Create(browserPtr,
+  if (!self)
-          CefString(scheme_name), CefRequestCToCpp::Wrap(request));
+    return NULL;
-  if (rv.get())
+  // Verify param: browser; type: refptr_diff
-    return CefSchemeHandlerCppToC::Wrap(rv);
+  DCHECK(browser);
+  if (!browser)
+    return NULL;
+  // Verify param: scheme_name; type: string_byref_const
+  DCHECK(scheme_name);
+  if (!scheme_name)
+    return NULL;
+  // Verify param: request; type: refptr_diff
+  DCHECK(request);
+  if (!request)
+    return NULL;
 
-  return NULL;
+  // Execute
+  CefRefPtr<CefSchemeHandler> _retval = CefSchemeHandlerFactoryCppToC::Get(
+      self)->Create(
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(scheme_name),
+      CefRequestCToCpp::Wrap(request));
+
+  // Return type: refptr_same
+  return CefSchemeHandlerCppToC::Wrap(_retval);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefSchemeHandlerFactoryCppToC::CefSchemeHandlerFactoryCppToC(

libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _SCHEMEHANDLERFACTORY_CPPTOC_H
 #define _SCHEMEHANDLERFACTORY_CPPTOC_H
 

libcef_dll/cpptoc/storage_visitor_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,21 +20,51 @@ int CEF_CALLBACK storage_visitor_visit(struct _cef_storage_visitor_t* self,
     const cef_string_t* key, const cef_string_t* value, int count, int total,
     int* deleteData)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: origin; type: string_byref_const
   DCHECK(origin);
+  if (!origin)
+    return 0;
+  // Verify param: key; type: string_byref_const
+  DCHECK(key);
+  if (!key)
+    return 0;
+  // Verify param: value; type: string_byref_const
+  DCHECK(value);
+  if (!value)
+    return 0;
+  // Verify param: deleteData; type: bool_byref
   DCHECK(deleteData);
-  if (!self || !origin || !deleteData)
+  if (!deleteData)
-    return false;
+    return 0;
 
-  bool delVal = (*deleteData)?true:false;
+  // Translate param: deleteData; type: bool_byref
-  bool retVal = CefStorageVisitorCppToC::Get(self)->Visit(type, origin, key,
+  bool deleteDataBool = (deleteData && *deleteData)?true:false;
-      value, count, total, delVal);
-  *deleteData = delVal;
 
-  return retVal;
+  // Execute
+  bool _retval = CefStorageVisitorCppToC::Get(self)->Visit(
+      type,
+      CefString(origin),
+      CefString(key),
+      CefString(value),
+      count,
+      total,
+      deleteDataBool);
+
+  // Restore param: deleteData; type: bool_byref
+  if (deleteData)
+    *deleteData = deleteDataBool?true:false;
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefStorageVisitorCppToC::CefStorageVisitorCppToC(CefStorageVisitor* cls)

libcef_dll/cpptoc/storage_visitor_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _STORAGEVISITOR_CPPTOC_H
 #define _STORAGEVISITOR_CPPTOC_H
 

libcef_dll/cpptoc/stream_reader_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,74 +19,140 @@
 CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_file(
     const cef_string_t* fileName)
 {
-  CefRefPtr<CefStreamReader> impl =
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-      CefStreamReader::CreateForFile(CefString(fileName));
+
-  if(impl.get())
+  // Verify param: fileName; type: string_byref_const
-    return CefStreamReaderCppToC::Wrap(impl);
+  DCHECK(fileName);
-  return NULL;
+  if (!fileName)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefStreamReader> _retval = CefStreamReader::CreateForFile(
+      CefString(fileName));
+
+  // Return type: refptr_same
+  return CefStreamReaderCppToC::Wrap(_retval);
 }
 
+
 CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_data(void* data,
     size_t size)
 {
-  CefRefPtr<CefStreamReader> impl = CefStreamReader::CreateForData(data, size);
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-  if(impl.get())
+
-    return CefStreamReaderCppToC::Wrap(impl);
+  // Verify param: data; type: simple_byaddr
-  return NULL;
+  DCHECK(data);
+  if (!data)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefStreamReader> _retval = CefStreamReader::CreateForData(
+      data,
+      size);
+
+  // Return type: refptr_same
+  return CefStreamReaderCppToC::Wrap(_retval);
 }
 
+
 CEF_EXPORT cef_stream_reader_t* cef_stream_reader_create_for_handler(
     cef_read_handler_t* handler)
 {
-  CefRefPtr<CefStreamReader> impl =
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-      CefStreamReader::CreateForHandler(CefReadHandlerCToCpp::Wrap(handler));
+
-  if(impl.get())
+  // Verify param: handler; type: refptr_diff
-    return CefStreamReaderCppToC::Wrap(impl);
+  DCHECK(handler);
-  return NULL;
+  if (!handler)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefStreamReader> _retval = CefStreamReader::CreateForHandler(
+      CefReadHandlerCToCpp::Wrap(handler));
+
+  // Return type: refptr_same
+  return CefStreamReaderCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 size_t CEF_CALLBACK stream_reader_read(struct _cef_stream_reader_t* self,
     void* ptr, size_t size, size_t n)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: ptr; type: simple_byaddr
+  DCHECK(ptr);
+  if (!ptr)
     return 0;
 
-  return CefStreamReaderCppToC::Get(self)->Read(ptr, size, n);
+  // Execute
+  size_t _retval = CefStreamReaderCppToC::Get(self)->Read(
+      ptr,
+      size,
+      n);
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK stream_reader_seek(struct _cef_stream_reader_t* self,
     long offset, int whence)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefStreamReaderCppToC::Get(self)->Seek(offset, whence);
+  // Execute
+  int _retval = CefStreamReaderCppToC::Get(self)->Seek(
+      offset,
+      whence);
+
+  // Return type: simple
+  return _retval;
 }
 
+
 long CEF_CALLBACK stream_reader_tell(struct _cef_stream_reader_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefStreamReaderCppToC::Get(self)->Tell();
+  // Execute
+  long _retval = CefStreamReaderCppToC::Get(self)->Tell();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK stream_reader_eof(struct _cef_stream_reader_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefStreamReaderCppToC::Get(self)->Eof();
+  // Execute
+  int _retval = CefStreamReaderCppToC::Get(self)->Eof();
+
+  // Return type: simple
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefStreamReaderCppToC::CefStreamReaderCppToC(CefStreamReader* cls)

libcef_dll/cpptoc/stream_reader_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _STREAMREADER_CPPTOC_H
 #define _STREAMREADER_CPPTOC_H
 

libcef_dll/cpptoc/stream_writer_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -19,73 +19,120 @@
 CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_file(
     const cef_string_t* fileName)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: fileName; type: string_byref_const
   DCHECK(fileName);
-  if(!fileName)
+  if (!fileName)
     return NULL;
 
-  CefRefPtr<CefStreamWriter> impl =
+  // Execute
-      CefStreamWriter::CreateForFile(CefString(fileName));
+  CefRefPtr<CefStreamWriter> _retval = CefStreamWriter::CreateForFile(
-  if(impl.get())
+      CefString(fileName));
-    return CefStreamWriterCppToC::Wrap(impl);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefStreamWriterCppToC::Wrap(_retval);
 }
 
+
 CEF_EXPORT cef_stream_writer_t* cef_stream_writer_create_for_handler(
     cef_write_handler_t* handler)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: handler; type: refptr_diff
   DCHECK(handler);
-  if(!handler)
+  if (!handler)
     return NULL;
 
-  CefRefPtr<CefStreamWriter> impl =
+  // Execute
-      CefStreamWriter::CreateForHandler(CefWriteHandlerCToCpp::Wrap(handler));
+  CefRefPtr<CefStreamWriter> _retval = CefStreamWriter::CreateForHandler(
-  if(impl.get())
+      CefWriteHandlerCToCpp::Wrap(handler));
-    return CefStreamWriterCppToC::Wrap(impl);
+
-  return NULL;
+  // Return type: refptr_same
+  return CefStreamWriterCppToC::Wrap(_retval);
 }
 
 
+
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 size_t CEF_CALLBACK stream_writer_write(struct _cef_stream_writer_t* self,
     const void* ptr, size_t size, size_t n)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: ptr; type: simple_byaddr
+  DCHECK(ptr);
+  if (!ptr)
     return 0;
 
-  return CefStreamWriterCppToC::Get(self)->Write(ptr, size, n);
+  // Execute
+  size_t _retval = CefStreamWriterCppToC::Get(self)->Write(
+      ptr,
+      size,
+      n);
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK stream_writer_seek(struct _cef_stream_writer_t* self,
     long offset, int whence)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefStreamWriterCppToC::Get(self)->Seek(offset, whence);
+  // Execute
+  int _retval = CefStreamWriterCppToC::Get(self)->Seek(
+      offset,
+      whence);
+
+  // Return type: simple
+  return _retval;
 }
 
+
 long CEF_CALLBACK stream_writer_tell(struct _cef_stream_writer_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefStreamWriterCppToC::Get(self)->Tell();
+  // Execute
+  long _retval = CefStreamWriterCppToC::Get(self)->Tell();
+
+  // Return type: simple
+  return _retval;
 }
 
+
 int CEF_CALLBACK stream_writer_flush(struct _cef_stream_writer_t* self)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return 0;
 
-  return CefStreamWriterCppToC::Get(self)->Flush();
+  // Execute
+  int _retval = CefStreamWriterCppToC::Get(self)->Flush();
+
+  // Return type: simple
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefStreamWriterCppToC::CefStreamWriterCppToC(CefStreamWriter* cls)

libcef_dll/cpptoc/stream_writer_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _STREAMWRITER_CPPTOC_H
 #define _STREAMWRITER_CPPTOC_H
 

libcef_dll/cpptoc/task_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -18,14 +18,19 @@
 void CEF_CALLBACK task_execute(struct _cef_task_t* self,
     cef_thread_id_t threadId)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
     return;
 
-  CefTaskCppToC::Get(self)->Execute(threadId);
+  // Execute
+  CefTaskCppToC::Get(self)->Execute(
+      threadId);
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefTaskCppToC::CefTaskCppToC(CefTask* cls)

libcef_dll/cpptoc/task_cpptoc.h

@@ -4,10 +4,12 @@
 //
 // ---------------------------------------------------------------------------
 //
-// This file was generated by the CEF translator tool and should not edited
+// This file was generated by the CEF translator tool. If making changes by
-// by hand. See the translator.README.txt file in the tools directory for
+// hand only do so within the body of existing method and function
-// more information.
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
 //
+
 #ifndef _TASK_CPPTOC_H
 #define _TASK_CPPTOC_H
 

libcef_dll/cpptoc/v8accessor_cpptoc.cc

@@ -4,8 +4,8 @@
 //
 // ---------------------------------------------------------------------------
 //
-// A portion of this file was generated by the CEF translator tool.  When
+// This file was generated by the CEF translator tool. If making changes by
-// making changes by hand only do so within the body of existing function
+// hand only do so within the body of existing method and function
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
@@ -20,49 +20,101 @@ int CEF_CALLBACK v8accessor_get(struct _cef_v8accessor_t* self,
     const cef_string_t* name, struct _cef_v8value_t* object,
     struct _cef_v8value_t** retval, cef_string_t* exception)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: name; type: string_byref_const
+  DCHECK(name);
+  if (!name)
+    return 0;
+  // Verify param: object; type: refptr_diff
+  DCHECK(object);
+  if (!object)
+    return 0;
+  // Verify param: retval; type: refptr_diff_byref
+  DCHECK(retval);
+  if (!retval)
+    return 0;
+  // Verify param: exception; type: string_byref
+  DCHECK(exception);
+  if (!exception)
     return 0;
 
-  CefRefPtr<CefV8Value> objectPtr;
+  // Translate param: retval; type: refptr_diff_byref
-  if(object)
+  CefRefPtr<CefV8Value> retvalPtr;
-    objectPtr = CefV8ValueCToCpp::Wrap(object);
+  if (retval && *retval)
-
+    retvalPtr = CefV8ValueCToCpp::Wrap(*retval);
-  CefRefPtr<CefV8Value> retValPtr;
+  CefV8Value* retvalOrig = retvalPtr.get();
+  // Translate param: exception; type: string_byref
   CefString exceptionStr(exception);
-  bool rv = CefV8AccessorCppToC::Get(self)->Get(CefString(name), objectPtr,
+
-                                                retValPtr, exceptionStr);
+  // Execute
-  if(rv) {
+  bool _retval = CefV8AccessorCppToC::Get(self)->Get(
-    if(retValPtr.get() && retval)
+      CefString(name),
-      *retval = CefV8ValueCToCpp::Unwrap(retValPtr);
+      CefV8ValueCToCpp::Wrap(object),
+      retvalPtr,
+      exceptionStr);
+
+  // Restore param: retval; type: refptr_diff_byref
+  if (retval) {
+    if (retvalPtr.get()) {
+      if (retvalPtr.get() != retvalOrig) {
+        *retval = CefV8ValueCToCpp::Unwrap(retvalPtr);
+      }
+    } else {
+      *retval = NULL;
+    }
   }
 
-  return rv;
+  // Return type: bool
+  return _retval;
 }
 
+
 int CEF_CALLBACK v8accessor_set(struct _cef_v8accessor_t* self,
     const cef_string_t* name, struct _cef_v8value_t* object,
     struct _cef_v8value_t* value, cef_string_t* exception)
 {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
   DCHECK(self);
-  if(!self)
+  if (!self)
+    return 0;
+  // Verify param: name; type: string_byref_const
+  DCHECK(name);
+  if (!name)
+    return 0;
+  // Verify param: object; type: refptr_diff
+  DCHECK(object);
+  if (!object)
+    return 0;
+  // Verify param: value; type: refptr_diff
+  DCHECK(value);
+  if (!value)
+    return 0;
+  // Verify param: exception; type: string_byref
+  DCHECK(exception);
+  if (!exception)
     return 0;
 
-  CefRefPtr<CefV8Value> objectPtr;
+  // Translate param: exception; type: string_byref
-  if(object)
-    objectPtr = CefV8ValueCToCpp::Wrap(object);
-
-  CefRefPtr<CefV8Value> valuePtr;
-  if(value)
-    valuePtr = CefV8ValueCToCpp::Wrap(value);
-
   CefString exceptionStr(exception);
-  bool rv = CefV8AccessorCppToC::Get(self)->Set(CefString(name), objectPtr,
+
-                                                valuePtr, exceptionStr);
+  // Execute
-  return rv;
+  bool _retval = CefV8AccessorCppToC::Get(self)->Set(
+      CefString(name),
+      CefV8ValueCToCpp::Wrap(object),
+      CefV8ValueCToCpp::Wrap(value),
+      exceptionStr);
+
+  // Return type: bool
+  return _retval;
 }
 
 
+
 // CONSTRUCTOR - Do not edit by hand.
 
 CefV8AccessorCppToC::CefV8AccessorCppToC(CefV8Accessor* cls)