From d811450a323b51513db699843437e1d97a68622e Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 1 Sep 2016 14:24:30 +0300 Subject: [PATCH] Use DCHECK_IS_ON() instead of !NDEBUG for debug logic (issue #1961) --- include/base/cef_lock.h | 9 +-- include/base/cef_ref_counted.h | 16 ++--- include/base/cef_thread_collision_warner.h | 3 +- include/wrapper/cef_stream_resource_handler.h | 3 +- libcef/browser/browser_context.cc | 6 +- libcef/browser/browser_context.h | 2 +- libcef/browser/browser_info_manager.cc | 4 +- libcef/browser/browser_main.cc | 4 +- libcef/browser/menu_model_impl.cc | 4 +- libcef/browser/net/url_request_context.cc | 6 +- libcef/browser/net/url_request_context.h | 3 +- libcef/browser/net/url_request_manager.cc | 2 +- libcef_dll/base/cef_lock.cc | 6 +- libcef_dll/base/cef_lock_impl.cc | 2 +- libcef_dll/base/cef_ref_counted.cc | 10 +-- libcef_dll/cpptoc/app_cpptoc.cc | 2 +- libcef_dll/cpptoc/auth_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/base_cpptoc.cc | 2 +- .../cpptoc/before_download_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/binary_value_cpptoc.cc | 2 +- libcef_dll/cpptoc/browser_cpptoc.cc | 2 +- libcef_dll/cpptoc/browser_host_cpptoc.cc | 2 +- .../cpptoc/browser_process_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/client_cpptoc.cc | 2 +- libcef_dll/cpptoc/command_line_cpptoc.cc | 2 +- .../cpptoc/completion_callback_cpptoc.cc | 2 +- .../cpptoc/context_menu_handler_cpptoc.cc | 2 +- .../cpptoc/context_menu_params_cpptoc.cc | 2 +- libcef_dll/cpptoc/cookie_manager_cpptoc.cc | 2 +- libcef_dll/cpptoc/cookie_visitor_cpptoc.cc | 2 +- libcef_dll/cpptoc/cpptoc.h | 6 +- .../cpptoc/delete_cookies_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/dialog_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/dictionary_value_cpptoc.cc | 2 +- libcef_dll/cpptoc/display_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/domdocument_cpptoc.cc | 2 +- libcef_dll/cpptoc/domnode_cpptoc.cc | 2 +- libcef_dll/cpptoc/domvisitor_cpptoc.cc | 2 +- libcef_dll/cpptoc/download_handler_cpptoc.cc | 2 +- .../cpptoc/download_image_callback_cpptoc.cc | 2 +- .../cpptoc/download_item_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/download_item_cpptoc.cc | 2 +- libcef_dll/cpptoc/drag_data_cpptoc.cc | 2 +- libcef_dll/cpptoc/drag_handler_cpptoc.cc | 2 +- .../cpptoc/end_tracing_callback_cpptoc.cc | 2 +- .../cpptoc/file_dialog_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/find_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/focus_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/frame_cpptoc.cc | 2 +- .../cpptoc/geolocation_callback_cpptoc.cc | 2 +- .../cpptoc/geolocation_handler_cpptoc.cc | 2 +- .../cpptoc/get_geolocation_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/image_cpptoc.cc | 2 +- libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/keyboard_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/life_span_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/list_value_cpptoc.cc | 2 +- libcef_dll/cpptoc/load_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/menu_model_cpptoc.cc | 2 +- .../cpptoc/menu_model_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/navigation_entry_cpptoc.cc | 2 +- .../cpptoc/navigation_entry_visitor_cpptoc.cc | 2 +- .../cpptoc/pdf_print_callback_cpptoc.cc | 2 +- .../cpptoc/permission_handler_cpptoc.cc | 67 ------------------- libcef_dll/cpptoc/permission_handler_cpptoc.h | 41 ------------ libcef_dll/cpptoc/post_data_cpptoc.cc | 2 +- libcef_dll/cpptoc/post_data_element_cpptoc.cc | 2 +- .../cpptoc/print_dialog_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/print_handler_cpptoc.cc | 2 +- .../cpptoc/print_job_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/print_settings_cpptoc.cc | 2 +- libcef_dll/cpptoc/process_message_cpptoc.cc | 2 +- libcef_dll/cpptoc/read_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/render_handler_cpptoc.cc | 2 +- .../cpptoc/render_process_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/request_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/request_context_cpptoc.cc | 2 +- .../cpptoc/request_context_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/request_cpptoc.cc | 2 +- libcef_dll/cpptoc/request_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/resolve_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/resource_bundle_cpptoc.cc | 2 +- .../cpptoc/resource_bundle_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/resource_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/response_cpptoc.cc | 2 +- libcef_dll/cpptoc/response_filter_cpptoc.cc | 2 +- .../run_context_menu_callback_cpptoc.cc | 2 +- .../cpptoc/run_file_dialog_callback_cpptoc.cc | 2 +- .../cpptoc/scheme_handler_factory_cpptoc.cc | 2 +- libcef_dll/cpptoc/scheme_registrar_cpptoc.cc | 2 +- .../cpptoc/set_cookie_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/sslcert_principal_cpptoc.cc | 2 +- libcef_dll/cpptoc/sslinfo_cpptoc.cc | 2 +- libcef_dll/cpptoc/stream_reader_cpptoc.cc | 2 +- libcef_dll/cpptoc/stream_writer_cpptoc.cc | 2 +- libcef_dll/cpptoc/string_visitor_cpptoc.cc | 2 +- libcef_dll/cpptoc/task_cpptoc.cc | 2 +- libcef_dll/cpptoc/task_runner_cpptoc.cc | 2 +- .../cpptoc/test/translator_test_cpptoc.cc | 2 +- .../translator_test_handler_child_cpptoc.cc | 2 +- .../test/translator_test_handler_cpptoc.cc | 2 +- ...anslator_test_object_child_child_cpptoc.cc | 2 +- .../translator_test_object_child_cpptoc.cc | 2 +- .../test/translator_test_object_cpptoc.cc | 2 +- libcef_dll/cpptoc/urlrequest_client_cpptoc.cc | 2 +- libcef_dll/cpptoc/urlrequest_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8accessor_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8context_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8exception_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8stack_frame_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8stack_trace_cpptoc.cc | 2 +- libcef_dll/cpptoc/v8value_cpptoc.cc | 2 +- libcef_dll/cpptoc/value_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/box_layout_cpptoc.cc | 2 +- .../cpptoc/views/browser_view_cpptoc.cc | 2 +- .../views/browser_view_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/button_cpptoc.cc | 2 +- .../cpptoc/views/button_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/display_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/fill_layout_cpptoc.cc | 2 +- .../cpptoc/views/label_button_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/layout_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/menu_button_cpptoc.cc | 2 +- .../views/menu_button_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/panel_cpptoc.cc | 2 +- .../cpptoc/views/panel_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/scroll_view_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/textfield_cpptoc.cc | 2 +- .../cpptoc/views/textfield_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/view_cpptoc.cc | 2 +- .../cpptoc/views/view_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/views/window_cpptoc.cc | 2 +- .../cpptoc/views/window_delegate_cpptoc.cc | 2 +- libcef_dll/cpptoc/web_plugin_info_cpptoc.cc | 2 +- .../cpptoc/web_plugin_info_visitor_cpptoc.cc | 2 +- .../web_plugin_unstable_callback_cpptoc.cc | 2 +- libcef_dll/cpptoc/write_handler_cpptoc.cc | 2 +- libcef_dll/cpptoc/xml_reader_cpptoc.cc | 2 +- libcef_dll/cpptoc/zip_reader_cpptoc.cc | 2 +- libcef_dll/ctocpp/app_ctocpp.cc | 2 +- libcef_dll/ctocpp/auth_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/base_ctocpp.cc | 2 +- .../ctocpp/before_download_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/binary_value_ctocpp.cc | 2 +- libcef_dll/ctocpp/browser_ctocpp.cc | 2 +- libcef_dll/ctocpp/browser_host_ctocpp.cc | 2 +- .../ctocpp/browser_process_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/client_ctocpp.cc | 2 +- libcef_dll/ctocpp/command_line_ctocpp.cc | 2 +- .../ctocpp/completion_callback_ctocpp.cc | 2 +- .../ctocpp/context_menu_handler_ctocpp.cc | 2 +- .../ctocpp/context_menu_params_ctocpp.cc | 2 +- libcef_dll/ctocpp/cookie_manager_ctocpp.cc | 2 +- libcef_dll/ctocpp/cookie_visitor_ctocpp.cc | 2 +- libcef_dll/ctocpp/ctocpp.h | 6 +- .../ctocpp/delete_cookies_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/dialog_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/dictionary_value_ctocpp.cc | 2 +- libcef_dll/ctocpp/display_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/domdocument_ctocpp.cc | 2 +- libcef_dll/ctocpp/domnode_ctocpp.cc | 2 +- libcef_dll/ctocpp/domvisitor_ctocpp.cc | 2 +- libcef_dll/ctocpp/download_handler_ctocpp.cc | 2 +- .../ctocpp/download_image_callback_ctocpp.cc | 2 +- .../ctocpp/download_item_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/download_item_ctocpp.cc | 2 +- libcef_dll/ctocpp/drag_data_ctocpp.cc | 2 +- libcef_dll/ctocpp/drag_handler_ctocpp.cc | 2 +- .../ctocpp/end_tracing_callback_ctocpp.cc | 2 +- .../ctocpp/file_dialog_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/find_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/focus_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/frame_ctocpp.cc | 2 +- .../ctocpp/geolocation_callback_ctocpp.cc | 2 +- .../ctocpp/geolocation_handler_ctocpp.cc | 2 +- .../ctocpp/get_geolocation_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/image_ctocpp.cc | 2 +- libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/keyboard_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/life_span_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/list_value_ctocpp.cc | 2 +- libcef_dll/ctocpp/load_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/menu_model_ctocpp.cc | 2 +- .../ctocpp/menu_model_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/navigation_entry_ctocpp.cc | 2 +- .../ctocpp/navigation_entry_visitor_ctocpp.cc | 2 +- .../ctocpp/pdf_print_callback_ctocpp.cc | 2 +- .../ctocpp/permission_handler_ctocpp.cc | 56 ---------------- libcef_dll/ctocpp/permission_handler_ctocpp.h | 47 ------------- libcef_dll/ctocpp/post_data_ctocpp.cc | 2 +- libcef_dll/ctocpp/post_data_element_ctocpp.cc | 2 +- .../ctocpp/print_dialog_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/print_handler_ctocpp.cc | 2 +- .../ctocpp/print_job_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/print_settings_ctocpp.cc | 2 +- libcef_dll/ctocpp/process_message_ctocpp.cc | 2 +- libcef_dll/ctocpp/read_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/render_handler_ctocpp.cc | 2 +- .../ctocpp/render_process_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/request_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/request_context_ctocpp.cc | 2 +- .../ctocpp/request_context_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/request_ctocpp.cc | 2 +- libcef_dll/ctocpp/request_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/resolve_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/resource_bundle_ctocpp.cc | 2 +- .../ctocpp/resource_bundle_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/resource_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/response_ctocpp.cc | 2 +- libcef_dll/ctocpp/response_filter_ctocpp.cc | 2 +- .../run_context_menu_callback_ctocpp.cc | 2 +- .../ctocpp/run_file_dialog_callback_ctocpp.cc | 2 +- .../ctocpp/scheme_handler_factory_ctocpp.cc | 2 +- libcef_dll/ctocpp/scheme_registrar_ctocpp.cc | 2 +- .../ctocpp/set_cookie_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/sslcert_principal_ctocpp.cc | 2 +- libcef_dll/ctocpp/sslinfo_ctocpp.cc | 2 +- libcef_dll/ctocpp/stream_reader_ctocpp.cc | 2 +- libcef_dll/ctocpp/stream_writer_ctocpp.cc | 2 +- libcef_dll/ctocpp/string_visitor_ctocpp.cc | 2 +- libcef_dll/ctocpp/task_ctocpp.cc | 2 +- libcef_dll/ctocpp/task_runner_ctocpp.cc | 2 +- .../ctocpp/test/translator_test_ctocpp.cc | 2 +- .../translator_test_handler_child_ctocpp.cc | 2 +- .../test/translator_test_handler_ctocpp.cc | 2 +- ...anslator_test_object_child_child_ctocpp.cc | 2 +- .../translator_test_object_child_ctocpp.cc | 2 +- .../test/translator_test_object_ctocpp.cc | 2 +- libcef_dll/ctocpp/urlrequest_client_ctocpp.cc | 2 +- libcef_dll/ctocpp/urlrequest_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8accessor_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8context_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8exception_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8stack_frame_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8stack_trace_ctocpp.cc | 2 +- libcef_dll/ctocpp/v8value_ctocpp.cc | 2 +- libcef_dll/ctocpp/value_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/box_layout_ctocpp.cc | 2 +- .../ctocpp/views/browser_view_ctocpp.cc | 2 +- .../views/browser_view_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/button_ctocpp.cc | 2 +- .../ctocpp/views/button_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/display_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/fill_layout_ctocpp.cc | 2 +- .../ctocpp/views/label_button_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/layout_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/menu_button_ctocpp.cc | 2 +- .../views/menu_button_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/panel_ctocpp.cc | 2 +- .../ctocpp/views/panel_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/scroll_view_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/textfield_ctocpp.cc | 2 +- .../ctocpp/views/textfield_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/view_ctocpp.cc | 2 +- .../ctocpp/views/view_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/views/window_ctocpp.cc | 2 +- .../ctocpp/views/window_delegate_ctocpp.cc | 2 +- libcef_dll/ctocpp/web_plugin_info_ctocpp.cc | 2 +- .../ctocpp/web_plugin_info_visitor_ctocpp.cc | 2 +- .../web_plugin_unstable_callback_ctocpp.cc | 2 +- libcef_dll/ctocpp/write_handler_ctocpp.cc | 2 +- libcef_dll/ctocpp/xml_reader_ctocpp.cc | 2 +- libcef_dll/ctocpp/zip_reader_ctocpp.cc | 2 +- libcef_dll/libcef_dll.cc | 4 +- .../wrapper/cef_stream_resource_handler.cc | 12 ++-- libcef_dll/wrapper/libcef_dll_wrapper.cc | 4 +- .../main_message_loop_external_pump_linux.cc | 5 +- .../main_message_loop_multithreaded_win.cc | 3 +- tests/cefclient/browser/osr_renderer.cc | 3 +- tests/cefclient/renderer/performance_test.cc | 3 +- tools/make_cpptoc_impl.py | 6 +- tools/make_ctocpp_impl.py | 6 +- 278 files changed, 320 insertions(+), 525 deletions(-) delete mode 100644 libcef_dll/cpptoc/permission_handler_cpptoc.cc delete mode 100644 libcef_dll/cpptoc/permission_handler_cpptoc.h delete mode 100644 libcef_dll/ctocpp/permission_handler_ctocpp.cc delete mode 100644 libcef_dll/ctocpp/permission_handler_ctocpp.h diff --git a/include/base/cef_lock.h b/include/base/cef_lock.h index 410b42e89..9f872bb58 100644 --- a/include/base/cef_lock.h +++ b/include/base/cef_lock.h @@ -45,6 +45,7 @@ // If the Chromium implementation diverges the below implementation should be // updated to match. +#include "include/base/cef_logging.h" #include "include/base/cef_macros.h" #include "include/base/cef_platform_thread.h" #include "include/base/internal/cef_lock_impl.h" @@ -57,7 +58,7 @@ namespace cef_internal { // AssertAcquired() method. class Lock { public: -#if defined(NDEBUG) // Optimized wrapper implementation +#if !DCHECK_IS_ON() // Optimized wrapper implementation Lock() : lock_() {} ~Lock() {} void Acquire() { lock_.Lock(); } @@ -96,10 +97,10 @@ class Lock { } void AssertAcquired() const; -#endif // NDEBUG +#endif // !DCHECK_IS_ON() private: -#if !defined(NDEBUG) +#if DCHECK_IS_ON() // Members and routines taking care of locks assertions. // Note that this checks for recursive locks and allows them // if the variable is set. This is allowed by the underlying implementation @@ -111,7 +112,7 @@ class Lock { // All private data is implicitly protected by lock_. // Be VERY careful to only access members under that lock. base::PlatformThreadRef owning_thread_ref_; -#endif // NDEBUG +#endif // DCHECK_IS_ON() // Platform specific underlying lock implementation. LockImpl lock_; diff --git a/include/base/cef_ref_counted.h b/include/base/cef_ref_counted.h index bb94a6ee4..61d4de686 100644 --- a/include/base/cef_ref_counted.h +++ b/include/base/cef_ref_counted.h @@ -50,9 +50,7 @@ #include "include/base/cef_atomic_ref_count.h" #include "include/base/cef_build.h" -#ifndef NDEBUG #include "include/base/cef_logging.h" -#endif #include "include/base/cef_thread_collision_warner.h" namespace base { @@ -66,14 +64,14 @@ class RefCountedBase { protected: RefCountedBase() : ref_count_(0) - #ifndef NDEBUG + #if DCHECK_IS_ON() , in_dtor_(false) #endif { } ~RefCountedBase() { - #ifndef NDEBUG + #if DCHECK_IS_ON() DCHECK(in_dtor_) << "RefCounted object deleted without calling Release()"; #endif } @@ -84,7 +82,7 @@ class RefCountedBase { // Current thread books the critical section "AddRelease" // without release it. // DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_); - #ifndef NDEBUG + #if DCHECK_IS_ON() DCHECK(!in_dtor_); #endif ++ref_count_; @@ -96,11 +94,11 @@ class RefCountedBase { // Current thread books the critical section "AddRelease" // without release it. // DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_); - #ifndef NDEBUG + #if DCHECK_IS_ON() DCHECK(!in_dtor_); #endif if (--ref_count_ == 0) { - #ifndef NDEBUG + #if DCHECK_IS_ON() in_dtor_ = true; #endif return true; @@ -110,7 +108,7 @@ class RefCountedBase { private: mutable int ref_count_; -#ifndef NDEBUG +#if DCHECK_IS_ON() mutable bool in_dtor_; #endif @@ -134,7 +132,7 @@ class RefCountedThreadSafeBase { private: mutable AtomicRefCount ref_count_; -#ifndef NDEBUG +#if DCHECK_IS_ON() mutable bool in_dtor_; #endif diff --git a/include/base/cef_thread_collision_warner.h b/include/base/cef_thread_collision_warner.h index 2016e3c51..8f60a546d 100644 --- a/include/base/cef_thread_collision_warner.h +++ b/include/base/cef_thread_collision_warner.h @@ -50,6 +50,7 @@ #include "include/base/cef_atomicops.h" #include "include/base/cef_basictypes.h" #include "include/base/cef_build.h" +#include "include/base/cef_logging.h" #include "include/base/cef_macros.h" // A helper class alongside macros to be used to verify assumptions about thread @@ -139,7 +140,7 @@ // }; -#if !defined(NDEBUG) +#if DCHECK_IS_ON() // Defines a class member that acts like a mutex. It is used only as a // verification tool. diff --git a/include/wrapper/cef_stream_resource_handler.h b/include/wrapper/cef_stream_resource_handler.h index c442dfe0e..1963bc177 100644 --- a/include/wrapper/cef_stream_resource_handler.h +++ b/include/wrapper/cef_stream_resource_handler.h @@ -37,6 +37,7 @@ #define CEF_INCLUDE_WRAPPER_CEF_STREAM_RESOURCE_HANDLER_H_ #pragma once +#include "include/base/cef_logging.h" #include "include/base/cef_macros.h" #include "include/base/cef_scoped_ptr.h" #include "include/cef_base.h" @@ -91,7 +92,7 @@ class CefStreamResourceHandler : public CefResourceHandler { class Buffer; SCOPED_PTR(Buffer) buffer_; -#ifndef NDEBUG +#if DCHECK_IS_ON() // Used in debug builds to verify that |buffer_| isn't being accessed on // multiple threads at the same time. bool buffer_owned_by_file_thread_; diff --git a/libcef/browser/browser_context.cc b/libcef/browser/browser_context.cc index 8372191ec..2bacfe3ca 100644 --- a/libcef/browser/browser_context.cc +++ b/libcef/browser/browser_context.cc @@ -17,13 +17,13 @@ #include "extensions/browser/extension_protocols.h" #include "extensions/common/constants.h" -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCount CefBrowserContext::DebugObjCt = 0; #endif CefBrowserContext::CefBrowserContext() : extension_system_(NULL) { -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountInc(&DebugObjCt); #endif } @@ -32,7 +32,7 @@ CefBrowserContext::~CefBrowserContext() { // Should be cleared in Shutdown(). DCHECK(!resource_context_.get()); -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountDec(&DebugObjCt); #endif } diff --git a/libcef/browser/browser_context.h b/libcef/browser/browser_context.h index 2220c8fd8..192d79ecc 100644 --- a/libcef/browser/browser_context.h +++ b/libcef/browser/browser_context.h @@ -158,7 +158,7 @@ class CefBrowserContext return extension_system_; } -#ifndef NDEBUG +#if DCHECK_IS_ON() // Simple tracking of allocated objects. static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int) #endif diff --git a/libcef/browser/browser_info_manager.cc b/libcef/browser/browser_info_manager.cc index f4db53785..899b4c573 100644 --- a/libcef/browser/browser_info_manager.cc +++ b/libcef/browser/browser_info_manager.cc @@ -347,7 +347,7 @@ void CefBrowserInfoManager::OnGetNewBrowserInfo( return; } -#ifndef NDEBUG +#if DCHECK_IS_ON() // Verify that no request for the same route is currently queued. { PendingNewBrowserInfoList::const_iterator it = @@ -408,7 +408,7 @@ void CefBrowserInfoManager::DestroyAllBrowsers() { } } -#ifndef NDEBUG +#if DCHECK_IS_ON() { // Verify that all browser windows have been destroyed. base::AutoLock lock_scope(browser_info_lock_); diff --git a/libcef/browser/browser_main.cc b/libcef/browser/browser_main.cc index 53809d94d..a32616949 100644 --- a/libcef/browser/browser_main.cc +++ b/libcef/browser/browser_main.cc @@ -178,7 +178,7 @@ void CefBrowserMainParts::PostMainMessageLoopRun() { global_browser_context_ = NULL; -#ifndef NDEBUG +#if DCHECK_IS_ON() // No CefBrowserContext instances should exist at this point. DCHECK_EQ(0, CefBrowserContext::DebugObjCt); #endif @@ -190,7 +190,7 @@ void CefBrowserMainParts::PostDestroyThreads() { delete views::ViewsDelegate::GetInstance(); #endif -#ifndef NDEBUG +#if DCHECK_IS_ON() // No CefURLRequestContext instances should exist at this point. DCHECK_EQ(0, CefURLRequestContext::DebugObjCt); #endif diff --git a/libcef/browser/menu_model_impl.cc b/libcef/browser/menu_model_impl.cc index 18c009407..c9701d1c3 100644 --- a/libcef/browser/menu_model_impl.cc +++ b/libcef/browser/menu_model_impl.cc @@ -762,13 +762,13 @@ void CefMenuModelImpl::InsertItemAt(const Item& item, int index) { } void CefMenuModelImpl::ValidateItem(const Item& item) { -#ifndef NDEBUG +#if DCHECK_IS_ON() if (item.type_ == MENUITEMTYPE_SEPARATOR) { DCHECK_EQ(item.command_id_, kSeparatorId); } else { DCHECK_GE(item.command_id_, 0); } -#endif // NDEBUG +#endif } void CefMenuModelImpl::OnMenuClosed() { diff --git a/libcef/browser/net/url_request_context.cc b/libcef/browser/net/url_request_context.cc index 8dd41e6cb..3aafa0259 100644 --- a/libcef/browser/net/url_request_context.cc +++ b/libcef/browser/net/url_request_context.cc @@ -4,18 +4,18 @@ #include "libcef/browser/net/url_request_context.h" -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCount CefURLRequestContext::DebugObjCt = 0; #endif CefURLRequestContext::CefURLRequestContext() { -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountInc(&DebugObjCt); #endif } CefURLRequestContext::~CefURLRequestContext() { -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountDec(&DebugObjCt); #endif } diff --git a/libcef/browser/net/url_request_context.h b/libcef/browser/net/url_request_context.h index 0bd20265a..0b56188bf 100644 --- a/libcef/browser/net/url_request_context.h +++ b/libcef/browser/net/url_request_context.h @@ -6,6 +6,7 @@ #define CEF_LIBCEF_BROWSER_NET_URL_REQUEST_CONTEXT_H_ #pragma once +#include "base/logging.h" #include "net/url_request/url_request_context.h" // Owns URLRequest instances and provides access to network-related @@ -18,7 +19,7 @@ class CefURLRequestContext : public net::URLRequestContext { CefURLRequestContext(); ~CefURLRequestContext() override; -#ifndef NDEBUG +#if DCHECK_IS_ON() // Simple tracking of allocated objects. static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int) #endif diff --git a/libcef/browser/net/url_request_manager.cc b/libcef/browser/net/url_request_manager.cc index 9fca69c1c..9db89e119 100644 --- a/libcef/browser/net/url_request_manager.cc +++ b/libcef/browser/net/url_request_manager.cc @@ -274,7 +274,7 @@ net::URLRequestJob* CefURLRequestManager::GetRequestJob( job = GetBuiltinSchemeRequestJob(request, network_delegate, scheme); } -#ifndef NDEBUG +#if DCHECK_IS_ON() if (job) DLOG(INFO) << "CefURLRequestManager hit for " << request->url().spec(); #endif diff --git a/libcef_dll/base/cef_lock.cc b/libcef_dll/base/cef_lock.cc index 265f67fb5..85253f104 100644 --- a/libcef_dll/base/cef_lock.cc +++ b/libcef_dll/base/cef_lock.cc @@ -6,11 +6,11 @@ // is functionally a wrapper around the LockImpl class, so the only // real intelligence in the class is in the debugging logic. -#if !defined(NDEBUG) - #include "include/base/cef_lock.h" #include "include/base/cef_logging.h" +#if DCHECK_IS_ON() + namespace base { namespace cef_internal { @@ -43,4 +43,4 @@ void Lock::CheckUnheldAndMark() { } // namespace cef_internal } // namespace base -#endif // NDEBUG +#endif // DCHECK_IS_ON() diff --git a/libcef_dll/base/cef_lock_impl.cc b/libcef_dll/base/cef_lock_impl.cc index fa772e1f7..4afe75f02 100644 --- a/libcef_dll/base/cef_lock_impl.cc +++ b/libcef_dll/base/cef_lock_impl.cc @@ -48,7 +48,7 @@ namespace base { namespace cef_internal { LockImpl::LockImpl() { -#ifndef NDEBUG +#if DCHECK_IS_ON() // In debug, setup attributes for lock error checking. pthread_mutexattr_t mta; int rv = pthread_mutexattr_init(&mta); diff --git a/libcef_dll/base/cef_ref_counted.cc b/libcef_dll/base/cef_ref_counted.cc index f894460a9..706249879 100644 --- a/libcef_dll/base/cef_ref_counted.cc +++ b/libcef_dll/base/cef_ref_counted.cc @@ -15,32 +15,32 @@ bool RefCountedThreadSafeBase::HasOneRef() const { } RefCountedThreadSafeBase::RefCountedThreadSafeBase() : ref_count_(0) { -#ifndef NDEBUG +#if DCHECK_IS_ON() in_dtor_ = false; #endif } RefCountedThreadSafeBase::~RefCountedThreadSafeBase() { -#ifndef NDEBUG +#if DCHECK_IS_ON() DCHECK(in_dtor_) << "RefCountedThreadSafe object deleted without " "calling Release()"; #endif } void RefCountedThreadSafeBase::AddRef() const { -#ifndef NDEBUG +#if DCHECK_IS_ON() DCHECK(!in_dtor_); #endif AtomicRefCountInc(&ref_count_); } bool RefCountedThreadSafeBase::Release() const { -#ifndef NDEBUG +#if DCHECK_IS_ON() DCHECK(!in_dtor_); DCHECK(!AtomicRefCountIsZero(&ref_count_)); #endif if (!AtomicRefCountDec(&ref_count_)) { -#ifndef NDEBUG +#if DCHECK_IS_ON() in_dtor_ = true; #endif return true; diff --git a/libcef_dll/cpptoc/app_cpptoc.cc b/libcef_dll/cpptoc/app_cpptoc.cc index 71c290f2a..81a0f9c3e 100644 --- a/libcef_dll/cpptoc/app_cpptoc.cc +++ b/libcef_dll/cpptoc/app_cpptoc.cc @@ -127,7 +127,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.cc b/libcef_dll/cpptoc/auth_callback_cpptoc.cc index a6f233a61..e240f93ea 100644 --- a/libcef_dll/cpptoc/auth_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/auth_callback_cpptoc.cc @@ -67,7 +67,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/base_cpptoc.cc b/libcef_dll/cpptoc/base_cpptoc.cc index b7fe2cdeb..2c67988b8 100644 --- a/libcef_dll/cpptoc/base_cpptoc.cc +++ b/libcef_dll/cpptoc/base_cpptoc.cc @@ -13,7 +13,7 @@ template<> CefRefPtr CefCppToC:: return NULL; } -#ifndef NDEBUG +#if DCHECK_IS_ON() template<> base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc b/libcef_dll/cpptoc/before_download_callback_cpptoc.cc index 154625940..41b647f07 100644 --- a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/before_download_callback_cpptoc.cc @@ -49,7 +49,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.cc b/libcef_dll/cpptoc/binary_value_cpptoc.cc index e44eb847f..e01e7cf2e 100644 --- a/libcef_dll/cpptoc/binary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/binary_value_cpptoc.cc @@ -179,7 +179,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/browser_cpptoc.cc b/libcef_dll/cpptoc/browser_cpptoc.cc index 42f6a5d49..4019d0591 100644 --- a/libcef_dll/cpptoc/browser_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_cpptoc.cc @@ -389,7 +389,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.cc b/libcef_dll/cpptoc/browser_host_cpptoc.cc index 44ee9ce6e..1f9e01d22 100644 --- a/libcef_dll/cpptoc/browser_host_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_host_cpptoc.cc @@ -1012,7 +1012,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc b/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc index 521436848..c367154f4 100644 --- a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc @@ -121,7 +121,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/callback_cpptoc.cc b/libcef_dll/cpptoc/callback_cpptoc.cc index 205b0fe22..d562e8b4e 100644 --- a/libcef_dll/cpptoc/callback_cpptoc.cc +++ b/libcef_dll/cpptoc/callback_cpptoc.cc @@ -55,7 +55,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/client_cpptoc.cc b/libcef_dll/cpptoc/client_cpptoc.cc index cf6f22611..e4fd70aff 100644 --- a/libcef_dll/cpptoc/client_cpptoc.cc +++ b/libcef_dll/cpptoc/client_cpptoc.cc @@ -313,7 +313,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/command_line_cpptoc.cc b/libcef_dll/cpptoc/command_line_cpptoc.cc index 804c7372a..8b05c9da5 100644 --- a/libcef_dll/cpptoc/command_line_cpptoc.cc +++ b/libcef_dll/cpptoc/command_line_cpptoc.cc @@ -429,7 +429,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/completion_callback_cpptoc.cc b/libcef_dll/cpptoc/completion_callback_cpptoc.cc index 6e5fef478..d1a71ed8a 100644 --- a/libcef_dll/cpptoc/completion_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/completion_callback_cpptoc.cc @@ -45,7 +45,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc b/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc index d07f75334..623a91371 100644 --- a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc @@ -178,7 +178,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/context_menu_params_cpptoc.cc b/libcef_dll/cpptoc/context_menu_params_cpptoc.cc index d46da0adf..238750b49 100644 --- a/libcef_dll/cpptoc/context_menu_params_cpptoc.cc +++ b/libcef_dll/cpptoc/context_menu_params_cpptoc.cc @@ -377,7 +377,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc b/libcef_dll/cpptoc/cookie_manager_cpptoc.cc index a3c137972..d9a6de8d2 100644 --- a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_manager_cpptoc.cc @@ -241,7 +241,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc b/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc index ecac53c0c..032d8aae4 100644 --- a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc @@ -72,7 +72,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/cpptoc.h b/libcef_dll/cpptoc/cpptoc.h index a3e094e53..5bf26b245 100644 --- a/libcef_dll/cpptoc/cpptoc.h +++ b/libcef_dll/cpptoc/cpptoc.h @@ -89,7 +89,7 @@ class CefCppToC : public CefBase { } bool HasOneRef() const { return UnderlyingHasOneRef(); } -#ifndef NDEBUG +#if DCHECK_IS_ON() // Simple tracking of allocated objects. static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int) #endif @@ -106,13 +106,13 @@ class CefCppToC : public CefBase { base->release = struct_release; base->has_one_ref = struct_has_one_ref; -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountInc(&DebugObjCt); #endif } virtual ~CefCppToC() { -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountDec(&DebugObjCt); #endif } diff --git a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc index 71c0f1b9f..2497cf932 100644 --- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc @@ -46,7 +46,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc index 0441a1c4b..2b4973326 100644 --- a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc @@ -78,7 +78,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc b/libcef_dll/cpptoc/dictionary_value_cpptoc.cc index 99a55d561..916d389a1 100644 --- a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/dictionary_value_cpptoc.cc @@ -670,7 +670,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.cc b/libcef_dll/cpptoc/display_handler_cpptoc.cc index 1a82ef784..9368797a9 100644 --- a/libcef_dll/cpptoc/display_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/display_handler_cpptoc.cc @@ -204,7 +204,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.cc b/libcef_dll/cpptoc/domdocument_cpptoc.cc index 88612e6f0..0ff1e6313 100644 --- a/libcef_dll/cpptoc/domdocument_cpptoc.cc +++ b/libcef_dll/cpptoc/domdocument_cpptoc.cc @@ -270,7 +270,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/domnode_cpptoc.cc b/libcef_dll/cpptoc/domnode_cpptoc.cc index fdf8c0ecf..ed9a33cd8 100644 --- a/libcef_dll/cpptoc/domnode_cpptoc.cc +++ b/libcef_dll/cpptoc/domnode_cpptoc.cc @@ -469,7 +469,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.cc b/libcef_dll/cpptoc/domvisitor_cpptoc.cc index 1a54ba87b..ef2b303bd 100644 --- a/libcef_dll/cpptoc/domvisitor_cpptoc.cc +++ b/libcef_dll/cpptoc/domvisitor_cpptoc.cc @@ -51,7 +51,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.cc b/libcef_dll/cpptoc/download_handler_cpptoc.cc index 8c1bdd0bf..c8b87bb68 100644 --- a/libcef_dll/cpptoc/download_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/download_handler_cpptoc.cc @@ -102,7 +102,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/download_image_callback_cpptoc.cc b/libcef_dll/cpptoc/download_image_callback_cpptoc.cc index d15a6cc41..32e0dc229 100644 --- a/libcef_dll/cpptoc/download_image_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/download_image_callback_cpptoc.cc @@ -56,7 +56,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc b/libcef_dll/cpptoc/download_item_callback_cpptoc.cc index 06dd0272a..8c8bd2bb4 100644 --- a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/download_item_callback_cpptoc.cc @@ -71,7 +71,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/download_item_cpptoc.cc b/libcef_dll/cpptoc/download_item_cpptoc.cc index 388010915..2c0d8b845 100644 --- a/libcef_dll/cpptoc/download_item_cpptoc.cc +++ b/libcef_dll/cpptoc/download_item_cpptoc.cc @@ -300,7 +300,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/drag_data_cpptoc.cc b/libcef_dll/cpptoc/drag_data_cpptoc.cc index 659e5c5b1..c36069ece 100644 --- a/libcef_dll/cpptoc/drag_data_cpptoc.cc +++ b/libcef_dll/cpptoc/drag_data_cpptoc.cc @@ -403,7 +403,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/drag_handler_cpptoc.cc b/libcef_dll/cpptoc/drag_handler_cpptoc.cc index d7df02aa4..928443ff8 100644 --- a/libcef_dll/cpptoc/drag_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/drag_handler_cpptoc.cc @@ -96,7 +96,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc index 05cfba1bd..0d618c0c4 100644 --- a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc @@ -52,7 +52,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc index 574931b92..b3152a0e8 100644 --- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc @@ -71,7 +71,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/find_handler_cpptoc.cc b/libcef_dll/cpptoc/find_handler_cpptoc.cc index 0513ab515..8281c4c66 100644 --- a/libcef_dll/cpptoc/find_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/find_handler_cpptoc.cc @@ -65,7 +65,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.cc b/libcef_dll/cpptoc/focus_handler_cpptoc.cc index 506a55ba7..f9f0427a2 100644 --- a/libcef_dll/cpptoc/focus_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/focus_handler_cpptoc.cc @@ -92,7 +92,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/frame_cpptoc.cc b/libcef_dll/cpptoc/frame_cpptoc.cc index b396b432c..25a903e1c 100644 --- a/libcef_dll/cpptoc/frame_cpptoc.cc +++ b/libcef_dll/cpptoc/frame_cpptoc.cc @@ -403,7 +403,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc b/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc index 28de25594..83f3f543b 100644 --- a/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/geolocation_callback_cpptoc.cc @@ -46,7 +46,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc b/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc index 8b857fb5e..5ebed3792 100644 --- a/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/geolocation_handler_cpptoc.cc @@ -91,7 +91,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc b/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc index 23a34aba0..b036dba08 100644 --- a/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.cc @@ -56,7 +56,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/image_cpptoc.cc b/libcef_dll/cpptoc/image_cpptoc.cc index d7866a0b7..f9b2f3585 100644 --- a/libcef_dll/cpptoc/image_cpptoc.cc +++ b/libcef_dll/cpptoc/image_cpptoc.cc @@ -394,7 +394,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc index 64d01ae1d..d91f0232a 100644 --- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc @@ -48,7 +48,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc index 3ffdf8ab1..80bd1761c 100644 --- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc @@ -149,7 +149,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc b/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc index 920585599..b2173b530 100644 --- a/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/keyboard_handler_cpptoc.cc @@ -112,7 +112,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc index 4ab079254..f5897cc9e 100644 --- a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc @@ -195,7 +195,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/list_value_cpptoc.cc b/libcef_dll/cpptoc/list_value_cpptoc.cc index ace83f39b..c7b4dd4ff 100644 --- a/libcef_dll/cpptoc/list_value_cpptoc.cc +++ b/libcef_dll/cpptoc/list_value_cpptoc.cc @@ -621,7 +621,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.cc b/libcef_dll/cpptoc/load_handler_cpptoc.cc index bd5ae4fce..e6c94a618 100644 --- a/libcef_dll/cpptoc/load_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/load_handler_cpptoc.cc @@ -137,7 +137,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.cc b/libcef_dll/cpptoc/menu_model_cpptoc.cc index 5b0df6d77..097c9f2e0 100644 --- a/libcef_dll/cpptoc/menu_model_cpptoc.cc +++ b/libcef_dll/cpptoc/menu_model_cpptoc.cc @@ -1044,7 +1044,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc index fb120f91e..4862b5f9f 100644 --- a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc @@ -72,7 +72,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/navigation_entry_cpptoc.cc b/libcef_dll/cpptoc/navigation_entry_cpptoc.cc index 15d5b6a16..bed73e714 100644 --- a/libcef_dll/cpptoc/navigation_entry_cpptoc.cc +++ b/libcef_dll/cpptoc/navigation_entry_cpptoc.cc @@ -177,7 +177,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc index 0cabd0b86..661080b94 100644 --- a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc @@ -59,7 +59,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc index df5610617..41802f073 100644 --- a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc @@ -51,7 +51,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.cc b/libcef_dll/cpptoc/permission_handler_cpptoc.cc deleted file mode 100644 index 5558de8eb..000000000 --- a/libcef_dll/cpptoc/permission_handler_cpptoc.cc +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// - -#include "libcef_dll/cpptoc/permission_handler_cpptoc.h" -#include "libcef_dll/ctocpp/browser_ctocpp.h" -#include "libcef_dll/ctocpp/frame_ctocpp.h" - - -// MEMBER FUNCTIONS - Body may be edited by hand. - -int CEF_CALLBACK permission_handler_on_before_script_extension_load( - struct _cef_permission_handler_t* self, cef_browser_t* browser, - cef_frame_t* frame, const cef_string_t* extensionName) { - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) - return 0; - // Verify param: browser; type: refptr_diff - DCHECK(browser); - if (!browser) - return 0; - // Verify param: frame; type: refptr_diff - DCHECK(frame); - if (!frame) - return 0; - // Verify param: extensionName; type: string_byref_const - DCHECK(extensionName); - if (!extensionName) - return 0; - - // Execute - bool _retval = CefPermissionHandlerCppToC::Get( - self)->OnBeforeScriptExtensionLoad( - CefBrowserCToCpp::Wrap(browser), - CefFrameCToCpp::Wrap(frame), - CefString(extensionName)); - - // Return type: bool - return _retval; -} - - -// CONSTRUCTOR - Do not edit by hand. - -CefPermissionHandlerCppToC::CefPermissionHandlerCppToC( - CefPermissionHandler* cls) - : CefCppToC(cls) { - struct_.struct_.on_before_script_extension_load = - permission_handler_on_before_script_extension_load; -} - -#ifndef NDEBUG -template<> long CefCppToC::DebugObjCt = 0; -#endif - diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.h b/libcef_dll/cpptoc/permission_handler_cpptoc.h deleted file mode 100644 index 6c8d2f86d..000000000 --- a/libcef_dll/cpptoc/permission_handler_cpptoc.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// - -#ifndef CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_ -#define CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_ -#pragma once - -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED - -#include "include/cef_permission_handler.h" -#include "include/capi/cef_permission_handler_capi.h" -#include "include/cef_browser.h" -#include "include/capi/cef_browser_capi.h" -#include "include/cef_frame.h" -#include "include/capi/cef_frame_capi.h" -#include "libcef_dll/cpptoc/cpptoc.h" - -// Wrap a C++ class with a C structure. -// This class may be instantiated and accessed wrapper-side only. -class CefPermissionHandlerCppToC - : public CefCppToC { - public: - explicit CefPermissionHandlerCppToC(CefPermissionHandler* cls); - virtual ~CefPermissionHandlerCppToC() {} -}; - -#endif // USING_CEF_SHARED -#endif // CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_ - diff --git a/libcef_dll/cpptoc/post_data_cpptoc.cc b/libcef_dll/cpptoc/post_data_cpptoc.cc index 1846ed982..f681bf2ce 100644 --- a/libcef_dll/cpptoc/post_data_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_cpptoc.cc @@ -182,7 +182,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/post_data_element_cpptoc.cc b/libcef_dll/cpptoc/post_data_element_cpptoc.cc index cf5f9a725..89bd24c08 100644 --- a/libcef_dll/cpptoc/post_data_element_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_element_cpptoc.cc @@ -182,7 +182,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc index 7af64ddfc..532a7c7b6 100644 --- a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc @@ -65,7 +65,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/print_handler_cpptoc.cc b/libcef_dll/cpptoc/print_handler_cpptoc.cc index 6d8002f51..7e0744de6 100644 --- a/libcef_dll/cpptoc/print_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/print_handler_cpptoc.cc @@ -159,7 +159,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/print_job_callback_cpptoc.cc b/libcef_dll/cpptoc/print_job_callback_cpptoc.cc index da8b3c677..1d6c84ef2 100644 --- a/libcef_dll/cpptoc/print_job_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/print_job_callback_cpptoc.cc @@ -45,7 +45,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/print_settings_cpptoc.cc b/libcef_dll/cpptoc/print_settings_cpptoc.cc index 4ba555f6e..66d09798c 100644 --- a/libcef_dll/cpptoc/print_settings_cpptoc.cc +++ b/libcef_dll/cpptoc/print_settings_cpptoc.cc @@ -450,7 +450,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/process_message_cpptoc.cc b/libcef_dll/cpptoc/process_message_cpptoc.cc index 0f8ed2a07..ec9c8a87d 100644 --- a/libcef_dll/cpptoc/process_message_cpptoc.cc +++ b/libcef_dll/cpptoc/process_message_cpptoc.cc @@ -134,7 +134,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.cc b/libcef_dll/cpptoc/read_handler_cpptoc.cc index 36b35ee84..b900a0634 100644 --- a/libcef_dll/cpptoc/read_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/read_handler_cpptoc.cc @@ -118,7 +118,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.cc b/libcef_dll/cpptoc/render_handler_cpptoc.cc index 9565b9bf2..b76fda786 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -377,7 +377,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc b/libcef_dll/cpptoc/render_process_handler_cpptoc.cc index f5cc0f1fd..a3686db27 100644 --- a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_process_handler_cpptoc.cc @@ -319,7 +319,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/request_callback_cpptoc.cc b/libcef_dll/cpptoc/request_callback_cpptoc.cc index c3a040d65..4bc4fe0ed 100644 --- a/libcef_dll/cpptoc/request_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/request_callback_cpptoc.cc @@ -59,7 +59,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/request_context_cpptoc.cc b/libcef_dll/cpptoc/request_context_cpptoc.cc index aa11104fd..81b838e4c 100644 --- a/libcef_dll/cpptoc/request_context_cpptoc.cc +++ b/libcef_dll/cpptoc/request_context_cpptoc.cc @@ -476,7 +476,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/request_context_handler_cpptoc.cc b/libcef_dll/cpptoc/request_context_handler_cpptoc.cc index 0aff8c195..228f72dbf 100644 --- a/libcef_dll/cpptoc/request_context_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_context_handler_cpptoc.cc @@ -89,7 +89,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/request_cpptoc.cc b/libcef_dll/cpptoc/request_cpptoc.cc index 57d6be1bd..3009204aa 100644 --- a/libcef_dll/cpptoc/request_cpptoc.cc +++ b/libcef_dll/cpptoc/request_cpptoc.cc @@ -410,7 +410,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.cc b/libcef_dll/cpptoc/request_handler_cpptoc.cc index ae53d1aee..e296cc542 100644 --- a/libcef_dll/cpptoc/request_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_handler_cpptoc.cc @@ -553,7 +553,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/resolve_callback_cpptoc.cc b/libcef_dll/cpptoc/resolve_callback_cpptoc.cc index ba2153f97..29b5a8e3c 100644 --- a/libcef_dll/cpptoc/resolve_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resolve_callback_cpptoc.cc @@ -54,7 +54,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/resource_bundle_cpptoc.cc b/libcef_dll/cpptoc/resource_bundle_cpptoc.cc index 5aa3a2081..bfc1db637 100644 --- a/libcef_dll/cpptoc/resource_bundle_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_bundle_cpptoc.cc @@ -144,7 +144,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc index 3113825c0..8956d80e9 100644 --- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc @@ -142,7 +142,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_handler_cpptoc.cc index 9a15e232d..149c429c6 100644 --- a/libcef_dll/cpptoc/resource_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_handler_cpptoc.cc @@ -205,7 +205,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/response_cpptoc.cc b/libcef_dll/cpptoc/response_cpptoc.cc index e93cd4560..16835ac5f 100644 --- a/libcef_dll/cpptoc/response_cpptoc.cc +++ b/libcef_dll/cpptoc/response_cpptoc.cc @@ -255,7 +255,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/response_filter_cpptoc.cc b/libcef_dll/cpptoc/response_filter_cpptoc.cc index 914616960..46b69d039 100644 --- a/libcef_dll/cpptoc/response_filter_cpptoc.cc +++ b/libcef_dll/cpptoc/response_filter_cpptoc.cc @@ -98,7 +98,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc index 4b526cb30..ee39cbb3e 100644 --- a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc @@ -61,7 +61,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc index d038a5978..f4a6c2829 100644 --- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc @@ -59,7 +59,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc index 50ebb44ba..8ca2117a1 100644 --- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc +++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc @@ -68,7 +68,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc b/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc index 8b61a17ac..139ebafa6 100644 --- a/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc +++ b/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc @@ -57,7 +57,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc index 094be1cee..afdac3948 100644 --- a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc @@ -46,7 +46,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/sslcert_principal_cpptoc.cc b/libcef_dll/cpptoc/sslcert_principal_cpptoc.cc index 032a33aae..eb5b2ba96 100644 --- a/libcef_dll/cpptoc/sslcert_principal_cpptoc.cc +++ b/libcef_dll/cpptoc/sslcert_principal_cpptoc.cc @@ -221,7 +221,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/sslinfo_cpptoc.cc b/libcef_dll/cpptoc/sslinfo_cpptoc.cc index 630aa9c30..bbcddb8f2 100644 --- a/libcef_dll/cpptoc/sslinfo_cpptoc.cc +++ b/libcef_dll/cpptoc/sslinfo_cpptoc.cc @@ -287,7 +287,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.cc b/libcef_dll/cpptoc/stream_reader_cpptoc.cc index 6c3ce04b1..18c0004e1 100644 --- a/libcef_dll/cpptoc/stream_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/stream_reader_cpptoc.cc @@ -174,7 +174,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.cc b/libcef_dll/cpptoc/stream_writer_cpptoc.cc index 5da387d5f..69ec8300f 100644 --- a/libcef_dll/cpptoc/stream_writer_cpptoc.cc +++ b/libcef_dll/cpptoc/stream_writer_cpptoc.cc @@ -156,7 +156,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.cc b/libcef_dll/cpptoc/string_visitor_cpptoc.cc index 906919784..d4dd03210 100644 --- a/libcef_dll/cpptoc/string_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/string_visitor_cpptoc.cc @@ -47,7 +47,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/task_cpptoc.cc b/libcef_dll/cpptoc/task_cpptoc.cc index f187d1864..61c2cfbab 100644 --- a/libcef_dll/cpptoc/task_cpptoc.cc +++ b/libcef_dll/cpptoc/task_cpptoc.cc @@ -43,7 +43,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/task_runner_cpptoc.cc b/libcef_dll/cpptoc/task_runner_cpptoc.cc index 3117a34ca..50189f95e 100644 --- a/libcef_dll/cpptoc/task_runner_cpptoc.cc +++ b/libcef_dll/cpptoc/task_runner_cpptoc.cc @@ -156,7 +156,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/test/translator_test_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_cpptoc.cc index 69e4989ba..f83317d98 100644 --- a/libcef_dll/cpptoc/test/translator_test_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_cpptoc.cc @@ -1093,7 +1093,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.cc index 00a4303d9..90b1a8e26 100644 --- a/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.cc @@ -67,7 +67,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.cc index eb481b4c4..43fea295e 100644 --- a/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.cc @@ -53,7 +53,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.cc index af61f91f0..3d5d411e6 100644 --- a/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.cc @@ -157,7 +157,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.cc index 29f6e098e..5facb49c4 100644 --- a/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.cc @@ -117,7 +117,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/test/translator_test_object_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_object_cpptoc.cc index 4ea8bd79b..6c8b27289 100644 --- a/libcef_dll/cpptoc/test/translator_test_object_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_object_cpptoc.cc @@ -87,7 +87,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc index 3d417a1ce..3f4bb4487 100644 --- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc @@ -156,7 +156,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_cpptoc.cc index 79366b45b..bb50d8a4a 100644 --- a/libcef_dll/cpptoc/urlrequest_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_cpptoc.cc @@ -159,7 +159,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.cc b/libcef_dll/cpptoc/v8accessor_cpptoc.cc index f8c49c67f..c09ad9211 100644 --- a/libcef_dll/cpptoc/v8accessor_cpptoc.cc +++ b/libcef_dll/cpptoc/v8accessor_cpptoc.cc @@ -129,7 +129,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8context_cpptoc.cc b/libcef_dll/cpptoc/v8context_cpptoc.cc index 44fec6881..21f9fb0bf 100644 --- a/libcef_dll/cpptoc/v8context_cpptoc.cc +++ b/libcef_dll/cpptoc/v8context_cpptoc.cc @@ -263,7 +263,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.cc b/libcef_dll/cpptoc/v8exception_cpptoc.cc index cffbd6178..2cad91525 100644 --- a/libcef_dll/cpptoc/v8exception_cpptoc.cc +++ b/libcef_dll/cpptoc/v8exception_cpptoc.cc @@ -156,7 +156,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.cc b/libcef_dll/cpptoc/v8handler_cpptoc.cc index 7be3c5a82..0d1fb8527 100644 --- a/libcef_dll/cpptoc/v8handler_cpptoc.cc +++ b/libcef_dll/cpptoc/v8handler_cpptoc.cc @@ -102,7 +102,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc b/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc index 0f7f9d54c..41e71e278 100644 --- a/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc +++ b/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc @@ -159,7 +159,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc b/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc index 233e11c92..2c51e53de 100644 --- a/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc +++ b/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc @@ -96,7 +96,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/v8value_cpptoc.cc b/libcef_dll/cpptoc/v8value_cpptoc.cc index 20f2e990e..fec5f09de 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.cc +++ b/libcef_dll/cpptoc/v8value_cpptoc.cc @@ -979,7 +979,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/value_cpptoc.cc b/libcef_dll/cpptoc/value_cpptoc.cc index d3fb64ded..bf4697866 100644 --- a/libcef_dll/cpptoc/value_cpptoc.cc +++ b/libcef_dll/cpptoc/value_cpptoc.cc @@ -417,7 +417,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc index 84f1e6dc4..de7ded0db 100644 --- a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc @@ -121,7 +121,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/browser_view_cpptoc.cc b/libcef_dll/cpptoc/views/browser_view_cpptoc.cc index cad26ebe6..72f40af2e 100644 --- a/libcef_dll/cpptoc/views/browser_view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/browser_view_cpptoc.cc @@ -967,7 +967,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc index 9200e4db1..c9fffde6b 100644 --- a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc @@ -302,7 +302,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/button_cpptoc.cc b/libcef_dll/cpptoc/views/button_cpptoc.cc index 0c1093f16..f75c0a299 100644 --- a/libcef_dll/cpptoc/views/button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_cpptoc.cc @@ -966,7 +966,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc index da315efd3..6532f836e 100644 --- a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc @@ -200,7 +200,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/display_cpptoc.cc b/libcef_dll/cpptoc/views/display_cpptoc.cc index 351c9e0ef..551df045c 100644 --- a/libcef_dll/cpptoc/views/display_cpptoc.cc +++ b/libcef_dll/cpptoc/views/display_cpptoc.cc @@ -255,7 +255,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc b/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc index 18729a599..0a7a3c4bb 100644 --- a/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc @@ -83,7 +83,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/label_button_cpptoc.cc b/libcef_dll/cpptoc/views/label_button_cpptoc.cc index 45bba5317..19b8ccd83 100644 --- a/libcef_dll/cpptoc/views/label_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/label_button_cpptoc.cc @@ -1208,7 +1208,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/layout_cpptoc.cc b/libcef_dll/cpptoc/views/layout_cpptoc.cc index c5fb9ce3b..441180681 100644 --- a/libcef_dll/cpptoc/views/layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/layout_cpptoc.cc @@ -86,7 +86,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc index 880b35ccf..bb56187e8 100644 --- a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc @@ -1243,7 +1243,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc index f01540ae8..779677b81 100644 --- a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc @@ -229,7 +229,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/panel_cpptoc.cc b/libcef_dll/cpptoc/views/panel_cpptoc.cc index 52ff8c190..51d7b5806 100644 --- a/libcef_dll/cpptoc/views/panel_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_cpptoc.cc @@ -1104,7 +1104,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc index 455690c40..4bb0d4474 100644 --- a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc @@ -181,7 +181,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc b/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc index 988e724fb..b3940964d 100644 --- a/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc @@ -1026,7 +1026,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/textfield_cpptoc.cc b/libcef_dll/cpptoc/views/textfield_cpptoc.cc index 7f802876e..6c8d8836c 100644 --- a/libcef_dll/cpptoc/views/textfield_cpptoc.cc +++ b/libcef_dll/cpptoc/views/textfield_cpptoc.cc @@ -1422,7 +1422,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc index af518b219..b7693acda 100644 --- a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc @@ -228,7 +228,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/view_cpptoc.cc b/libcef_dll/cpptoc/views/view_cpptoc.cc index 3ce0c95e1..3f4af37a1 100644 --- a/libcef_dll/cpptoc/views/view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_cpptoc.cc @@ -860,7 +860,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc index 790cdab50..eebc388a3 100644 --- a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc @@ -198,7 +198,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/window_cpptoc.cc b/libcef_dll/cpptoc/views/window_cpptoc.cc index e813e89da..c7f8414ed 100644 --- a/libcef_dll/cpptoc/views/window_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_cpptoc.cc @@ -1622,7 +1622,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc index 6d3b8e797..8c66f1bd2 100644 --- a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc @@ -320,7 +320,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc b/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc index 169c00d25..25995036d 100644 --- a/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc +++ b/libcef_dll/cpptoc/web_plugin_info_cpptoc.cc @@ -96,7 +96,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc b/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc index 744849aec..32ad9de68 100644 --- a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.cc @@ -57,7 +57,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc b/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc index a60413f43..dc6f73c7a 100644 --- a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.cc @@ -53,7 +53,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.cc b/libcef_dll/cpptoc/write_handler_cpptoc.cc index 27a9735f2..7b73bc1b9 100644 --- a/libcef_dll/cpptoc/write_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/write_handler_cpptoc.cc @@ -118,7 +118,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.cc b/libcef_dll/cpptoc/xml_reader_cpptoc.cc index 656ade6ee..3a3b99c37 100644 --- a/libcef_dll/cpptoc/xml_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/xml_reader_cpptoc.cc @@ -557,7 +557,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.cc b/libcef_dll/cpptoc/zip_reader_cpptoc.cc index 9b9c45918..2e1416d7d 100644 --- a/libcef_dll/cpptoc/zip_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/zip_reader_cpptoc.cc @@ -252,7 +252,7 @@ template<> CefRefPtr CefCppToC base::AtomicRefCount CefCppToC::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/app_ctocpp.cc b/libcef_dll/ctocpp/app_ctocpp.cc index 2fe265bab..1f318acbb 100644 --- a/libcef_dll/ctocpp/app_ctocpp.cc +++ b/libcef_dll/ctocpp/app_ctocpp.cc @@ -115,7 +115,7 @@ template<> cef_app_t* CefCToCpp::UnwrapDerived( return NULL; } -#ifndef NDEBUG +#if DCHECK_IS_ON() template<> base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.cc b/libcef_dll/ctocpp/auth_callback_ctocpp.cc index 57ee856db..758bec1bf 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.cc @@ -62,7 +62,7 @@ template<> cef_auth_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/base_ctocpp.cc b/libcef_dll/ctocpp/base_ctocpp.cc index f4c54f370..31e7bfcfa 100644 --- a/libcef_dll/ctocpp/base_ctocpp.cc +++ b/libcef_dll/ctocpp/base_ctocpp.cc @@ -13,7 +13,7 @@ template<> cef_base_t* CefCToCpp:: return NULL; } -#ifndef NDEBUG +#if DCHECK_IS_ON() template<> base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc b/libcef_dll/ctocpp/before_download_callback_ctocpp.cc index 55265531f..3233a562b 100644 --- a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/before_download_callback_ctocpp.cc @@ -44,7 +44,7 @@ template<> cef_before_download_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.cc b/libcef_dll/ctocpp/binary_value_ctocpp.cc index 0b0a55fe9..dc452abcc 100644 --- a/libcef_dll/ctocpp/binary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/binary_value_ctocpp.cc @@ -168,7 +168,7 @@ template<> cef_binary_value_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/browser_ctocpp.cc b/libcef_dll/ctocpp/browser_ctocpp.cc index ae3366e4b..6758e70f4 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_ctocpp.cc @@ -365,7 +365,7 @@ template<> cef_browser_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.cc b/libcef_dll/ctocpp/browser_host_ctocpp.cc index 36c0e57fd..92b62b090 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_host_ctocpp.cc @@ -802,7 +802,7 @@ template<> cef_browser_host_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc b/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc index 23784e41e..c77be52c8 100644 --- a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc @@ -104,7 +104,7 @@ template<> cef_browser_process_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/callback_ctocpp.cc b/libcef_dll/ctocpp/callback_ctocpp.cc index 0d5271598..b7925b05d 100644 --- a/libcef_dll/ctocpp/callback_ctocpp.cc +++ b/libcef_dll/ctocpp/callback_ctocpp.cc @@ -49,7 +49,7 @@ template<> cef_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/client_ctocpp.cc b/libcef_dll/ctocpp/client_ctocpp.cc index ecc698042..bd485d2d1 100644 --- a/libcef_dll/ctocpp/client_ctocpp.cc +++ b/libcef_dll/ctocpp/client_ctocpp.cc @@ -268,7 +268,7 @@ template<> cef_client_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/command_line_ctocpp.cc b/libcef_dll/ctocpp/command_line_ctocpp.cc index f4b8b850f..d8846a59f 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -423,7 +423,7 @@ template<> cef_command_line_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/completion_callback_ctocpp.cc b/libcef_dll/ctocpp/completion_callback_ctocpp.cc index 3ad2c984b..d928a8c10 100644 --- a/libcef_dll/ctocpp/completion_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/completion_callback_ctocpp.cc @@ -39,7 +39,7 @@ template<> cef_completion_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc b/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc index b6330779b..381e62c10 100644 --- a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc @@ -168,7 +168,7 @@ template<> cef_context_menu_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.cc b/libcef_dll/ctocpp/context_menu_params_ctocpp.cc index 8f70f2c7e..6a78a6ab4 100644 --- a/libcef_dll/ctocpp/context_menu_params_ctocpp.cc +++ b/libcef_dll/ctocpp/context_menu_params_ctocpp.cc @@ -344,7 +344,7 @@ template<> cef_context_menu_params_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc b/libcef_dll/ctocpp/cookie_manager_ctocpp.cc index f3f8130ba..14e323c5e 100644 --- a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_manager_ctocpp.cc @@ -225,7 +225,7 @@ template<> cef_cookie_manager_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc b/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc index 4b447a15e..657dfac4e 100644 --- a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc @@ -53,7 +53,7 @@ template<> cef_cookie_visitor_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/ctocpp.h b/libcef_dll/ctocpp/ctocpp.h index f28f438d2..83ee30822 100644 --- a/libcef_dll/ctocpp/ctocpp.h +++ b/libcef_dll/ctocpp/ctocpp.h @@ -45,20 +45,20 @@ class CefCToCpp : public BaseName { bool Release() const; bool HasOneRef() const { return UnderlyingHasOneRef(); } -#ifndef NDEBUG +#if DCHECK_IS_ON() // Simple tracking of allocated objects. static base::AtomicRefCount DebugObjCt; // NOLINT(runtime/int) #endif protected: CefCToCpp() { -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountInc(&DebugObjCt); #endif } virtual ~CefCToCpp() { -#ifndef NDEBUG +#if DCHECK_IS_ON() base::AtomicRefCountDec(&DebugObjCt); #endif } diff --git a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc index f3d6c862b..a755d7b03 100644 --- a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc @@ -40,7 +40,7 @@ template<> cef_delete_cookies_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc index e67d77cb7..c4ddb79f0 100644 --- a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc @@ -80,7 +80,7 @@ template<> cef_dialog_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc b/libcef_dll/ctocpp/dictionary_value_ctocpp.cc index 0702830b0..fa70433e6 100644 --- a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/dictionary_value_ctocpp.cc @@ -634,7 +634,7 @@ template<> cef_dictionary_value_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.cc b/libcef_dll/ctocpp/display_handler_ctocpp.cc index 678aaa682..8a23915d0 100644 --- a/libcef_dll/ctocpp/display_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/display_handler_ctocpp.cc @@ -196,7 +196,7 @@ template<> cef_display_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.cc b/libcef_dll/ctocpp/domdocument_ctocpp.cc index 0e3e35c2a..b08318024 100644 --- a/libcef_dll/ctocpp/domdocument_ctocpp.cc +++ b/libcef_dll/ctocpp/domdocument_ctocpp.cc @@ -248,7 +248,7 @@ template<> cef_domdocument_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/domnode_ctocpp.cc b/libcef_dll/ctocpp/domnode_ctocpp.cc index c327d80cb..d11c5f481 100644 --- a/libcef_dll/ctocpp/domnode_ctocpp.cc +++ b/libcef_dll/ctocpp/domnode_ctocpp.cc @@ -441,7 +441,7 @@ template<> cef_domnode_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.cc b/libcef_dll/ctocpp/domvisitor_ctocpp.cc index a12722304..e98c5638d 100644 --- a/libcef_dll/ctocpp/domvisitor_ctocpp.cc +++ b/libcef_dll/ctocpp/domvisitor_ctocpp.cc @@ -45,7 +45,7 @@ template<> cef_domvisitor_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.cc b/libcef_dll/ctocpp/download_handler_ctocpp.cc index 1be4701a5..4401e9a0c 100644 --- a/libcef_dll/ctocpp/download_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/download_handler_ctocpp.cc @@ -95,7 +95,7 @@ template<> cef_download_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/download_image_callback_ctocpp.cc b/libcef_dll/ctocpp/download_image_callback_ctocpp.cc index ae8834b03..05ab40d8d 100644 --- a/libcef_dll/ctocpp/download_image_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/download_image_callback_ctocpp.cc @@ -51,7 +51,7 @@ template<> cef_download_image_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc b/libcef_dll/ctocpp/download_item_callback_ctocpp.cc index 2f6e0669a..e86e4f6f2 100644 --- a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/download_item_callback_ctocpp.cc @@ -61,7 +61,7 @@ template<> cef_download_item_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/download_item_ctocpp.cc b/libcef_dll/ctocpp/download_item_ctocpp.cc index 65f5ffa83..34d16648c 100644 --- a/libcef_dll/ctocpp/download_item_ctocpp.cc +++ b/libcef_dll/ctocpp/download_item_ctocpp.cc @@ -278,7 +278,7 @@ template<> cef_download_item_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/drag_data_ctocpp.cc b/libcef_dll/ctocpp/drag_data_ctocpp.cc index 08c3ef223..c6b0ee863 100644 --- a/libcef_dll/ctocpp/drag_data_ctocpp.cc +++ b/libcef_dll/ctocpp/drag_data_ctocpp.cc @@ -384,7 +384,7 @@ template<> cef_drag_data_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.cc b/libcef_dll/ctocpp/drag_handler_ctocpp.cc index 552eadee1..bb5cf3a8c 100644 --- a/libcef_dll/ctocpp/drag_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/drag_handler_ctocpp.cc @@ -95,7 +95,7 @@ template<> cef_drag_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc index 4203b6c0b..cc4dd2e79 100644 --- a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc @@ -46,7 +46,7 @@ template<> cef_end_tracing_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc index cecebb214..d0acd1d4c 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc @@ -70,7 +70,7 @@ template<> cef_file_dialog_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/find_handler_ctocpp.cc b/libcef_dll/ctocpp/find_handler_ctocpp.cc index 6a945d28b..0356f3ede 100644 --- a/libcef_dll/ctocpp/find_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/find_handler_ctocpp.cc @@ -53,7 +53,7 @@ template<> cef_find_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.cc b/libcef_dll/ctocpp/focus_handler_ctocpp.cc index a584197e6..78bd940fd 100644 --- a/libcef_dll/ctocpp/focus_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/focus_handler_ctocpp.cc @@ -87,7 +87,7 @@ template<> cef_focus_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/frame_ctocpp.cc b/libcef_dll/ctocpp/frame_ctocpp.cc index 7024adb68..cd04ed8de 100644 --- a/libcef_dll/ctocpp/frame_ctocpp.cc +++ b/libcef_dll/ctocpp/frame_ctocpp.cc @@ -379,7 +379,7 @@ template<> cef_frame_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc b/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc index d9a0c39c0..a69e612df 100644 --- a/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/geolocation_callback_ctocpp.cc @@ -40,7 +40,7 @@ template<> cef_geolocation_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc b/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc index 9551319cc..c9f4a5ebe 100644 --- a/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/geolocation_handler_ctocpp.cc @@ -82,7 +82,7 @@ template<> cef_geolocation_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.cc b/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.cc index 2ac7266d4..89c3cfb9b 100644 --- a/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.cc @@ -41,7 +41,7 @@ template<> cef_get_geolocation_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/image_ctocpp.cc b/libcef_dll/ctocpp/image_ctocpp.cc index 30fe60ee9..22e642fa2 100644 --- a/libcef_dll/ctocpp/image_ctocpp.cc +++ b/libcef_dll/ctocpp/image_ctocpp.cc @@ -285,7 +285,7 @@ template<> cef_image_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc index 14697b776..ad71c7c35 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc @@ -44,7 +44,7 @@ template<> cef_jsdialog_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc index fbc952dff..55b641537 100644 --- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc @@ -135,7 +135,7 @@ template<> cef_jsdialog_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc b/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc index 96314149f..df1678936 100644 --- a/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/keyboard_handler_ctocpp.cc @@ -88,7 +88,7 @@ template<> cef_keyboard_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc b/libcef_dll/ctocpp/life_span_handler_ctocpp.cc index 0b1bf6bf9..386d427cd 100644 --- a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/life_span_handler_ctocpp.cc @@ -150,7 +150,7 @@ template<> cef_life_span_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/list_value_ctocpp.cc b/libcef_dll/ctocpp/list_value_ctocpp.cc index c60fe9e17..333464768 100644 --- a/libcef_dll/ctocpp/list_value_ctocpp.cc +++ b/libcef_dll/ctocpp/list_value_ctocpp.cc @@ -590,7 +590,7 @@ template<> cef_list_value_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.cc b/libcef_dll/ctocpp/load_handler_ctocpp.cc index 6389bc04a..f83a027f9 100644 --- a/libcef_dll/ctocpp/load_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/load_handler_ctocpp.cc @@ -131,7 +131,7 @@ template<> cef_load_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.cc b/libcef_dll/ctocpp/menu_model_ctocpp.cc index 085ec4270..be4482954 100644 --- a/libcef_dll/ctocpp/menu_model_ctocpp.cc +++ b/libcef_dll/ctocpp/menu_model_ctocpp.cc @@ -913,7 +913,7 @@ template<> cef_menu_model_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc index ad34a20b0..cebe40500 100644 --- a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc @@ -68,7 +68,7 @@ template<> cef_menu_model_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/navigation_entry_ctocpp.cc b/libcef_dll/ctocpp/navigation_entry_ctocpp.cc index 286ee1406..3a0dbc6e7 100644 --- a/libcef_dll/ctocpp/navigation_entry_ctocpp.cc +++ b/libcef_dll/ctocpp/navigation_entry_ctocpp.cc @@ -163,7 +163,7 @@ template<> cef_navigation_entry_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc index e134ed02c..d5fab37c3 100644 --- a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc @@ -53,7 +53,7 @@ template<> cef_navigation_entry_visitor_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc index 5d888f5dd..3eb3a189a 100644 --- a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc @@ -47,7 +47,7 @@ template<> cef_pdf_print_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.cc b/libcef_dll/ctocpp/permission_handler_ctocpp.cc deleted file mode 100644 index 700e91b39..000000000 --- a/libcef_dll/ctocpp/permission_handler_ctocpp.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// - -#include "libcef_dll/cpptoc/browser_cpptoc.h" -#include "libcef_dll/cpptoc/frame_cpptoc.h" -#include "libcef_dll/ctocpp/permission_handler_ctocpp.h" - - -// VIRTUAL METHODS - Body may be edited by hand. - -bool CefPermissionHandlerCToCpp::OnBeforeScriptExtensionLoad( - CefRefPtr browser, CefRefPtr frame, - const CefString& extensionName) { - if (CEF_MEMBER_MISSING(struct_, on_before_script_extension_load)) - return false; - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: browser; type: refptr_diff - DCHECK(browser.get()); - if (!browser.get()) - return false; - // Verify param: frame; type: refptr_diff - DCHECK(frame.get()); - if (!frame.get()) - return false; - // Verify param: extensionName; type: string_byref_const - DCHECK(!extensionName.empty()); - if (extensionName.empty()) - return false; - - // Execute - int _retval = struct_->on_before_script_extension_load(struct_, - CefBrowserCppToC::Wrap(browser), - CefFrameCppToC::Wrap(frame), - extensionName.GetStruct()); - - // Return type: bool - return _retval?true:false; -} - - -#ifndef NDEBUG -template<> long CefCToCpp::DebugObjCt = 0; -#endif - diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.h b/libcef_dll/ctocpp/permission_handler_ctocpp.h deleted file mode 100644 index 0bffa2a81..000000000 --- a/libcef_dll/ctocpp/permission_handler_ctocpp.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights -// reserved. Use of this source code is governed by a BSD-style license that -// can be found in the LICENSE file. -// -// --------------------------------------------------------------------------- -// -// This file was generated by the CEF translator tool. If making changes by -// hand only do so within the body of existing method and function -// implementations. See the translator.README.txt file in the tools directory -// for more information. -// - -#ifndef CEF_LIBCEF_DLL_CTOCPP_PERMISSION_HANDLER_CTOCPP_H_ -#define CEF_LIBCEF_DLL_CTOCPP_PERMISSION_HANDLER_CTOCPP_H_ -#pragma once - -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED - -#include "include/cef_permission_handler.h" -#include "include/capi/cef_permission_handler_capi.h" -#include "include/cef_browser.h" -#include "include/capi/cef_browser_capi.h" -#include "include/cef_frame.h" -#include "include/capi/cef_frame_capi.h" -#include "libcef_dll/ctocpp/ctocpp.h" - -// Wrap a C structure with a C++ class. -// This class may be instantiated and accessed DLL-side only. -class CefPermissionHandlerCToCpp - : public CefCToCpp { - public: - explicit CefPermissionHandlerCToCpp(cef_permission_handler_t* str) - : CefCToCpp(str) {} - virtual ~CefPermissionHandlerCToCpp() {} - - // CefPermissionHandler methods - virtual bool OnBeforeScriptExtensionLoad(CefRefPtr browser, - CefRefPtr frame, const CefString& extensionName) OVERRIDE; -}; - -#endif // BUILDING_CEF_SHARED -#endif // CEF_LIBCEF_DLL_CTOCPP_PERMISSION_HANDLER_CTOCPP_H_ - diff --git a/libcef_dll/ctocpp/post_data_ctocpp.cc b/libcef_dll/ctocpp/post_data_ctocpp.cc index ee692084f..d7b7987e6 100644 --- a/libcef_dll/ctocpp/post_data_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_ctocpp.cc @@ -174,7 +174,7 @@ template<> cef_post_data_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.cc b/libcef_dll/ctocpp/post_data_element_ctocpp.cc index 074bc4ffc..6e723020b 100644 --- a/libcef_dll/ctocpp/post_data_element_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_element_ctocpp.cc @@ -166,7 +166,7 @@ template<> cef_post_data_element_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc index cc35c9d76..a187001e7 100644 --- a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc @@ -58,7 +58,7 @@ template<> cef_print_dialog_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/print_handler_ctocpp.cc b/libcef_dll/ctocpp/print_handler_ctocpp.cc index ef9904ca7..5901818ab 100644 --- a/libcef_dll/ctocpp/print_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/print_handler_ctocpp.cc @@ -147,7 +147,7 @@ template<> cef_print_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/print_job_callback_ctocpp.cc b/libcef_dll/ctocpp/print_job_callback_ctocpp.cc index dc0eea7f3..0bed433e4 100644 --- a/libcef_dll/ctocpp/print_job_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/print_job_callback_ctocpp.cc @@ -39,7 +39,7 @@ template<> cef_print_job_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/print_settings_ctocpp.cc b/libcef_dll/ctocpp/print_settings_ctocpp.cc index b9fe5f3c3..30ba28b7d 100644 --- a/libcef_dll/ctocpp/print_settings_ctocpp.cc +++ b/libcef_dll/ctocpp/print_settings_ctocpp.cc @@ -395,7 +395,7 @@ template<> cef_print_settings_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/process_message_ctocpp.cc b/libcef_dll/ctocpp/process_message_ctocpp.cc index 9d055f7f2..05e9a859d 100644 --- a/libcef_dll/ctocpp/process_message_ctocpp.cc +++ b/libcef_dll/ctocpp/process_message_ctocpp.cc @@ -120,7 +120,7 @@ template<> cef_process_message_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.cc b/libcef_dll/ctocpp/read_handler_ctocpp.cc index be6f84b1b..26fb554e6 100644 --- a/libcef_dll/ctocpp/read_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/read_handler_ctocpp.cc @@ -108,7 +108,7 @@ template<> cef_read_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.cc b/libcef_dll/ctocpp/render_handler_ctocpp.cc index 840f16001..8738c0df8 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_handler_ctocpp.cc @@ -296,7 +296,7 @@ template<> cef_render_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc b/libcef_dll/ctocpp/render_process_handler_ctocpp.cc index 4e0e49941..aada35ea0 100644 --- a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_process_handler_ctocpp.cc @@ -300,7 +300,7 @@ template<> cef_render_process_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/request_callback_ctocpp.cc b/libcef_dll/ctocpp/request_callback_ctocpp.cc index 84d760241..3e0f24632 100644 --- a/libcef_dll/ctocpp/request_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/request_callback_ctocpp.cc @@ -51,7 +51,7 @@ template<> cef_request_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/request_context_ctocpp.cc b/libcef_dll/ctocpp/request_context_ctocpp.cc index 1dd1e9ec0..4826ece2b 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.cc +++ b/libcef_dll/ctocpp/request_context_ctocpp.cc @@ -428,7 +428,7 @@ template<> cef_request_context_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/request_context_handler_ctocpp.cc b/libcef_dll/ctocpp/request_context_handler_ctocpp.cc index f7d8b811e..5469511dd 100644 --- a/libcef_dll/ctocpp/request_context_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_context_handler_ctocpp.cc @@ -80,7 +80,7 @@ template<> cef_request_context_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/request_ctocpp.cc b/libcef_dll/ctocpp/request_ctocpp.cc index 8a2ca24ec..02b608593 100644 --- a/libcef_dll/ctocpp/request_ctocpp.cc +++ b/libcef_dll/ctocpp/request_ctocpp.cc @@ -386,7 +386,7 @@ template<> cef_request_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.cc b/libcef_dll/ctocpp/request_handler_ctocpp.cc index 70069557f..1da9621ed 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_handler_ctocpp.cc @@ -518,7 +518,7 @@ template<> cef_request_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/resolve_callback_ctocpp.cc b/libcef_dll/ctocpp/resolve_callback_ctocpp.cc index 440bc9cf8..adf5875a1 100644 --- a/libcef_dll/ctocpp/resolve_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resolve_callback_ctocpp.cc @@ -55,7 +55,7 @@ template<> cef_resolve_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/resource_bundle_ctocpp.cc b/libcef_dll/ctocpp/resource_bundle_ctocpp.cc index 1f8eb5779..b652b2998 100644 --- a/libcef_dll/ctocpp/resource_bundle_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_bundle_ctocpp.cc @@ -95,7 +95,7 @@ template<> cef_resource_bundle_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc index 2839faf42..6a671fb96 100644 --- a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc @@ -82,7 +82,7 @@ template<> cef_resource_bundle_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_handler_ctocpp.cc index 28136679c..ba682810c 100644 --- a/libcef_dll/ctocpp/resource_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_handler_ctocpp.cc @@ -147,7 +147,7 @@ template<> cef_resource_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/response_ctocpp.cc b/libcef_dll/ctocpp/response_ctocpp.cc index 1945bb7da..7c2f0e6f5 100644 --- a/libcef_dll/ctocpp/response_ctocpp.cc +++ b/libcef_dll/ctocpp/response_ctocpp.cc @@ -242,7 +242,7 @@ template<> cef_response_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/response_filter_ctocpp.cc b/libcef_dll/ctocpp/response_filter_ctocpp.cc index 3b989a410..32ae51dbf 100644 --- a/libcef_dll/ctocpp/response_filter_ctocpp.cc +++ b/libcef_dll/ctocpp/response_filter_ctocpp.cc @@ -70,7 +70,7 @@ template<> cef_response_filter_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc index 88e659595..637dc2d2a 100644 --- a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc @@ -53,7 +53,7 @@ template<> cef_run_context_menu_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc index 5063927e3..b5e56fabb 100644 --- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc @@ -59,7 +59,7 @@ template<> cef_run_file_dialog_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc index 111e52127..6f0d378e9 100644 --- a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc +++ b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc @@ -62,7 +62,7 @@ template<> cef_scheme_handler_factory_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc b/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc index a2d20c04e..dfb1623bf 100644 --- a/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc +++ b/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc @@ -52,7 +52,7 @@ template<> cef_scheme_registrar_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc index 12fd46c26..bfa7b0092 100644 --- a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc @@ -40,7 +40,7 @@ template<> cef_set_cookie_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/sslcert_principal_ctocpp.cc b/libcef_dll/ctocpp/sslcert_principal_ctocpp.cc index 90bb72b59..a2f9cf3be 100644 --- a/libcef_dll/ctocpp/sslcert_principal_ctocpp.cc +++ b/libcef_dll/ctocpp/sslcert_principal_ctocpp.cc @@ -213,7 +213,7 @@ template<> cef_sslcert_principal_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/sslinfo_ctocpp.cc b/libcef_dll/ctocpp/sslinfo_ctocpp.cc index 67155e833..0a39f1fc7 100644 --- a/libcef_dll/ctocpp/sslinfo_ctocpp.cc +++ b/libcef_dll/ctocpp/sslinfo_ctocpp.cc @@ -262,7 +262,7 @@ template<> cef_sslinfo_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.cc b/libcef_dll/ctocpp/stream_reader_ctocpp.cc index 1a9821ebd..0337a7272 100644 --- a/libcef_dll/ctocpp/stream_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/stream_reader_ctocpp.cc @@ -164,7 +164,7 @@ template<> cef_stream_reader_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.cc b/libcef_dll/ctocpp/stream_writer_ctocpp.cc index 802b98d10..943a86e1b 100644 --- a/libcef_dll/ctocpp/stream_writer_ctocpp.cc +++ b/libcef_dll/ctocpp/stream_writer_ctocpp.cc @@ -146,7 +146,7 @@ template<> cef_stream_writer_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.cc b/libcef_dll/ctocpp/string_visitor_ctocpp.cc index 684cd2e09..0344e4efb 100644 --- a/libcef_dll/ctocpp/string_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/string_visitor_ctocpp.cc @@ -42,7 +42,7 @@ template<> cef_string_visitor_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/task_ctocpp.cc b/libcef_dll/ctocpp/task_ctocpp.cc index dd0a16624..fe11c8095 100644 --- a/libcef_dll/ctocpp/task_ctocpp.cc +++ b/libcef_dll/ctocpp/task_ctocpp.cc @@ -38,7 +38,7 @@ template<> cef_task_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/task_runner_ctocpp.cc b/libcef_dll/ctocpp/task_runner_ctocpp.cc index 8744d9d3f..e9fe66ecf 100644 --- a/libcef_dll/ctocpp/task_runner_ctocpp.cc +++ b/libcef_dll/ctocpp/task_runner_ctocpp.cc @@ -143,7 +143,7 @@ template<> cef_task_runner_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc index f82040c7a..b08ae41d6 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc @@ -1033,7 +1033,7 @@ template<> cef_translator_test_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.cc index f73c89035..633c0df65 100644 --- a/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.cc @@ -58,7 +58,7 @@ template<> cef_translator_test_handler_child_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.cc index 9e3e17c54..0e28aea69 100644 --- a/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.cc @@ -48,7 +48,7 @@ template<> cef_translator_test_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.cc index 817c228ed..df4021c29 100644 --- a/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.cc @@ -130,7 +130,7 @@ template<> cef_translator_test_object_child_child_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.cc index 20de372d4..7a6c39f90 100644 --- a/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.cc @@ -106,7 +106,7 @@ template<> cef_translator_test_object_child_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/test/translator_test_object_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_object_ctocpp.cc index 484b1db45..3f84c5ed1 100644 --- a/libcef_dll/ctocpp/test/translator_test_object_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_object_ctocpp.cc @@ -80,7 +80,7 @@ template<> cef_translator_test_object_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc index c863cec61..b18f6a575 100644 --- a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc @@ -148,7 +148,7 @@ template<> cef_urlrequest_client_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_ctocpp.cc index e4e54c023..f184d3b03 100644 --- a/libcef_dll/ctocpp/urlrequest_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_ctocpp.cc @@ -140,7 +140,7 @@ template<> cef_urlrequest_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.cc b/libcef_dll/ctocpp/v8accessor_ctocpp.cc index 5d15027e9..ce5df34cb 100644 --- a/libcef_dll/ctocpp/v8accessor_ctocpp.cc +++ b/libcef_dll/ctocpp/v8accessor_ctocpp.cc @@ -105,7 +105,7 @@ template<> cef_v8accessor_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8context_ctocpp.cc b/libcef_dll/ctocpp/v8context_ctocpp.cc index 4f3779ea5..904e50f07 100644 --- a/libcef_dll/ctocpp/v8context_ctocpp.cc +++ b/libcef_dll/ctocpp/v8context_ctocpp.cc @@ -234,7 +234,7 @@ template<> cef_v8context_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.cc b/libcef_dll/ctocpp/v8exception_ctocpp.cc index 268193104..99d7fb3af 100644 --- a/libcef_dll/ctocpp/v8exception_ctocpp.cc +++ b/libcef_dll/ctocpp/v8exception_ctocpp.cc @@ -146,7 +146,7 @@ template<> cef_v8exception_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.cc b/libcef_dll/ctocpp/v8handler_ctocpp.cc index 71c4179c4..d0afeb727 100644 --- a/libcef_dll/ctocpp/v8handler_ctocpp.cc +++ b/libcef_dll/ctocpp/v8handler_ctocpp.cc @@ -89,7 +89,7 @@ template<> cef_v8handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc b/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc index ded7a07da..d7add89e8 100644 --- a/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc +++ b/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc @@ -147,7 +147,7 @@ template<> cef_v8stack_frame_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc b/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc index 1efc3a38e..ad6d08d0b 100644 --- a/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc +++ b/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc @@ -86,7 +86,7 @@ template<> cef_v8stack_trace_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/v8value_ctocpp.cc b/libcef_dll/ctocpp/v8value_ctocpp.cc index 377e251d3..80538b004 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -922,7 +922,7 @@ template<> cef_v8value_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/value_ctocpp.cc b/libcef_dll/ctocpp/value_ctocpp.cc index a7506217b..b6b9d585c 100644 --- a/libcef_dll/ctocpp/value_ctocpp.cc +++ b/libcef_dll/ctocpp/value_ctocpp.cc @@ -389,7 +389,7 @@ template<> cef_value_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc index 792148523..fa8de7864 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc @@ -106,7 +106,7 @@ template<> cef_box_layout_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc index 22efc767d..8fe0c4c0c 100644 --- a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc @@ -746,7 +746,7 @@ template<> cef_browser_view_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc index a93e6d648..e3f6a0128 100644 --- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc @@ -273,7 +273,7 @@ template<> cef_browser_view_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/button_ctocpp.cc b/libcef_dll/ctocpp/views/button_ctocpp.cc index 684733c10..3bfa04b16 100644 --- a/libcef_dll/ctocpp/views/button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_ctocpp.cc @@ -770,7 +770,7 @@ template<> cef_button_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc index ff932573b..949870dfc 100644 --- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc @@ -189,7 +189,7 @@ template<> cef_button_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/display_ctocpp.cc b/libcef_dll/ctocpp/views/display_ctocpp.cc index 3ef5ba612..19b1ab2eb 100644 --- a/libcef_dll/ctocpp/views/display_ctocpp.cc +++ b/libcef_dll/ctocpp/views/display_ctocpp.cc @@ -206,7 +206,7 @@ template<> cef_display_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc b/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc index 5f1e8d543..aee3e5ea5 100644 --- a/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc @@ -70,7 +70,7 @@ template<> cef_fill_layout_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/label_button_ctocpp.cc b/libcef_dll/ctocpp/views/label_button_ctocpp.cc index fab551626..4de3d1462 100644 --- a/libcef_dll/ctocpp/views/label_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/label_button_ctocpp.cc @@ -952,7 +952,7 @@ template<> cef_label_button_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/layout_ctocpp.cc b/libcef_dll/ctocpp/views/layout_ctocpp.cc index ca44d29b8..60c677001 100644 --- a/libcef_dll/ctocpp/views/layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/layout_ctocpp.cc @@ -79,7 +79,7 @@ template<> cef_layout_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc index b309b4eb3..41ed08b4c 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc @@ -981,7 +981,7 @@ template<> cef_menu_button_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc index d6c55da49..1069a8fd9 100644 --- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc @@ -204,7 +204,7 @@ template<> cef_menu_button_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/panel_ctocpp.cc b/libcef_dll/ctocpp/views/panel_ctocpp.cc index 44222d075..5609362a1 100644 --- a/libcef_dll/ctocpp/views/panel_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_ctocpp.cc @@ -899,7 +899,7 @@ template<> cef_panel_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc index 2b51b16e4..da0578050 100644 --- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc @@ -171,7 +171,7 @@ template<> cef_panel_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc b/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc index b4fd6e21d..561717932 100644 --- a/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc @@ -804,7 +804,7 @@ template<> cef_scroll_view_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/textfield_ctocpp.cc b/libcef_dll/ctocpp/views/textfield_ctocpp.cc index d9134225a..1ca93f72a 100644 --- a/libcef_dll/ctocpp/views/textfield_ctocpp.cc +++ b/libcef_dll/ctocpp/views/textfield_ctocpp.cc @@ -1154,7 +1154,7 @@ template<> cef_textfield_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc index f7323b3d9..d15f5adc5 100644 --- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc @@ -206,7 +206,7 @@ template<> cef_textfield_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/view_ctocpp.cc b/libcef_dll/ctocpp/views/view_ctocpp.cc index c918b081f..a86ba2dcb 100644 --- a/libcef_dll/ctocpp/views/view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_ctocpp.cc @@ -720,7 +720,7 @@ template<> cef_view_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc index b03029d25..2b8a684a1 100644 --- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc @@ -195,7 +195,7 @@ template<> cef_view_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/window_ctocpp.cc b/libcef_dll/ctocpp/views/window_ctocpp.cc index 512a02e3b..32b800cc1 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_ctocpp.cc @@ -1357,7 +1357,7 @@ template<> cef_window_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc index cee8725f3..b7f04e323 100644 --- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc @@ -300,7 +300,7 @@ template<> cef_window_delegate_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc b/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc index 4bc171938..fe77a2b33 100644 --- a/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc +++ b/libcef_dll/ctocpp/web_plugin_info_ctocpp.cc @@ -92,7 +92,7 @@ template<> cef_web_plugin_info_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc b/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc index 6b262906d..95129c197 100644 --- a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.cc @@ -52,7 +52,7 @@ template<> cef_web_plugin_info_visitor_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc b/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc index 5035491c5..16ac36e4e 100644 --- a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.cc @@ -48,7 +48,7 @@ template<> cef_web_plugin_unstable_callback_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.cc b/libcef_dll/ctocpp/write_handler_ctocpp.cc index 9f5215e99..929e8dfe3 100644 --- a/libcef_dll/ctocpp/write_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/write_handler_ctocpp.cc @@ -108,7 +108,7 @@ template<> cef_write_handler_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/libcef_dll/ctocpp/xml_reader_ctocpp.cc index a68ec9c21..51b4f36df 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.cc @@ -534,7 +534,7 @@ template<> cef_xml_reader_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/libcef_dll/ctocpp/zip_reader_ctocpp.cc index 6a7a56618..385b48e3c 100644 --- a/libcef_dll/ctocpp/zip_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/zip_reader_ctocpp.cc @@ -236,7 +236,7 @@ template<> cef_zip_reader_t* CefCToCpp base::AtomicRefCount CefCToCpp::DebugObjCt = 0; #endif diff --git a/libcef_dll/libcef_dll.cc b/libcef_dll/libcef_dll.cc index cde4fdebe..6a49e8fdf 100644 --- a/libcef_dll/libcef_dll.cc +++ b/libcef_dll/libcef_dll.cc @@ -211,7 +211,7 @@ CEF_EXPORT void cef_shutdown() { // Execute CefShutdown(); -#ifndef NDEBUG +#if DCHECK_IS_ON() // Check that all wrapper objects have been destroyed DCHECK(base::AtomicRefCountIsZero(&CefAuthCallbackCppToC::DebugObjCt)); DCHECK(base::AtomicRefCountIsZero( @@ -333,7 +333,7 @@ CEF_EXPORT void cef_shutdown() { DCHECK(base::AtomicRefCountIsZero(&CefWriteHandlerCToCpp::DebugObjCt)); DCHECK(base::AtomicRefCountIsZero(&CefXmlReaderCppToC::DebugObjCt)); DCHECK(base::AtomicRefCountIsZero(&CefZipReaderCppToC::DebugObjCt)); -#endif // !NDEBUG +#endif // DCHECK_IS_ON() } CEF_EXPORT void cef_do_message_loop_work() { diff --git a/libcef_dll/wrapper/cef_stream_resource_handler.cc b/libcef_dll/wrapper/cef_stream_resource_handler.cc index 625dc48d5..0cdb85cde 100644 --- a/libcef_dll/wrapper/cef_stream_resource_handler.cc +++ b/libcef_dll/wrapper/cef_stream_resource_handler.cc @@ -85,7 +85,7 @@ CefStreamResourceHandler::CefStreamResourceHandler( status_text_("OK"), mime_type_(mime_type), stream_(stream) -#ifndef NDEBUG +#if DCHECK_IS_ON() , buffer_owned_by_file_thread_(false) #endif { @@ -105,7 +105,7 @@ CefStreamResourceHandler::CefStreamResourceHandler( mime_type_(mime_type), header_map_(header_map), stream_(stream) -#ifndef NDEBUG +#if DCHECK_IS_ON() , buffer_owned_by_file_thread_(false) #endif { @@ -144,7 +144,7 @@ bool CefStreamResourceHandler::ReadResponse(void* data_out, DCHECK_GT(bytes_to_read, 0); if (read_on_file_thread_) { -#ifndef NDEBUG +#if DCHECK_IS_ON() DCHECK(!buffer_owned_by_file_thread_); #endif if (buffer_ && (buffer_->CanRead() || buffer_->IsEmpty())) { @@ -160,7 +160,7 @@ bool CefStreamResourceHandler::ReadResponse(void* data_out, } else { // Perform another read on the file thread. bytes_read = 0; -#ifndef NDEBUG +#if DCHECK_IS_ON() buffer_owned_by_file_thread_ = true; #endif CefPostTask(TID_FILE, @@ -191,7 +191,7 @@ void CefStreamResourceHandler::ReadOnFileThread( int bytes_to_read, CefRefPtr callback) { CEF_REQUIRE_FILE_THREAD(); -#ifndef NDEBUG +#if DCHECK_IS_ON() DCHECK(buffer_owned_by_file_thread_); #endif @@ -200,7 +200,7 @@ void CefStreamResourceHandler::ReadOnFileThread( buffer_->Reset(bytes_to_read); buffer_->ReadFrom(stream_); -#ifndef NDEBUG +#if DCHECK_IS_ON() buffer_owned_by_file_thread_ = false; #endif callback->Continue(); diff --git a/libcef_dll/wrapper/libcef_dll_wrapper.cc b/libcef_dll/wrapper/libcef_dll_wrapper.cc index 74827e349..ecb268ed8 100644 --- a/libcef_dll/wrapper/libcef_dll_wrapper.cc +++ b/libcef_dll/wrapper/libcef_dll_wrapper.cc @@ -203,7 +203,7 @@ CEF_GLOBAL void CefShutdown() { // Execute cef_shutdown(); -#ifndef NDEBUG +#if DCHECK_IS_ON() // Check that all wrapper objects have been destroyed DCHECK(base::AtomicRefCountIsZero(&CefAuthCallbackCToCpp::DebugObjCt)); DCHECK(base::AtomicRefCountIsZero( @@ -325,7 +325,7 @@ CEF_GLOBAL void CefShutdown() { DCHECK(base::AtomicRefCountIsZero(&CefWriteHandlerCppToC::DebugObjCt)); DCHECK(base::AtomicRefCountIsZero(&CefXmlReaderCToCpp::DebugObjCt)); DCHECK(base::AtomicRefCountIsZero(&CefZipReaderCToCpp::DebugObjCt)); -#endif // !NDEBUG +#endif // DCHECK_IS_ON() } CEF_GLOBAL void CefDoMessageLoopWork() { diff --git a/tests/cefclient/browser/main_message_loop_external_pump_linux.cc b/tests/cefclient/browser/main_message_loop_external_pump_linux.cc index 2e4306d01..3a5445cf6 100644 --- a/tests/cefclient/browser/main_message_loop_external_pump_linux.cc +++ b/tests/cefclient/browser/main_message_loop_external_pump_linux.cc @@ -10,6 +10,7 @@ #include +#include "include/base/cef_logging.h" #include "include/cef_app.h" // From base/posix/eintr_wrapper.h. @@ -19,7 +20,7 @@ // that should be masked) to go unnoticed, there is a limit after which the // caller will nonetheless see an EINTR in Debug builds. #if !defined(HANDLE_EINTR) -#if defined(NDEBUG) +#if !DCHECK_IS_ON() #define HANDLE_EINTR(x) ({ \ decltype(x) eintr_wrapper_result; \ @@ -41,7 +42,7 @@ eintr_wrapper_result; \ }) -#endif // defined(NDEBUG) +#endif // !DCHECK_IS_ON() #endif // !defined(HANDLE_EINTR) namespace client { diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_win.cc b/tests/cefclient/browser/main_message_loop_multithreaded_win.cc index d9e659f42..eb29d894a 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_win.cc +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.cc @@ -5,6 +5,7 @@ #include "cefclient/browser/main_message_loop_multithreaded_win.h" #include "include/base/cef_bind.h" +#include "include/base/cef_logging.h" #include "include/cef_app.h" #include "cefclient/browser/resource.h" #include "cefclient/browser/util_win.h" @@ -99,7 +100,7 @@ void MainMessageLoopMultithreadedWin::SetCurrentModelessDialog( HWND hWndDialog) { DCHECK(RunsTasksOnCurrentThread()); -#ifndef NDEBUG +#if DCHECK_IS_ON() if (hWndDialog) { // A new dialog reference should not be set while one is currently set. DCHECK(!dialog_hwnd_); diff --git a/tests/cefclient/browser/osr_renderer.cc b/tests/cefclient/browser/osr_renderer.cc index 35f51543f..c8c0ad108 100644 --- a/tests/cefclient/browser/osr_renderer.cc +++ b/tests/cefclient/browser/osr_renderer.cc @@ -14,6 +14,7 @@ #error Platform is not supported. #endif +#include "include/base/cef_logging.h" #include "include/wrapper/cef_helpers.h" #ifndef GL_BGR @@ -27,7 +28,7 @@ #endif // DCHECK on gl errors. -#ifndef NDEBUG +#if DCHECK_IS_ON() #define VERIFY_NO_ERROR { \ int _gl_error = glGetError(); \ DCHECK(_gl_error == GL_NO_ERROR) << \ diff --git a/tests/cefclient/renderer/performance_test.cc b/tests/cefclient/renderer/performance_test.cc index 375d16f1f..7cc5736d6 100644 --- a/tests/cefclient/renderer/performance_test.cc +++ b/tests/cefclient/renderer/performance_test.cc @@ -7,6 +7,7 @@ #include #include +#include "include/base/cef_logging.h" #include "include/wrapper/cef_stream_resource_handler.h" #include "cefclient/renderer/performance_test_setup.h" @@ -14,7 +15,7 @@ namespace client { namespace performance_test { // Use more interations for a Release build. -#ifdef NDEBUG +#if DCHECK_IS_ON() const int kDefaultIterations = 100000; #else const int kDefaultIterations = 10000; diff --git a/tools/make_cpptoc_impl.py b/tools/make_cpptoc_impl.py index ee9619b3c..9c2142b82 100644 --- a/tools/make_cpptoc_impl.py +++ b/tools/make_cpptoc_impl.py @@ -382,11 +382,11 @@ def make_cpptoc_function_impl_new(cls, name, func, defined_names): if len(names) > 0: names = sorted(names) - result += '\n#ifndef NDEBUG'\ + 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 // !NDEBUG' + result += '\n#endif // DCHECK_IS_ON()' if len(result) != result_len: result += '\n' @@ -553,7 +553,7 @@ def make_cpptoc_class_impl(header, clsname, impl): ' NOTREACHED() << "Unexpected class type: " << type;\n'+ \ ' return NULL;\n'+ \ '}\n\n'+ \ - '#ifndef NDEBUG\n'+ \ + '#if DCHECK_IS_ON()\n'+ \ 'template<> base::AtomicRefCount '+parent_sig+'::DebugObjCt = 0;\n'+ \ '#endif\n\n'+ \ 'template<> CefWrapperType '+parent_sig+'::kWrapperType = '+get_wrapper_type_enum(clsname)+';' diff --git a/tools/make_ctocpp_impl.py b/tools/make_ctocpp_impl.py index 4b2cb20df..d05df842e 100644 --- a/tools/make_ctocpp_impl.py +++ b/tools/make_ctocpp_impl.py @@ -419,11 +419,11 @@ def make_ctocpp_function_impl_new(clsname, name, func): if len(names) > 0: names = sorted(names) - result += '\n#ifndef NDEBUG'\ + 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 // !NDEBUG' + result += '\n#endif // DCHECK_IS_ON()' if len(result) != result_len: result += '\n' @@ -554,7 +554,7 @@ def make_ctocpp_class_impl(header, clsname, impl): ' NOTREACHED() << "Unexpected class type: " << type;\n'+ \ ' return NULL;\n'+ \ '}\n\n'+ \ - '#ifndef NDEBUG\n'+ \ + '#if DCHECK_IS_ON()\n'+ \ 'template<> base::AtomicRefCount '+parent_sig+'::DebugObjCt = 0;\n'+ \ '#endif\n\n'+ \ 'template<> CefWrapperType '+parent_sig+'::kWrapperType = '+get_wrapper_type_enum(clsname)+';'