From 6bfb5ab33b68aadd13bba055d195c2f6aa9a81d6 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 23 Jan 2019 17:10:23 +0100 Subject: [PATCH] Remove old approach for debugging leaked wrapper object references (issue #2593) --- .../cpptoc/accessibility_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/app_cpptoc.cc | 9 +- libcef_dll/cpptoc/auth_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/base_ref_counted_cpptoc.cc | 8 - libcef_dll/cpptoc/base_scoped_cpptoc.cc | 7 - .../cpptoc/before_download_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/binary_value_cpptoc.cc | 10 +- libcef_dll/cpptoc/browser_cpptoc.cc | 9 +- libcef_dll/cpptoc/browser_host_cpptoc.cc | 10 +- .../cpptoc/browser_process_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/callback_cpptoc.cc | 9 +- libcef_dll/cpptoc/client_cpptoc.cc | 9 +- libcef_dll/cpptoc/command_line_cpptoc.cc | 10 +- .../cpptoc/completion_callback_cpptoc.cc | 10 +- .../cpptoc/context_menu_handler_cpptoc.cc | 10 +- .../cpptoc/context_menu_params_cpptoc.cc | 10 +- libcef_dll/cpptoc/cookie_manager_cpptoc.cc | 10 +- libcef_dll/cpptoc/cookie_visitor_cpptoc.cc | 10 +- libcef_dll/cpptoc/cpptoc_ref_counted.h | 16 +- libcef_dll/cpptoc/cpptoc_scoped.h | 13 - .../cpptoc/delete_cookies_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/dialog_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/dictionary_value_cpptoc.cc | 10 +- libcef_dll/cpptoc/display_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/domdocument_cpptoc.cc | 10 +- libcef_dll/cpptoc/domnode_cpptoc.cc | 9 +- libcef_dll/cpptoc/domvisitor_cpptoc.cc | 9 +- libcef_dll/cpptoc/download_handler_cpptoc.cc | 10 +- .../cpptoc/download_image_callback_cpptoc.cc | 10 +- .../cpptoc/download_item_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/download_item_cpptoc.cc | 10 +- libcef_dll/cpptoc/drag_data_cpptoc.cc | 9 +- libcef_dll/cpptoc/drag_handler_cpptoc.cc | 10 +- .../cpptoc/end_tracing_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/extension_cpptoc.cc | 9 +- libcef_dll/cpptoc/extension_handler_cpptoc.cc | 10 +- .../cpptoc/file_dialog_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/find_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/focus_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/frame_cpptoc.cc | 9 +- .../get_extension_resource_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/image_cpptoc.cc | 9 +- libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/keyboard_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/life_span_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/list_value_cpptoc.cc | 9 +- libcef_dll/cpptoc/load_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/menu_model_cpptoc.cc | 9 +- .../cpptoc/menu_model_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/navigation_entry_cpptoc.cc | 10 +- .../cpptoc/navigation_entry_visitor_cpptoc.cc | 10 +- .../cpptoc/pdf_print_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/post_data_cpptoc.cc | 9 +- libcef_dll/cpptoc/post_data_element_cpptoc.cc | 10 +- .../cpptoc/print_dialog_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/print_handler_cpptoc.cc | 10 +- .../cpptoc/print_job_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/print_settings_cpptoc.cc | 10 +- libcef_dll/cpptoc/process_message_cpptoc.cc | 10 +- libcef_dll/cpptoc/read_handler_cpptoc.cc | 10 +- .../cpptoc/register_cdm_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/render_handler_cpptoc.cc | 10 +- .../cpptoc/render_process_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/request_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/request_context_cpptoc.cc | 10 +- .../cpptoc/request_context_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/request_cpptoc.cc | 9 +- libcef_dll/cpptoc/request_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/resolve_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/resource_bundle_cpptoc.cc | 10 +- .../cpptoc/resource_bundle_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/resource_handler_cpptoc.cc | 10 +- libcef_dll/cpptoc/response_cpptoc.cc | 9 +- libcef_dll/cpptoc/response_filter_cpptoc.cc | 10 +- .../run_context_menu_callback_cpptoc.cc | 10 +- .../cpptoc/run_file_dialog_callback_cpptoc.cc | 10 +- .../cpptoc/scheme_handler_factory_cpptoc.cc | 10 +- libcef_dll/cpptoc/scheme_registrar_cpptoc.cc | 10 +- ...lect_client_certificate_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/server_cpptoc.cc | 9 +- libcef_dll/cpptoc/server_handler_cpptoc.cc | 10 +- .../cpptoc/set_cookie_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/sslinfo_cpptoc.cc | 9 +- libcef_dll/cpptoc/sslstatus_cpptoc.cc | 9 +- libcef_dll/cpptoc/stream_reader_cpptoc.cc | 10 +- libcef_dll/cpptoc/stream_writer_cpptoc.cc | 10 +- libcef_dll/cpptoc/string_visitor_cpptoc.cc | 10 +- libcef_dll/cpptoc/task_cpptoc.cc | 9 +- libcef_dll/cpptoc/task_runner_cpptoc.cc | 9 +- .../cpptoc/test/translator_test_cpptoc.cc | 10 +- ...slator_test_ref_ptr_client_child_cpptoc.cc | 10 +- .../translator_test_ref_ptr_client_cpptoc.cc | 10 +- ...test_ref_ptr_library_child_child_cpptoc.cc | 11 +- ...lator_test_ref_ptr_library_child_cpptoc.cc | 10 +- .../translator_test_ref_ptr_library_cpptoc.cc | 10 +- ...nslator_test_scoped_client_child_cpptoc.cc | 10 +- .../translator_test_scoped_client_cpptoc.cc | 10 +- ..._test_scoped_library_child_child_cpptoc.cc | 11 +- ...slator_test_scoped_library_child_cpptoc.cc | 10 +- .../translator_test_scoped_library_cpptoc.cc | 10 +- libcef_dll/cpptoc/thread_cpptoc.cc | 9 +- libcef_dll/cpptoc/urlrequest_client_cpptoc.cc | 10 +- libcef_dll/cpptoc/urlrequest_cpptoc.cc | 9 +- libcef_dll/cpptoc/v8accessor_cpptoc.cc | 9 +- .../v8array_buffer_release_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/v8context_cpptoc.cc | 9 +- libcef_dll/cpptoc/v8exception_cpptoc.cc | 10 +- libcef_dll/cpptoc/v8handler_cpptoc.cc | 9 +- libcef_dll/cpptoc/v8interceptor_cpptoc.cc | 10 +- libcef_dll/cpptoc/v8stack_frame_cpptoc.cc | 10 +- libcef_dll/cpptoc/v8stack_trace_cpptoc.cc | 10 +- libcef_dll/cpptoc/v8value_cpptoc.cc | 9 +- libcef_dll/cpptoc/value_cpptoc.cc | 9 +- libcef_dll/cpptoc/views/box_layout_cpptoc.cc | 9 +- .../cpptoc/views/browser_view_cpptoc.cc | 10 +- .../views/browser_view_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/button_cpptoc.cc | 9 +- .../cpptoc/views/button_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/display_cpptoc.cc | 9 +- libcef_dll/cpptoc/views/fill_layout_cpptoc.cc | 9 +- .../cpptoc/views/label_button_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/layout_cpptoc.cc | 9 +- libcef_dll/cpptoc/views/menu_button_cpptoc.cc | 9 +- .../views/menu_button_delegate_cpptoc.cc | 10 +- .../views/menu_button_pressed_lock_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/panel_cpptoc.cc | 9 +- .../cpptoc/views/panel_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/scroll_view_cpptoc.cc | 9 +- libcef_dll/cpptoc/views/textfield_cpptoc.cc | 9 +- .../cpptoc/views/textfield_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/view_cpptoc.cc | 9 +- .../cpptoc/views/view_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/views/window_cpptoc.cc | 9 +- .../cpptoc/views/window_delegate_cpptoc.cc | 10 +- libcef_dll/cpptoc/waitable_event_cpptoc.cc | 10 +- libcef_dll/cpptoc/web_plugin_info_cpptoc.cc | 10 +- .../cpptoc/web_plugin_info_visitor_cpptoc.cc | 10 +- .../web_plugin_unstable_callback_cpptoc.cc | 10 +- libcef_dll/cpptoc/write_handler_cpptoc.cc | 10 +- .../cpptoc/x509cert_principal_cpptoc.cc | 10 +- libcef_dll/cpptoc/x509certificate_cpptoc.cc | 10 +- libcef_dll/cpptoc/xml_reader_cpptoc.cc | 9 +- libcef_dll/cpptoc/zip_reader_cpptoc.cc | 9 +- .../ctocpp/accessibility_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/app_ctocpp.cc | 9 +- libcef_dll/ctocpp/auth_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/base_ref_counted_ctocpp.cc | 8 - libcef_dll/ctocpp/base_scoped_ctocpp.cc | 7 - .../ctocpp/before_download_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/binary_value_ctocpp.cc | 10 +- libcef_dll/ctocpp/browser_ctocpp.cc | 9 +- libcef_dll/ctocpp/browser_host_ctocpp.cc | 10 +- .../ctocpp/browser_process_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/callback_ctocpp.cc | 9 +- libcef_dll/ctocpp/client_ctocpp.cc | 9 +- libcef_dll/ctocpp/command_line_ctocpp.cc | 10 +- .../ctocpp/completion_callback_ctocpp.cc | 10 +- .../ctocpp/context_menu_handler_ctocpp.cc | 10 +- .../ctocpp/context_menu_params_ctocpp.cc | 10 +- libcef_dll/ctocpp/cookie_manager_ctocpp.cc | 10 +- libcef_dll/ctocpp/cookie_visitor_ctocpp.cc | 10 +- libcef_dll/ctocpp/ctocpp_ref_counted.h | 19 +- libcef_dll/ctocpp/ctocpp_scoped.h | 18 +- .../ctocpp/delete_cookies_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/dialog_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/dictionary_value_ctocpp.cc | 10 +- libcef_dll/ctocpp/display_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/domdocument_ctocpp.cc | 10 +- libcef_dll/ctocpp/domnode_ctocpp.cc | 9 +- libcef_dll/ctocpp/domvisitor_ctocpp.cc | 9 +- libcef_dll/ctocpp/download_handler_ctocpp.cc | 10 +- .../ctocpp/download_image_callback_ctocpp.cc | 10 +- .../ctocpp/download_item_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/download_item_ctocpp.cc | 10 +- libcef_dll/ctocpp/drag_data_ctocpp.cc | 9 +- libcef_dll/ctocpp/drag_handler_ctocpp.cc | 10 +- .../ctocpp/end_tracing_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/extension_ctocpp.cc | 9 +- libcef_dll/ctocpp/extension_handler_ctocpp.cc | 10 +- .../ctocpp/file_dialog_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/find_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/focus_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/frame_ctocpp.cc | 9 +- .../get_extension_resource_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/image_ctocpp.cc | 9 +- libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/keyboard_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/life_span_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/list_value_ctocpp.cc | 9 +- libcef_dll/ctocpp/load_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/menu_model_ctocpp.cc | 9 +- .../ctocpp/menu_model_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/navigation_entry_ctocpp.cc | 10 +- .../ctocpp/navigation_entry_visitor_ctocpp.cc | 10 +- .../ctocpp/pdf_print_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/post_data_ctocpp.cc | 9 +- libcef_dll/ctocpp/post_data_element_ctocpp.cc | 10 +- .../ctocpp/print_dialog_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/print_handler_ctocpp.cc | 10 +- .../ctocpp/print_job_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/print_settings_ctocpp.cc | 10 +- libcef_dll/ctocpp/process_message_ctocpp.cc | 10 +- libcef_dll/ctocpp/read_handler_ctocpp.cc | 10 +- .../ctocpp/register_cdm_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/render_handler_ctocpp.cc | 10 +- .../ctocpp/render_process_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/request_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/request_context_ctocpp.cc | 10 +- .../ctocpp/request_context_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/request_ctocpp.cc | 9 +- libcef_dll/ctocpp/request_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/resolve_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/resource_bundle_ctocpp.cc | 10 +- .../ctocpp/resource_bundle_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/resource_handler_ctocpp.cc | 10 +- libcef_dll/ctocpp/response_ctocpp.cc | 9 +- libcef_dll/ctocpp/response_filter_ctocpp.cc | 10 +- .../run_context_menu_callback_ctocpp.cc | 10 +- .../ctocpp/run_file_dialog_callback_ctocpp.cc | 10 +- .../ctocpp/scheme_handler_factory_ctocpp.cc | 10 +- libcef_dll/ctocpp/scheme_registrar_ctocpp.cc | 10 +- ...lect_client_certificate_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/server_ctocpp.cc | 9 +- libcef_dll/ctocpp/server_handler_ctocpp.cc | 10 +- .../ctocpp/set_cookie_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/sslinfo_ctocpp.cc | 9 +- libcef_dll/ctocpp/sslstatus_ctocpp.cc | 9 +- libcef_dll/ctocpp/stream_reader_ctocpp.cc | 10 +- libcef_dll/ctocpp/stream_writer_ctocpp.cc | 10 +- libcef_dll/ctocpp/string_visitor_ctocpp.cc | 10 +- libcef_dll/ctocpp/task_ctocpp.cc | 9 +- libcef_dll/ctocpp/task_runner_ctocpp.cc | 9 +- .../ctocpp/test/translator_test_ctocpp.cc | 10 +- ...slator_test_ref_ptr_client_child_ctocpp.cc | 10 +- .../translator_test_ref_ptr_client_ctocpp.cc | 10 +- ...test_ref_ptr_library_child_child_ctocpp.cc | 11 +- ...lator_test_ref_ptr_library_child_ctocpp.cc | 10 +- .../translator_test_ref_ptr_library_ctocpp.cc | 10 +- ...nslator_test_scoped_client_child_ctocpp.cc | 10 +- .../translator_test_scoped_client_ctocpp.cc | 10 +- ..._test_scoped_library_child_child_ctocpp.cc | 11 +- ...slator_test_scoped_library_child_ctocpp.cc | 10 +- .../translator_test_scoped_library_ctocpp.cc | 10 +- libcef_dll/ctocpp/thread_ctocpp.cc | 9 +- libcef_dll/ctocpp/urlrequest_client_ctocpp.cc | 10 +- libcef_dll/ctocpp/urlrequest_ctocpp.cc | 9 +- libcef_dll/ctocpp/v8accessor_ctocpp.cc | 9 +- .../v8array_buffer_release_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/v8context_ctocpp.cc | 9 +- libcef_dll/ctocpp/v8exception_ctocpp.cc | 10 +- libcef_dll/ctocpp/v8handler_ctocpp.cc | 9 +- libcef_dll/ctocpp/v8interceptor_ctocpp.cc | 10 +- libcef_dll/ctocpp/v8stack_frame_ctocpp.cc | 10 +- libcef_dll/ctocpp/v8stack_trace_ctocpp.cc | 10 +- libcef_dll/ctocpp/v8value_ctocpp.cc | 9 +- libcef_dll/ctocpp/value_ctocpp.cc | 9 +- libcef_dll/ctocpp/views/box_layout_ctocpp.cc | 9 +- .../ctocpp/views/browser_view_ctocpp.cc | 10 +- .../views/browser_view_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/button_ctocpp.cc | 9 +- .../ctocpp/views/button_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/display_ctocpp.cc | 9 +- libcef_dll/ctocpp/views/fill_layout_ctocpp.cc | 9 +- .../ctocpp/views/label_button_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/layout_ctocpp.cc | 9 +- libcef_dll/ctocpp/views/menu_button_ctocpp.cc | 9 +- .../views/menu_button_delegate_ctocpp.cc | 10 +- .../views/menu_button_pressed_lock_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/panel_ctocpp.cc | 9 +- .../ctocpp/views/panel_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/scroll_view_ctocpp.cc | 9 +- libcef_dll/ctocpp/views/textfield_ctocpp.cc | 9 +- .../ctocpp/views/textfield_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/view_ctocpp.cc | 9 +- .../ctocpp/views/view_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/views/window_ctocpp.cc | 9 +- .../ctocpp/views/window_delegate_ctocpp.cc | 10 +- libcef_dll/ctocpp/waitable_event_ctocpp.cc | 10 +- libcef_dll/ctocpp/web_plugin_info_ctocpp.cc | 10 +- .../ctocpp/web_plugin_info_visitor_ctocpp.cc | 10 +- .../web_plugin_unstable_callback_ctocpp.cc | 10 +- libcef_dll/ctocpp/write_handler_ctocpp.cc | 10 +- .../ctocpp/x509cert_principal_ctocpp.cc | 10 +- libcef_dll/ctocpp/x509certificate_ctocpp.cc | 10 +- libcef_dll/ctocpp/xml_reader_ctocpp.cc | 9 +- libcef_dll/ctocpp/zip_reader_ctocpp.cc | 9 +- libcef_dll/libcef_dll.cc | 256 +----------------- libcef_dll/wrapper/libcef_dll_wrapper.cc | 256 +----------------- tools/make_cpptoc_impl.py | 27 +- tools/make_ctocpp_impl.py | 27 +- 292 files changed, 291 insertions(+), 3095 deletions(-) diff --git a/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc b/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc index 4fc35422d..b0406fb58 100644 --- a/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5524afc164e5f8baf765fa91e5064105dd34b212$ +// $hash=236a2f5e705cde035d9d87a8a6045dccd258a2d0$ // #include "libcef_dll/cpptoc/accessibility_handler_cpptoc.h" @@ -88,14 +88,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefAccessibilityHandlerCppToC, - CefAccessibilityHandler, - cef_accessibility_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = WT_APP; diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.cc b/libcef_dll/cpptoc/auth_callback_cpptoc.cc index 4b4bb3861..bb98e7095 100644 --- a/libcef_dll/cpptoc/auth_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/auth_callback_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=103cb371ed4b96f94928587d464f1c5b459ca24c$ +// $hash=cb7cf1cb27059ab4ebf7e1f81b3eee1b34d279f8$ // #include "libcef_dll/cpptoc/auth_callback_cpptoc.h" @@ -74,14 +74,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCScoped:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped -base::AtomicRefCount CefCppToCRefCounted< - CefBeforeDownloadCallbackCppToC, - CefBeforeDownloadCallback, - cef_before_download_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefBrowserProcessHandlerCppToC, - CefBrowserProcessHandler, - cef_browser_process_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: kWrapperType = WT_CLIENT; diff --git a/libcef_dll/cpptoc/command_line_cpptoc.cc b/libcef_dll/cpptoc/command_line_cpptoc.cc index 334a2130a..f4b19caad 100644 --- a/libcef_dll/cpptoc/command_line_cpptoc.cc +++ b/libcef_dll/cpptoc/command_line_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=745c869d4a8bb07633e5aff8a313a642503bd84f$ +// $hash=2eec49f4f266de3ab29041d1140b213bd3dd564d$ // #include "libcef_dll/cpptoc/command_line_cpptoc.h" @@ -425,14 +425,6 @@ CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCountedrelease = struct_release; base->has_one_ref = struct_has_one_ref; base->has_at_least_one_ref = struct_has_at_least_one_ref; - -#if DCHECK_IS_ON() - base::AtomicRefCountInc(&DebugObjCt); -#endif } - virtual ~CefCppToCRefCounted() { -#if DCHECK_IS_ON() - base::AtomicRefCountDec(&DebugObjCt); -#endif - } + virtual ~CefCppToCRefCounted() {} private: // Used to associate this wrapper object, the underlying object instance and diff --git a/libcef_dll/cpptoc/cpptoc_scoped.h b/libcef_dll/cpptoc/cpptoc_scoped.h index 8f328f06e..c0b304df7 100644 --- a/libcef_dll/cpptoc/cpptoc_scoped.h +++ b/libcef_dll/cpptoc/cpptoc_scoped.h @@ -154,30 +154,17 @@ class CefCppToCScoped : public CefBaseScoped { // call UnderlyingRelease() on the wrapping CefCToCpp object. StructName* GetStruct() { return &wrapper_struct_.struct_; } -#if DCHECK_IS_ON() - // Simple tracking of allocated objects. - static base::AtomicRefCount DebugObjCt; -#endif - protected: CefCppToCScoped() { wrapper_struct_.type_ = kWrapperType; wrapper_struct_.wrapper_ = this; memset(GetStruct(), 0, sizeof(StructName)); - -#if DCHECK_IS_ON() - base::AtomicRefCountInc(&DebugObjCt); -#endif } virtual ~CefCppToCScoped() { // Only delete the underlying object if we own it. if (owned_ && wrapper_struct_.object_) delete wrapper_struct_.object_; - -#if DCHECK_IS_ON() - base::AtomicRefCountDec(&DebugObjCt); -#endif } private: diff --git a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc index 1a4c29c21..1889312c6 100644 --- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0c57a2898a260d61342066e6e923d2ae60007680$ +// $hash=0b3b80f715c561227e286098b88b8dbe2acc84a1$ // #include "libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h" @@ -59,14 +59,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefDeleteCookiesCallbackCppToC, - CefDeleteCookiesCallback, - cef_delete_cookies_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefDownloadImageCallbackCppToC, - CefDownloadImageCallback, - cef_download_image_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefDownloadItemCallbackCppToC, - CefDownloadItemCallback, - cef_download_item_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = diff --git a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc index 43d688080..59701a073 100644 --- a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=967b251d6a1cc2488facf53dfd2c2183c3c61b43$ +// $hash=22728c3e5c0597d46102ae9d7992d47ca356f2f5$ // #include "libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h" @@ -78,14 +78,6 @@ CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefGetExtensionResourceCallbackCppToC, - CefGetExtensionResourceCallback, - cef_get_extension_resource_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc index 6577fa07f..8b323a65c 100644 --- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8f763ca4fc24cb5d5f4189b685e1b7662b5e7824$ +// $hash=094966ae3f6137686814fbf098b80721e4f5bab6$ // #include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h" @@ -60,14 +60,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefNavigationEntryVisitorCppToC, - CefNavigationEntryVisitor, - cef_navigation_entry_visitor_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefPrintDialogCallbackCppToC, - CefPrintDialogCallback, - cef_print_dialog_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefRegisterCdmCallbackCppToC, - CefRegisterCdmCallback, - cef_register_cdm_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefRenderProcessHandlerCppToC, - CefRenderProcessHandler, - cef_render_process_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefRequestContextHandlerCppToC, - CefRequestContextHandler, - cef_request_context_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefResourceBundleHandlerCppToC, - CefResourceBundleHandler, - cef_resource_bundle_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefRunContextMenuCallbackCppToC, - CefRunContextMenuCallback, - cef_run_context_menu_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefRunFileDialogCallbackCppToC, - CefRunFileDialogCallback, - cef_run_file_dialog_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefSchemeHandlerFactoryCppToC, - CefSchemeHandlerFactory, - cef_scheme_handler_factory_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCScoped< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCScoped::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped -base::AtomicRefCount CefCppToCRefCounted< - CefSelectClientCertificateCallbackCppToC, - CefSelectClientCertificateCallback, - cef_select_client_certificate_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted< CefSelectClientCertificateCallbackCppToC, diff --git a/libcef_dll/cpptoc/server_cpptoc.cc b/libcef_dll/cpptoc/server_cpptoc.cc index d7225f88b..823d6728e 100644 --- a/libcef_dll/cpptoc/server_cpptoc.cc +++ b/libcef_dll/cpptoc/server_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7cf6ba3ad5b4738d2d5f96205bcd03ed0b7b1419$ +// $hash=866f8415d389dabfbd81aa0116fe7ba857a7b2f3$ // #include "libcef_dll/cpptoc/server_cpptoc.h" @@ -324,13 +324,6 @@ CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: kWrapperType = WT_SERVER; diff --git a/libcef_dll/cpptoc/server_handler_cpptoc.cc b/libcef_dll/cpptoc/server_handler_cpptoc.cc index b0404d819..123d8e5a4 100644 --- a/libcef_dll/cpptoc/server_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/server_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b2eab24cfa1bf3ebb4e7bcea3d9d2e728c5e1c5a$ +// $hash=f9f59132c94ae7b85135dff3e30cff45bebbc8f4$ // #include "libcef_dll/cpptoc/server_handler_cpptoc.h" @@ -252,14 +252,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = diff --git a/libcef_dll/cpptoc/task_runner_cpptoc.cc b/libcef_dll/cpptoc/task_runner_cpptoc.cc index 7b4b88bcc..86f7b4b36 100644 --- a/libcef_dll/cpptoc/task_runner_cpptoc.cc +++ b/libcef_dll/cpptoc/task_runner_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c593d32edf120253e3b3ce95f49dca53e6b6fbea$ +// $hash=79701f34ca5acdab85a1848010c3510c86e3ada4$ // #include "libcef_dll/cpptoc/task_runner_cpptoc.h" @@ -175,13 +175,6 @@ CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefTranslatorTestRefPtrClientChildCppToC, - CefTranslatorTestRefPtrClientChild, - cef_translator_test_ref_ptr_client_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted< CefTranslatorTestRefPtrClientChildCppToC, diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc index daf60cebe..c52b945e2 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=94dda0368c29eee3e0fcb3a1429755649cbdd245$ +// $hash=69b6f21feb14c9cf90189bdd12ec0a6d7304ff2d$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h" @@ -66,14 +66,6 @@ CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefTranslatorTestRefPtrClientCppToC, - CefTranslatorTestRefPtrClient, - cef_translator_test_ref_ptr_client_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefTranslatorTestRefPtrLibraryChildChildCppToC, - CefTranslatorTestRefPtrLibraryChildChild, - cef_translator_test_ref_ptr_library_child_child_t>::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted< CefTranslatorTestRefPtrLibraryChildChildCppToC, diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc index 8b7b08fd5..0e3c1f304 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bb730076e72ba699a3a07b26f8eaa7ed4e61882f$ +// $hash=a7cbc59470d0ad3a2bd65c6c65f0c57c89a4e43a$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h" @@ -143,14 +143,6 @@ CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefTranslatorTestRefPtrLibraryChildCppToC, - CefTranslatorTestRefPtrLibraryChild, - cef_translator_test_ref_ptr_library_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted< CefTranslatorTestRefPtrLibraryChildCppToC, diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc index 639e1d160..993b680a9 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7a5ff53a90627d3079306c77cd5b6af90c2b5db3$ +// $hash=bea1e936322901ab4fadfc06810a3b5006f1e3e3$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h" @@ -104,14 +104,6 @@ CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefTranslatorTestRefPtrLibraryCppToC, - CefTranslatorTestRefPtrLibrary, - cef_translator_test_ref_ptr_library_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCScoped< - CefTranslatorTestScopedClientChildCppToC, - CefTranslatorTestScopedClientChild, - cef_translator_test_scoped_client_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped -base::AtomicRefCount CefCppToCScoped< - CefTranslatorTestScopedClientCppToC, - CefTranslatorTestScopedClient, - cef_translator_test_scoped_client_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped -base::AtomicRefCount CefCppToCScoped< - CefTranslatorTestScopedLibraryChildChildCppToC, - CefTranslatorTestScopedLibraryChildChild, - cef_translator_test_scoped_library_child_child_t>::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped< CefTranslatorTestScopedLibraryChildChildCppToC, diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc index 9d12229ab..6a95d9120 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=171c183383e07cd9a62afe4452d7c2bf080c84cc$ +// $hash=f30c2211f47d29b9d232797cadb16de9aac75c88$ // #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h" @@ -147,14 +147,6 @@ CefCppToCScoped -base::AtomicRefCount CefCppToCScoped< - CefTranslatorTestScopedLibraryChildCppToC, - CefTranslatorTestScopedLibraryChild, - cef_translator_test_scoped_library_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped -base::AtomicRefCount CefCppToCScoped< - CefTranslatorTestScopedLibraryCppToC, - CefTranslatorTestScopedLibrary, - cef_translator_test_scoped_library_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCScoped::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: kWrapperType = WT_THREAD; diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc index 128778fc9..8e96b90fe 100644 --- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5697b97e0a0ff1e70026b29c7e8ced60b6c60b35$ +// $hash=cf09527848811b098ae7a89b2bb1b68da2330454$ // #include "libcef_dll/cpptoc/urlrequest_client_cpptoc.h" @@ -177,14 +177,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefV8ArrayBufferReleaseCallbackCppToC, - CefV8ArrayBufferReleaseCallback, - cef_v8array_buffer_release_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = diff --git a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc index 8f42d095d..3bbb04bee 100644 --- a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6f1d2cc2dc85d65bca5e6e0ad3fa5465ffe25abe$ +// $hash=25ef1d1a300b9b581f1ebea6e5b09d5d7f82d71d$ // #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" @@ -141,13 +141,6 @@ CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefBrowserViewDelegateCppToC, - CefBrowserViewDelegate, - cef_browser_view_delegate_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: kWrapperType = WT_BUTTON; diff --git a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc index 5d1e67ad1..940c41efb 100644 --- a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dde104d729355720a66995dbf947c1c58e27d707$ +// $hash=a39fad6e1064ec36f186a4ffe57a181a23804a7b$ // #include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h" @@ -291,14 +291,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: kWrapperType = WT_LAYOUT; diff --git a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc index 86d6f2176..f0d405b41 100644 --- a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9965360aa4fabed5c6550b97ff32445652d24cb6$ +// $hash=e89e1ff0724489e14eef305e8e32093c8dc00c8d$ // #include "libcef_dll/cpptoc/views/menu_button_cpptoc.h" @@ -1460,13 +1460,6 @@ CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefMenuButtonPressedLockCppToC, - CefMenuButtonPressedLock, - cef_menu_button_pressed_lock_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = diff --git a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc index 5388b0060..81bfcdf46 100644 --- a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8d53561e0ce0fcfc46d9a6803c2ed6a7c300a670$ +// $hash=0066fe4feeb3f68781acc62f70dc6589d5efe0b1$ // #include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h" @@ -247,14 +247,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::kWrapperType = diff --git a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc index cae395b35..6d7f1c7aa 100644 --- a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c5635ee1a7e661b2b3fedf63d3a7d777ff378228$ +// $hash=9fffd8804f2c03d9f2759ef8acceb1ef73739ed2$ // #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" @@ -264,14 +264,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: kWrapperType = WT_WINDOW; diff --git a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc index 8bdfe4408..f09bd12ff 100644 --- a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8f19f7715fef7895bfb1a18b72fdca41d965a415$ +// $hash=ce5677b0fd60a3bac37b7df48bea9762404d0244$ // #include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h" @@ -512,14 +512,6 @@ CefRefPtr CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted< - CefWebPluginInfoVisitorCppToC, - CefWebPluginInfoVisitor, - cef_web_plugin_info_visitor_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCppToCRefCounted< - CefWebPluginUnstableCallbackCppToC, - CefWebPluginUnstableCallback, - cef_web_plugin_unstable_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted CefCppToCRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCppToCRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCppToCRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCppToCRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefAccessibilityHandlerCToCpp, - CefAccessibilityHandler, - cef_accessibility_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = WT_APP; diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.cc b/libcef_dll/ctocpp/auth_callback_ctocpp.cc index 15d510220..c0d128ce7 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=09aa28001ce5c27be8aabaaac447ffd425649774$ +// $hash=ba2dbf45a65134c64d05c028ba656c7c19fdfa54$ // #include "libcef_dll/ctocpp/auth_callback_ctocpp.h" @@ -67,14 +67,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppScoped:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped -base::AtomicRefCount CefCToCppRefCounted< - CefBeforeDownloadCallbackCToCpp, - CefBeforeDownloadCallback, - cef_before_download_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefBrowserProcessHandlerCToCpp, - CefBrowserProcessHandler, - cef_browser_process_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: kWrapperType = WT_CLIENT; diff --git a/libcef_dll/ctocpp/command_line_ctocpp.cc b/libcef_dll/ctocpp/command_line_ctocpp.cc index dd4123580..428c129a9 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c50cd1a504c4f58009b0a54ccf5c87ffd8e2bbbd$ +// $hash=a87daf3d3e3bd604ac3c008561676181d42f3266$ // #include "libcef_dll/ctocpp/command_line_ctocpp.h" @@ -430,14 +430,6 @@ CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefDeleteCookiesCallbackCToCpp, - CefDeleteCookiesCallback, - cef_delete_cookies_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefDownloadImageCallbackCToCpp, - CefDownloadImageCallback, - cef_download_image_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefDownloadItemCallbackCToCpp, - CefDownloadItemCallback, - cef_download_item_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = diff --git a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc index 36e25778c..c60d855b9 100644 --- a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=57baa0469fab143d1598ab18cf8b92891751c8b0$ +// $hash=2f78b59f643dd717a3ce18b9d4ddb1c7c49d2e5e$ // #include "libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h" @@ -70,14 +70,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefGetExtensionResourceCallbackCToCpp, - CefGetExtensionResourceCallback, - cef_get_extension_resource_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc index d8a9dc3c2..c54bcda42 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d64872738297fd38a5cda226d88d0e2a57d5508f$ +// $hash=d82a0396b5dca1443a021fdff2f63dbb4d110694$ // #include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h" @@ -54,14 +54,6 @@ cef_jsdialog_callback_t* CefCToCppRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefNavigationEntryVisitorCToCpp, - CefNavigationEntryVisitor, - cef_navigation_entry_visitor_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefPrintDialogCallbackCToCpp, - CefPrintDialogCallback, - cef_print_dialog_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefRegisterCdmCallbackCToCpp, - CefRegisterCdmCallback, - cef_register_cdm_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefRenderProcessHandlerCToCpp, - CefRenderProcessHandler, - cef_render_process_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefRequestContextHandlerCToCpp, - CefRequestContextHandler, - cef_request_context_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefResourceBundleHandlerCToCpp, - CefResourceBundleHandler, - cef_resource_bundle_handler_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefRunContextMenuCallbackCToCpp, - CefRunContextMenuCallback, - cef_run_context_menu_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefRunFileDialogCallbackCToCpp, - CefRunFileDialogCallback, - cef_run_file_dialog_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefSchemeHandlerFactoryCToCpp, - CefSchemeHandlerFactory, - cef_scheme_handler_factory_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppScoped::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped -base::AtomicRefCount CefCToCppRefCounted< - CefSelectClientCertificateCallbackCToCpp, - CefSelectClientCertificateCallback, - cef_select_client_certificate_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted< CefSelectClientCertificateCallbackCToCpp, diff --git a/libcef_dll/ctocpp/server_ctocpp.cc b/libcef_dll/ctocpp/server_ctocpp.cc index 34ac3ced3..b60f3059f 100644 --- a/libcef_dll/ctocpp/server_ctocpp.cc +++ b/libcef_dll/ctocpp/server_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=98264bc53181dbda80d4474494ffeef420463320$ +// $hash=604ea9cb663e5f2824f9928ed2f885e3c0a99482$ // #include "libcef_dll/ctocpp/server_ctocpp.h" @@ -315,13 +315,6 @@ CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: kWrapperType = WT_SERVER; diff --git a/libcef_dll/ctocpp/server_handler_ctocpp.cc b/libcef_dll/ctocpp/server_handler_ctocpp.cc index c89c1ac4c..720efe773 100644 --- a/libcef_dll/ctocpp/server_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/server_handler_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=381eba12e69c8beedb92ada87ab54a3764be4230$ +// $hash=dd1054ae58e86f1f1e8341eaabf94a6b220025f9$ // #include "libcef_dll/ctocpp/server_handler_ctocpp.h" @@ -239,14 +239,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = diff --git a/libcef_dll/ctocpp/task_runner_ctocpp.cc b/libcef_dll/ctocpp/task_runner_ctocpp.cc index 6f94f4413..fc57e10db 100644 --- a/libcef_dll/ctocpp/task_runner_ctocpp.cc +++ b/libcef_dll/ctocpp/task_runner_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7fde43475329d8b158cd0325a0382ba3cc49cda0$ +// $hash=1a131c57d2764e6ce0004585e3401c53c4342386$ // #include "libcef_dll/ctocpp/task_runner_ctocpp.h" @@ -165,13 +165,6 @@ CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefTranslatorTestRefPtrClientChildCToCpp, - CefTranslatorTestRefPtrClientChild, - cef_translator_test_ref_ptr_client_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted< CefTranslatorTestRefPtrClientChildCToCpp, diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc index 7f903a12d..ea9a5a17d 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=62db5b865590f2242bea5ff7b5ec26c5730b9cd9$ +// $hash=52bb66023ffca64e74fbaefb4a3769bc622bc7e4$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h" @@ -59,14 +59,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefTranslatorTestRefPtrClientCToCpp, - CefTranslatorTestRefPtrClient, - cef_translator_test_ref_ptr_client_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefTranslatorTestRefPtrLibraryChildChildCToCpp, - CefTranslatorTestRefPtrLibraryChildChild, - cef_translator_test_ref_ptr_library_child_child_t>::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted< CefTranslatorTestRefPtrLibraryChildChildCToCpp, diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc index 324798673..a4219bd83 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a22f1d50f0b94e1de8c6fd12842d2849cd10706f$ +// $hash=23e80faef7d16df6eed546e6fd8d1c731c8b8009$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h" @@ -126,14 +126,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefTranslatorTestRefPtrLibraryChildCToCpp, - CefTranslatorTestRefPtrLibraryChild, - cef_translator_test_ref_ptr_library_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted< CefTranslatorTestRefPtrLibraryChildCToCpp, diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc index 7702253b8..d871328ad 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b89880c1956f0d37f8770f0ef9abb8ec3c517720$ +// $hash=34a68c21ae04f021cdd5387ff1b4dfa1b5f04c43$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h" @@ -96,14 +96,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefTranslatorTestRefPtrLibraryCToCpp, - CefTranslatorTestRefPtrLibrary, - cef_translator_test_ref_ptr_library_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppScoped< - CefTranslatorTestScopedClientChildCToCpp, - CefTranslatorTestScopedClientChild, - cef_translator_test_scoped_client_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped -base::AtomicRefCount CefCToCppScoped< - CefTranslatorTestScopedClientCToCpp, - CefTranslatorTestScopedClient, - cef_translator_test_scoped_client_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped -base::AtomicRefCount CefCToCppScoped< - CefTranslatorTestScopedLibraryChildChildCToCpp, - CefTranslatorTestScopedLibraryChildChild, - cef_translator_test_scoped_library_child_child_t>::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped< CefTranslatorTestScopedLibraryChildChildCToCpp, diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc index 2b9194f1c..41412a3a1 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3710964ee91febb36938956d5d5e23ba0d4a686b$ +// $hash=09e48707a11e7e1bd833e5efd7fe34de0576ee12$ // #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h" @@ -134,14 +134,6 @@ CefCToCppScoped -base::AtomicRefCount CefCToCppScoped< - CefTranslatorTestScopedLibraryChildCToCpp, - CefTranslatorTestScopedLibraryChild, - cef_translator_test_scoped_library_child_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped -base::AtomicRefCount CefCToCppScoped< - CefTranslatorTestScopedLibraryCToCpp, - CefTranslatorTestScopedLibrary, - cef_translator_test_scoped_library_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppScoped::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: kWrapperType = WT_THREAD; diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc index 910dcf5a5..be22e60ca 100644 --- a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1e2d5a383bb11a734d6c6d9b5297270cc69e388f$ +// $hash=b5d8bad14c65e3ec014941f5ee407715b7f4c5d2$ // #include "libcef_dll/ctocpp/urlrequest_client_ctocpp.h" @@ -170,14 +170,6 @@ cef_urlrequest_client_t* CefCToCppRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefV8ArrayBufferReleaseCallbackCToCpp, - CefV8ArrayBufferReleaseCallback, - cef_v8array_buffer_release_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc index 489ba9e2b..a0f858d56 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d02bac0bc9c81917244c63bc182ef94cb2bdf741$ +// $hash=4ed35f53453bbd97c0207bccf014cc2769341a23$ // #include "libcef_dll/ctocpp/views/box_layout_ctocpp.h" @@ -125,13 +125,6 @@ CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefBrowserViewDelegateCToCpp, - CefBrowserViewDelegate, - cef_browser_view_delegate_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: kWrapperType = WT_BUTTON; diff --git a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc index a02d7ad80..5bad491e0 100644 --- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8827e9696495ddbc282995d853cca1f9564de792$ +// $hash=c5801a89a6794754ecacf9b7cab082c8ce38486d$ // #include "libcef_dll/ctocpp/views/button_delegate_ctocpp.h" @@ -275,14 +275,6 @@ cef_button_delegate_t* CefCToCppRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: kWrapperType = WT_LAYOUT; diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc index ad5e887ea..188faf9a4 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=61405f026d0d0060d0827cf822851a4278d3ab08$ +// $hash=65bbd880228104da2b65abf2c2a75acd5d698ecd$ // #include "libcef_dll/ctocpp/views/menu_button_ctocpp.h" @@ -1172,13 +1172,6 @@ CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefMenuButtonPressedLockCToCpp, - CefMenuButtonPressedLock, - cef_menu_button_pressed_lock_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = diff --git a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc index 816fa1289..1fba67f90 100644 --- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=88c32ad4a24a5368d1db0f8b1850537b8913f0c4$ +// $hash=a0a01057936e2f5329ec8fe8130b6d8ef8d1dbd5$ // #include "libcef_dll/ctocpp/views/panel_delegate_ctocpp.h" @@ -235,14 +235,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::kWrapperType = diff --git a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc index 27e9e2ca0..e4843c26f 100644 --- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5e86714a2c9fa13e5ff7dc221900215f78caa2a6$ +// $hash=b8cb932adba945dac32c88e92cdb4d9be023ac33$ // #include "libcef_dll/ctocpp/views/view_delegate_ctocpp.h" @@ -256,14 +256,6 @@ CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted::UnwrapDerived( return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: kWrapperType = WT_WINDOW; diff --git a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc index 4e11a8349..c7d77b9c6 100644 --- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b293e7aab991af4d9643913f36fce298093c64ca$ +// $hash=9455341ab826d747338458f3c407ff896a1f81b9$ // #include "libcef_dll/ctocpp/views/window_delegate_ctocpp.h" @@ -473,14 +473,6 @@ cef_window_delegate_t* CefCToCppRefCounted< return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefWebPluginInfoVisitorCToCpp, - CefWebPluginInfoVisitor, - cef_web_plugin_info_visitor_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted< - CefWebPluginUnstableCallbackCToCpp, - CefWebPluginUnstableCallback, - cef_web_plugin_unstable_callback_t>::DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted -base::AtomicRefCount CefCToCppRefCounted::DebugObjCt - ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted:: return NULL; } -#if DCHECK_IS_ON() -template <> -base::AtomicRefCount - CefCToCppRefCounted:: - DebugObjCt ATOMIC_DECLARATION; -#endif - template <> CefWrapperType CefCToCppRefCounted 0: - names = sorted(names) - result += '\n#if DCHECK_IS_ON()'\ - '\n // Check that all wrapper objects have been destroyed.' - for name in names: - result += '\n DCHECK(base::AtomicRefCountIsZero(&' + name + '::DebugObjCt));' - result += '\n#endif // DCHECK_IS_ON()' - if len(result) != result_len: result += '\n' result_len = len(result) @@ -672,10 +651,8 @@ def make_cpptoc_class_impl(header, clsname, impl): ' return NULL;\n'+ \ '}\n\n' - const += '#if DCHECK_IS_ON()\n'+ \ - 'template<> base::AtomicRefCount '+parent_sig+'::DebugObjCt ATOMIC_DECLARATION;\n'+ \ - '#endif\n\n'+ \ - 'template<> CefWrapperType '+parent_sig+'::kWrapperType = '+get_wrapper_type_enum(clsname)+';' + const += 'template<> CefWrapperType ' + parent_sig + '::kWrapperType = ' + get_wrapper_type_enum( + clsname) + ';' result += '\n\n' + const diff --git a/tools/make_ctocpp_impl.py b/tools/make_ctocpp_impl.py index c1c2a94ef..8810a0deb 100644 --- a/tools/make_ctocpp_impl.py +++ b/tools/make_ctocpp_impl.py @@ -461,27 +461,6 @@ def make_ctocpp_function_impl_new(clsname, name, func, base_scoped): result += '\n' result_len = len(result) - if is_cef_shutdown: - classes = func.parent.get_classes() - - names = [] - for cls in classes: - if cls.has_attrib('no_debugct_check'): - continue - - if cls.is_library_side(): - names.append(cls.get_name() + 'CToCpp') - else: - names.append(cls.get_name() + 'CppToC') - - if len(names) > 0: - names = sorted(names) - result += '\n#if DCHECK_IS_ON()'\ - '\n // Check that all wrapper objects have been destroyed.' - for name in names: - result += '\n DCHECK(base::AtomicRefCountIsZero(&' + name + '::DebugObjCt));' - result += '\n#endif // DCHECK_IS_ON()' - if len(result) != result_len: result += '\n' result_len = len(result) @@ -669,10 +648,8 @@ def make_ctocpp_class_impl(header, clsname, impl): ' return NULL;\n'+ \ '}\n\n' - const += '#if DCHECK_IS_ON()\n'+ \ - 'template<> base::AtomicRefCount '+parent_sig+'::DebugObjCt ATOMIC_DECLARATION;\n'+ \ - '#endif\n\n'+ \ - 'template<> CefWrapperType '+parent_sig+'::kWrapperType = '+get_wrapper_type_enum(clsname)+';' + const += 'template<> CefWrapperType ' + parent_sig + '::kWrapperType = ' + get_wrapper_type_enum( + clsname) + ';' result += const