diff --git a/BUILD.gn b/BUILD.gn index 9862d72303bce542bb4a353e69f996f9c000f396..007b12aa22c790f46ce9600c66dca8a6de2b2cd4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -408,20 +408,31 @@ test("libcef_static_unittests") { testonly = true sources = [ + "libcef/browser/browser_platform_delegate_unittest.cc", "libcef/browser/devtools/devtools_util_unittest.cc", "libcef/browser/geometry_util_unittest.cc", + "libcef/browser/osr/browser_platform_delegate_osr_unittest.cc", ] deps = [ + ":libcef_static", ":libcef_static_unittested", + "libcef/common/mojom", "//base/test:run_all_unittests", + "//testing/gmock", "//testing/gtest", + "libcef/common/mojom", ] configs += [ "libcef/features:config", "//build/config:precompiled_headers", ] + + include_dirs = [ + "//third_party/skia", + "//third_party/boringssl/src/include" + ] } # Source files that are linked into libcef and cef_framework and implement @@ -485,6 +496,8 @@ source_set("libcef_static") { "libcef/browser/alloy/chrome_profile_alloy.h", "libcef/browser/alloy/chrome_profile_manager_alloy.cc", "libcef/browser/alloy/chrome_profile_manager_alloy.h", + "libcef/browser/alloy/render_process_state_handler.cc", + "libcef/browser/alloy/render_process_state_handler.h", "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.cc", "libcef/browser/alloy/dialogs/alloy_constrained_window_views_client.h", "libcef/browser/alloy/dialogs/alloy_javascript_dialog_manager_delegate.cc", @@ -954,8 +967,8 @@ source_set("libcef_static") { "libcef/renderer/alloy/alloy_content_renderer_client.h", "libcef/renderer/alloy/alloy_render_thread_observer.cc", "libcef/renderer/alloy/alloy_render_thread_observer.h", - "libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.cc", - "libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.h", + "libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.cc", + "libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.h", "libcef/renderer/alloy/url_loader_throttle_provider_impl.cc", "libcef/renderer/alloy/url_loader_throttle_provider_impl.h", "libcef/renderer/browser_impl.cc", @@ -1027,29 +1040,37 @@ source_set("libcef_static") { "libcef/browser/autofill/oh_autofill_manager.h", "libcef/browser/autofill/oh_autofill_provider.cc", "libcef/browser/autofill/oh_autofill_provider.h", - "libcef/browser/ohos_safe_browsing/ohos_safe_browsing_response.h", - "libcef/browser/ohos_safe_browsing/ohos_sb_block_page.cc", - "libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h", - "libcef/browser/ohos_safe_browsing/ohos_sb_client.cc", - "libcef/browser/ohos_safe_browsing/ohos_sb_client.h", - "libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.cc", - "libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h", - "libcef/browser/ohos_safe_browsing/ohos_sb_prefs.cc", - "libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h", - "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_interface.h", - "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.cc", - "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.h", - "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.cc", - "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.h", "libcef/browser/report_manager.cc", "libcef/browser/report_manager.h", "libcef/browser/res_reporter.cc", "libcef/browser/res_reporter.h", + "libcef/browser/safe_browsing/safe_browsing_response.h", + "libcef/browser/safe_browsing/safe_browsing_tab_helper.cc", + "libcef/browser/safe_browsing/safe_browsing_tab_helper.h", + "libcef/browser/safe_browsing/sb_block_page.cc", + "libcef/browser/safe_browsing/sb_block_page.h", + "libcef/browser/safe_browsing/sb_client.cc", + "libcef/browser/safe_browsing/sb_client.h", + "libcef/browser/safe_browsing/sb_controller_client.cc", + "libcef/browser/safe_browsing/sb_controller_client.h", + "libcef/browser/safe_browsing/sb_prefs.cc", + "libcef/browser/safe_browsing/sb_prefs.h", + "libcef/browser/safe_browsing/url_trust_list_interface.h", + "libcef/browser/safe_browsing/url_trust_list_manager.cc", + "libcef/browser/safe_browsing/url_trust_list_manager.h", + "libcef/browser/safe_browsing/url_trust_list_navigation_throttle.cc", + "libcef/browser/safe_browsing/url_trust_list_navigation_throttle.h", "libcef/renderer/alloy/alloy_content_settings_client.cc", "libcef/renderer/alloy/alloy_content_settings_client.h", ] } + if (use_libfuzzer) { + configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] + configs += [ "//build/config/gcc:symbol_visibility_default" ] + cflags = [ "-DOHOS_FUZZ_COMPILE_ERROR_FIX" ] + } + #ifdef OHOS_ITP if (defined(ohos_itp) && ohos_itp) { if (!defined(ohos_nweb_ex) || !ohos_nweb_ex) { @@ -1107,16 +1128,6 @@ source_set("libcef_static") { #endif - #ifdef OHOS_NAVIGATION - if (defined(ohos_navigation) && ohos_navigation) { - sources += [ - "libcef/browser/load_committed_details_impl.cc", - "libcef/browser/load_committed_details_impl.h", - ] - } - - #endif - #ifdef OHOS_INCOGNITO_MODE if (defined(ohos_incognito_mode) && ohos_incognito_mode) { sources += [ @@ -1133,6 +1144,16 @@ source_set("libcef_static") { #endif + #ifdef OHOS_NAVIGATION + if (defined(ohos_navigation) && ohos_navigation) { + sources += [ + "libcef/browser/load_committed_details_impl.cc", + "libcef/browser/load_committed_details_impl.h", + ] + } + + #endif + #if defined(OHOS_CUSTOM_VIDEO_PLAYER) if (defined(ohos_custom_video_player) && ohos_custom_video_player) { sources += [ @@ -1144,7 +1165,7 @@ source_set("libcef_static") { #endif // OHOS_CUSTOM_VIDEO_PLAYER - #if defined(OHOS_ADSBLOCK) + #if defined(OHOS_ARKWEB_ADBLOCK) sources += [ "libcef/browser/adsblock_manager_impl.cc", "libcef/browser/adsblock_manager_impl.h", @@ -1169,7 +1190,11 @@ source_set("libcef_static") { "//cef/libcef/features", # Support relative include paths. + "//ohos_nweb:nweb_sources", "//third_party/abseil-cpp:absl", + + # Support ohos_nweb include paths. + "//ohos_nweb:nweb_sources", ] deps = [ @@ -1283,9 +1308,12 @@ source_set("libcef_static") { if (defined(ohos_nweb_ex) && ohos_nweb_ex) { deps += [ "//ohos_nweb_ex/overrides/cef" ] + + import("//ohos_nweb_ex/build/env.gni") + configs += [ "//ohos_nweb_ex/build:build_config" ] } - #ifdef OHOS_EX_ADBLOCK + #ifdef OHOS_ARKWEB_ADBLOCK if (defined(ohos_arkweb_adblock) && ohos_arkweb_adblock) { sources += [ "libcef/browser/subresource_filter/adblock_content_subresource_filter_web_contents_helper_factory.cc", @@ -1311,6 +1339,18 @@ source_set("libcef_static") { #endif + #ifdef OHOS_ARKWEB_EXTENSIONS + if (defined(ohos_arkweb_extensions) && ohos_arkweb_extensions) { + sources += [ + "libcef/browser/extensions/api/tabs/tabs_event_router.cc", + "libcef/browser/extensions/api/tabs/tabs_event_router.h", + "libcef/browser/extensions/api/tabs/tabs_windows_api.cc", + "libcef/browser/extensions/api/tabs/tabs_windows_api.h", + ] + } + + #endif + #if defined(OHOS_PRINT) if (defined(ohos_print) && ohos_print) { sources += [ diff --git a/cef_paths.gypi b/cef_paths.gypi index 97e1f9903a70497bfcd9b4bde7e6889fef773761..b3529910dc726d5ebf55d37b7da41f780c7addee 100644 --- a/cef_paths.gypi +++ b/cef_paths.gypi @@ -8,7 +8,7 @@ # by hand. See the translator.README.txt file in the tools directory for # more information. # -# $hash=c1b8ac822713f57ce24a7a854fa47b402cd084f3$ +# $hash=a9ed856c5a6fe3d0ab5287807ccbf3a85c31f2a7$ # { @@ -97,6 +97,7 @@ 'include/cef_v8.h', 'include/cef_values.h', 'include/cef_waitable_event.h', + 'include/cef_web_extension_api_handler.h', 'include/cef_web_storage.h', 'include/cef_x509_certificate.h', 'include/cef_xml_reader.h', @@ -213,6 +214,7 @@ 'include/capi/cef_v8_capi.h', 'include/capi/cef_values_capi.h', 'include/capi/cef_waitable_event_capi.h', + 'include/capi/cef_web_extension_api_handler_capi.h', 'include/capi/cef_web_storage_capi.h', 'include/capi/cef_x509_certificate_capi.h', 'include/capi/cef_xml_reader_capi.h', @@ -611,6 +613,8 @@ 'libcef_dll/ctocpp/views/view_delegate_ctocpp.h', 'libcef_dll/cpptoc/waitable_event_cpptoc.cc', 'libcef_dll/cpptoc/waitable_event_cpptoc.h', + 'libcef_dll/ctocpp/web_extension_api_handler_ctocpp.cc', + 'libcef_dll/ctocpp/web_extension_api_handler_ctocpp.h', 'libcef_dll/ctocpp/web_message_receiver_ctocpp.cc', 'libcef_dll/ctocpp/web_message_receiver_ctocpp.h', 'libcef_dll/cpptoc/web_storage_cpptoc.cc', @@ -999,6 +1003,8 @@ 'libcef_dll/cpptoc/views/view_delegate_cpptoc.h', 'libcef_dll/ctocpp/waitable_event_ctocpp.cc', 'libcef_dll/ctocpp/waitable_event_ctocpp.h', + 'libcef_dll/cpptoc/web_extension_api_handler_cpptoc.cc', + 'libcef_dll/cpptoc/web_extension_api_handler_cpptoc.h', 'libcef_dll/cpptoc/web_message_receiver_cpptoc.cc', 'libcef_dll/cpptoc/web_message_receiver_cpptoc.h', 'libcef_dll/ctocpp/web_storage_ctocpp.cc', diff --git a/include/capi/cef_browser_capi.h b/include/capi/cef_browser_capi.h index 80bee50dc39ba7bd403e36becfaa840580f5fc8b..0d57e9f4d08a4139b9a36e125652ba3a5854a7c2 100644 --- a/include/capi/cef_browser_capi.h +++ b/include/capi/cef_browser_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=dbbd9202c9a9de9eeaeef1b22d2f222d9b9500fc$ +// $hash=c7bbbb0f1e65a23f5adabec58f5697ee34dda670$ // #ifndef CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_ @@ -101,7 +101,7 @@ typedef struct _cef_store_web_archive_result_callback_t { /// /// Structure to implement to be notified of asynchronous completion via -/// cef_browser_host_tBase::SetGestureEventResult(). +/// cef_browser_host_tBase::set_gesture_event_result(). /// typedef struct _cef_gesture_event_callback_t { /// @@ -131,8 +131,30 @@ typedef struct _cef_web_message_receiver_t { /// void(CEF_CALLBACK* on_message)(struct _cef_web_message_receiver_t* self, struct _cef_value_t* message); + + /// + /// The same as OnMessage, the result of the execution will be returned. + /// + int(CEF_CALLBACK* on_message_with_bool_result)( + struct _cef_web_message_receiver_t* self, + struct _cef_value_t* message); } cef_web_message_receiver_t; +/// +/// cef_set_lock_callback_t. +/// +typedef struct _cef_set_lock_callback_t { + /// + /// Base structure. + /// + cef_base_ref_counted_t base; + + /// + /// Handle. + /// + void(CEF_CALLBACK* handle)(struct _cef_set_lock_callback_t* self, int key); +} cef_set_lock_callback_t; + /// /// Structure to implement to be notified of compiling javascript completion via /// cef_browser_host_tBase::precompile_java_script(). @@ -167,21 +189,6 @@ typedef struct _cef_cache_options_t { struct _cef_cache_options_t* self); } cef_cache_options_t; -/// -/// cef_set_lock_callback_t -/// -typedef struct _cef_set_lock_callback_t { - /// - /// Base structure. - /// - cef_base_ref_counted_t base; - - /// - /// Handle. - /// - void(CEF_CALLBACK* handle)(struct _cef_set_lock_callback_t* self, int key); -} cef_set_lock_callback_t; - /// /// Structure used to represent a browser. When used in the browser process the /// functions of this structure may be called on any thread unless otherwise @@ -352,12 +359,12 @@ typedef struct _cef_browser_t { /// /// display the selection control when click Free copy structure /// - void(CEF_CALLBACK* select_and_copy)(struct _cef_browser_t* self); + void(CEF_CALLBACK* show_free_copy_menu)(struct _cef_browser_t* self); /// /// should show free copy menu /// - int(CEF_CALLBACK* should_show_free_copy)(struct _cef_browser_t* self); + int(CEF_CALLBACK* should_show_free_copy_menu)(struct _cef_browser_t* self); /// /// select password dialog to fill @@ -428,11 +435,20 @@ typedef struct _cef_browser_t { int(CEF_CALLBACK* get_nweb_id)(struct _cef_browser_t* self); /// - /// Set whether the target_blank pop-up window is opened in the current tab. + /// Get whether Ads block is enabled. /// - void(CEF_CALLBACK* set_enable_blank_target_popup_intercept)( - struct _cef_browser_t* self, - int enableBlankTargetPopup); + int(CEF_CALLBACK* is_ads_block_enabled)(struct _cef_browser_t* self); + + /// + /// Get whether Ads block is enabled for current page. + /// + int(CEF_CALLBACK* is_ads_block_enabled_for_cur_page)( + struct _cef_browser_t* self); + + /// + /// Set enable to allow automatically save password + /// + void(CEF_CALLBACK* enable_ads_block)(struct _cef_browser_t* self, int enable); /// /// Whether automatically saving password had been enabled. @@ -464,11 +480,6 @@ typedef struct _cef_browser_t { void(CEF_CALLBACK* set_save_password)(struct _cef_browser_t* self, int enable); - /// - /// Get security level for current page. - /// - int(CEF_CALLBACK* get_security_level)(struct _cef_browser_t* self); - /// /// Enable the ability to check website security risks. /// @@ -481,33 +492,41 @@ typedef struct _cef_browser_t { int(CEF_CALLBACK* is_safe_browsing_enabled)(struct _cef_browser_t* self); /// - /// Enable the ability to intelligent tracking prevention, default disabled. + /// Get security level for current page. /// - void(CEF_CALLBACK* enable_intelligent_tracking_prevention)( - struct _cef_browser_t* self, - int enable); + int(CEF_CALLBACK* get_security_level)(struct _cef_browser_t* self); /// - /// Get whether intelligent tracking prevention is enabled. + /// Get the shrink viewport height. /// - int(CEF_CALLBACK* is_intelligent_tracking_prevention_enabled)( - struct _cef_browser_t* self); + int(CEF_CALLBACK* insert_back_forward_entry)(struct _cef_browser_t* self, + int index, + const cef_string_t* url); /// - /// Get whether Ads block is enabled. + /// Get the shrink viewport height. /// - int(CEF_CALLBACK* is_ads_block_enabled)(struct _cef_browser_t* self); + int(CEF_CALLBACK* update_navigation_entry_url)(struct _cef_browser_t* self, + int index, + const cef_string_t* url); /// - /// Get whether Ads block is enabled for current page. + /// Get the shrink viewport height. /// - int(CEF_CALLBACK* is_ads_block_enabled_for_cur_page)( - struct _cef_browser_t* self); + void(CEF_CALLBACK* clear_forward_list)(struct _cef_browser_t* self); /// - /// Set enable to allow automatically save password + /// Enable the ability to intelligent tracking prevention, default disabled. /// - void(CEF_CALLBACK* enable_ads_block)(struct _cef_browser_t* self, int enable); + void(CEF_CALLBACK* enable_intelligent_tracking_prevention)( + struct _cef_browser_t* self, + int enable); + + /// + /// Get whether intelligent tracking prevention is enabled. + /// + int(CEF_CALLBACK* is_intelligent_tracking_prevention_enabled)( + struct _cef_browser_t* self); /// /// Set url trust list. @@ -518,7 +537,17 @@ typedef struct _cef_browser_t { cef_string_t* detailErrMsg); /// - /// Set url trust list. + /// Set tabId. + /// + void(CEF_CALLBACK* set_tab_id)(struct _cef_browser_t* self, int tab_id); + + /// + /// Get tabId. + /// + int(CEF_CALLBACK* get_tab_id)(struct _cef_browser_t* self); + + /// + /// Set back forward cache options. /// void(CEF_CALLBACK* set_back_forward_cache_options)( struct _cef_browser_t* self, @@ -1322,13 +1351,15 @@ typedef struct _cef_browser_host_t { /// GetImageForContextNode /// void(CEF_CALLBACK* get_image_for_context_node)( - struct _cef_browser_host_t* self); + struct _cef_browser_host_t* self, + int command_id); /// /// GetImageFromCache /// void(CEF_CALLBACK* get_image_from_cache)(struct _cef_browser_host_t* self, - const cef_string_t* url); + const cef_string_t* url, + int command_id); /// /// ExitFullScreen @@ -1500,7 +1531,7 @@ typedef struct _cef_browser_host_t { /// Post a message to the port. /// void(CEF_CALLBACK* post_port_message)(struct _cef_browser_host_t* self, - cef_string_t* port_handle, + const cef_string_t* port_handle, struct _cef_value_t* message); /// @@ -1508,7 +1539,7 @@ typedef struct _cef_browser_host_t { /// void(CEF_CALLBACK* set_port_message_callback)( struct _cef_browser_host_t* self, - cef_string_t* port_handle, + const cef_string_t* port_handle, struct _cef_web_message_receiver_t* callback); /// @@ -1774,6 +1805,14 @@ typedef struct _cef_browser_host_t { void(CEF_CALLBACK* set_overscroll_mode)(struct _cef_browser_host_t* self, int mode); + /// + /// Change the zoom factor for browser zoom. If called on the UI thread the + /// change will be applied immediately. Otherwise, the change will be applied + /// asynchronously on the UI thread. + /// + void(CEF_CALLBACK* set_browser_zoom_level)(struct _cef_browser_host_t* self, + double zoomFactor); + /// /// Discard a webview window /// @@ -1784,14 +1823,6 @@ typedef struct _cef_browser_host_t { /// int(CEF_CALLBACK* restore)(struct _cef_browser_host_t* self); - /// - /// Change the zoom factor for browser zoom. If called on the UI thread the - /// change will be applied immediately. Otherwise, the change will be applied - /// asynchronously on the UI thread. - /// - void(CEF_CALLBACK* set_browser_zoom_level)(struct _cef_browser_host_t* self, - double zoomFactor); - /// /// Get the top controls offset. /// @@ -1803,6 +1834,26 @@ typedef struct _cef_browser_host_t { int(CEF_CALLBACK* get_shrink_viewport_height)( struct _cef_browser_host_t* self); + /// + /// Get the shrink viewport height. + /// + int(CEF_CALLBACK* insert_back_forward_entry)(struct _cef_browser_host_t* self, + int index, + const cef_string_t* url); + + /// + /// Get the shrink viewport height. + /// + int(CEF_CALLBACK* update_navigation_entry_url)( + struct _cef_browser_host_t* self, + int index, + const cef_string_t* url); + + /// + /// Get the shrink viewport height. + /// + void(CEF_CALLBACK* clear_forward_list)(struct _cef_browser_host_t* self); + /// /// Set background print enable. /// @@ -1822,7 +1873,15 @@ typedef struct _cef_browser_host_t { int scrollType); /// - /// Start current camera. + /// Get the last javascript proxy calling frame url. + /// + // The resulting string must be freed by calling cef_string_userfree_free(). + cef_string_userfree_t( + CEF_CALLBACK* get_last_javascript_proxy_calling_frame_url)( + struct _cef_browser_host_t* self); + + /// + /// Start current camera. /// void(CEF_CALLBACK* start_camera)(struct _cef_browser_host_t* self); @@ -1836,14 +1895,6 @@ typedef struct _cef_browser_host_t { /// void(CEF_CALLBACK* close_camera)(struct _cef_browser_host_t* self); - /// - /// Get the last javascript proxy calling frame url. - /// - // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t( - CEF_CALLBACK* get_last_javascript_proxy_calling_frame_url)( - struct _cef_browser_host_t* self); - /// /// Set NWebID. /// @@ -1855,14 +1906,11 @@ typedef struct _cef_browser_host_t { int(CEF_CALLBACK* get_pending_size_status)(struct _cef_browser_host_t* self); /// - /// precompile javascript and generate code cache. + /// Get cef_download_item_t by download_item_id. /// - void(CEF_CALLBACK* precompile_java_script)( + struct _cef_download_item_t*(CEF_CALLBACK* get_download_item)( struct _cef_browser_host_t* self, - const char* url, - const char* script, - struct _cef_cache_options_t* cacheOptions, - struct _cef_precompile_callback_t* callback); + uint32 item_id); /// /// SetWakeLockHandler. @@ -1873,37 +1921,30 @@ typedef struct _cef_browser_host_t { struct _cef_set_lock_callback_t* callback); /// - /// Get cef_download_item_t by download_item_id. - /// - struct _cef_download_item_t*(CEF_CALLBACK* get_download_item)( - struct _cef_browser_host_t* self, - uint32 item_id); - - /// - /// Notify browser host needs reload when the render process terminated. + /// Notify browser host needs reoload when the render process terminated. /// - void(CEF_CALLBACK* notify_needs_reload)(struct _cef_browser_host_t* self, - int needs_reload); + void(CEF_CALLBACK* set_needs_reload)(struct _cef_browser_host_t* self, + int needs_reload); /// - /// Return true if needs reload page, or false if nees not reload. + /// Return true (1) if needs reload page, or false (0) if needs not reload. /// int(CEF_CALLBACK* needs_reload)(struct _cef_browser_host_t* self); /// - /// Terminate render process + /// precompile javascript and generate code cache. /// - int(CEF_CALLBACK* terminate_render_process)(struct _cef_browser_host_t* self); + void(CEF_CALLBACK* precompile_java_script)( + struct _cef_browser_host_t* self, + const char* url, + const char* script, + struct _cef_cache_options_t* cacheOptions, + struct _cef_precompile_callback_t* callback); /// - /// RegisterNativeJSProxy + /// update DrawRect. /// - void(CEF_CALLBACK* register_native_jsproxy)(struct _cef_browser_host_t* self, - const cef_string_t* object_name, - cef_string_list_t method_list, - int32_t object_id, - int is_async, - const cef_string_t* permission); + void(CEF_CALLBACK* update_draw_rect)(struct _cef_browser_host_t* self); /// /// SendTouchpadFlingEvent @@ -1921,9 +1962,19 @@ typedef struct _cef_browser_host_t { int mode); /// - /// update draw_rect state. + /// Terminate render process /// - void(CEF_CALLBACK* update_draw_rect)(struct _cef_browser_host_t* self); + int(CEF_CALLBACK* terminate_render_process)(struct _cef_browser_host_t* self); + + /// + /// RegisterNativeJSProxy + /// + void(CEF_CALLBACK* register_native_jsproxy)(struct _cef_browser_host_t* self, + const cef_string_t* object_name, + cef_string_list_t method_list, + int32_t object_id, + int is_async, + const cef_string_t* permission); /// /// Called when text is selected. @@ -1951,6 +2002,12 @@ typedef struct _cef_browser_host_t { void(CEF_CALLBACK* advance_focus_for_ime)(struct _cef_browser_host_t* self, int focusType); + /// + /// Called when image analyzer overlay is destoryed. + /// + void(CEF_CALLBACK* on_destroy_image_analyzer_overlay)( + struct _cef_browser_host_t* self); + /// /// OnSafeInsetsChange /// @@ -1973,6 +2030,21 @@ typedef struct _cef_browser_host_t { struct _cef_browser_host_t* self, cef_string_list_t dir_list); + /// + /// Receiving the tab updated notification. + /// + void(CEF_CALLBACK* web_extension_tab_updated)( + struct _cef_browser_host_t* self, + int tab_id, + cef_string_list_t changed_property_names, + const cef_string_t* url); + + /// + /// ScrollFocusedEditableNodeIntoView. + /// + void(CEF_CALLBACK* scroll_focused_editable_node_into_view)( + struct _cef_browser_host_t* self); + /// /// Set the callback of the autofill event. /// @@ -1986,12 +2058,6 @@ typedef struct _cef_browser_host_t { void(CEF_CALLBACK* fill_autofill_data)(struct _cef_browser_host_t* self, struct _cef_value_t* message); - /// - /// ScrollFocusedEditableNodeIntoView. - /// - void(CEF_CALLBACK* scroll_focused_editable_node_into_view)( - struct _cef_browser_host_t* self); - /// /// Process autofill cancel content. /// diff --git a/include/capi/cef_client_capi.h b/include/capi/cef_client_capi.h index 787d5e6a9f621b0a0b899eea10e757584b506d31..d3ec72309ca233d70fb69c61b4a504f283400109 100644 --- a/include/capi/cef_client_capi.h +++ b/include/capi/cef_client_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=0814b0c8da2385498d0770cc58f5b5b9f1678958$ +// $hash=9157d7b0ec525fdca339a4a3c71ed09ec5d379a0$ // #ifndef CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_ @@ -44,6 +44,8 @@ #include "include/capi/cef_base_capi.h" #include "include/capi/cef_command_handler_capi.h" #include "include/capi/cef_context_menu_handler_capi.h" +#include "include/capi/cef_custom_media_info_capi.h" +#include "include/capi/cef_custom_media_player_delegate_capi.h" #include "include/capi/cef_dialog_handler_capi.h" #include "include/capi/cef_display_handler_capi.h" #include "include/capi/cef_download_handler_capi.h" @@ -57,12 +59,14 @@ #include "include/capi/cef_life_span_handler_capi.h" #include "include/capi/cef_load_handler_capi.h" #include "include/capi/cef_media_handler_capi.h" +#include "include/capi/cef_media_player_listener_capi.h" #include "include/capi/cef_permission_handler_capi.h" #include "include/capi/cef_permission_request_capi.h" #include "include/capi/cef_print_handler_capi.h" #include "include/capi/cef_process_message_capi.h" #include "include/capi/cef_render_handler_capi.h" #include "include/capi/cef_request_handler_capi.h" +#include "include/capi/cef_web_extension_api_handler_capi.h" #ifdef __cplusplus extern "C" { @@ -281,6 +285,13 @@ typedef struct _cef_client_t { /// int(CEF_CALLBACK* do_browser_controls_shrink_renderer_size)( struct _cef_client_t* self); + + /// + /// Return the handler for web extension api. If no handler is provided the + /// default implementation will be used. + /// + struct _cef_web_extension_api_handler_t*( + CEF_CALLBACK* get_web_extension_api_handler)(struct _cef_client_t* self); } cef_client_t; #ifdef __cplusplus diff --git a/include/capi/cef_context_menu_handler_capi.h b/include/capi/cef_context_menu_handler_capi.h index 751a9686bcbe9f8ba0bc1428770bb0b30754287e..69678517b8c68414a1f1194708ec460564f44ab6 100644 --- a/include/capi/cef_context_menu_handler_capi.h +++ b/include/capi/cef_context_menu_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=b4593fab0fae90e9b9ff4658ab94055a465f2b3d$ +// $hash=e15db478201176a4acf1e5e7bbe9fe2c5d6d2ba2$ // #ifndef CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_ @@ -223,14 +223,16 @@ typedef struct _cef_context_menu_handler_t { void(CEF_CALLBACK* on_get_image_for_context_node)( struct _cef_context_menu_handler_t* self, struct _cef_browser_t* browser, - struct _cef_image_t* image); + struct _cef_image_t* image, + int command_id); /// /// Called when GetImageFromCache function to get image from memory cache. /// void(CEF_CALLBACK* on_get_image_from_cache)( struct _cef_context_menu_handler_t* self, - struct _cef_image_t* image); + struct _cef_image_t* image, + int command_id); /// /// Called when you need to temporarily hide/restore the handle menu. @@ -238,6 +240,12 @@ typedef struct _cef_context_menu_handler_t { void(CEF_CALLBACK* hide_handle_and_quick_menu_if_necessary)( struct _cef_context_menu_handler_t* self, int hide); + + /// + /// Called when you click on the selected area. + /// + void(CEF_CALLBACK* change_visibility_of_quick_menu)( + struct _cef_context_menu_handler_t* self); } cef_context_menu_handler_t; /// diff --git a/include/capi/cef_cookie_capi.h b/include/capi/cef_cookie_capi.h index 20adae8accd70dcf6cc5ce7b89e0b325e05eabf7..ba42ad0c15ba598305714cfe4d6e0a1926cc91db 100644 --- a/include/capi/cef_cookie_capi.h +++ b/include/capi/cef_cookie_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=cb6483fc6c0cda8419cd2be92b97f98392a417b9$ +// $hash=1a8af0e7a531b4b8768225572a3f18940fbbf276$ // #ifndef CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_ @@ -81,7 +81,8 @@ typedef struct _cef_cookie_manager_t { const cef_string_t* url, int includeHttpOnly, struct _cef_cookie_visitor_t* visitor, - int is_sync); + int is_sync, + int is_from_ndk); /// /// Sets a cookie given a valid URL and explicit user-provided cookie @@ -97,7 +98,8 @@ typedef struct _cef_cookie_manager_t { const struct _cef_cookie_t* cookie, struct _cef_set_cookie_callback_t* callback, int is_sync, - const cef_string_t* str_cookie); + const cef_string_t* str_cookie, + int includeHttpOnly); /// /// Delete all cookies that match the specified parameters. If both |url| and diff --git a/include/capi/cef_custom_media_info_capi.h b/include/capi/cef_custom_media_info_capi.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/include/capi/cef_custom_media_player_delegate_capi.h b/include/capi/cef_custom_media_player_delegate_capi.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/include/capi/cef_load_handler_capi.h b/include/capi/cef_load_handler_capi.h index 615328d0315bddb0c65c741d9903c426813bcebd..c4528efb39de61e34eaefbc12aee9417ab5d27df 100644 --- a/include/capi/cef_load_handler_capi.h +++ b/include/capi/cef_load_handler_capi.h @@ -178,6 +178,13 @@ typedef struct _cef_load_handler_t { int64_t navigationStartTick, int64_t firstContentfulPaintMs); + /// + /// Called when received website security risk check result. + /// + void(CEF_CALLBACK* on_safe_browsing_check_result)( + struct _cef_load_handler_t* self, + int threat_type); + /// /// Called when the first meaningful paint rendering of web page. /// @@ -199,13 +206,6 @@ typedef struct _cef_load_handler_t { struct _cef_load_handler_t* self, struct _cef_load_committed_details_t* details); - /// - /// Called when received website security risk check result. - /// - void(CEF_CALLBACK* on_safe_browsing_check_result)( - struct _cef_load_handler_t* self, - int threat_type); - /// /// Called when tracker's cookie is prevented. /// diff --git a/include/capi/cef_media_player_listener_capi.h b/include/capi/cef_media_player_listener_capi.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/include/capi/cef_permission_request_capi.h b/include/capi/cef_permission_request_capi.h index 3e007d4dff99c703ca9f9bd1a56182551381049c..94768e1e5042d99d82d0e1eb032626c32fb6464f 100644 --- a/include/capi/cef_permission_request_capi.h +++ b/include/capi/cef_permission_request_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=e09e9bcd5575c1878e9439e8d3932b4c37bd32ca$ +// $hash=78adaf2cb74f85760d331e10ad4311a1c4d16ad9$ // #ifndef CEF_INCLUDE_CAPI_CEF_PERMISSION_REQUEST_CAPI_H_ @@ -258,6 +258,51 @@ typedef struct _cef_browser_permission_request_delegate_t { struct _cef_browser_permission_request_delegate_t* self, int value, const cef_string_t* origin); + + /// + /// Handle the Audio Capture permission requests. + /// + void(CEF_CALLBACK* ask_audio_capture_permission)( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin, + cef_permission_callback_t callback); + + /// + /// Cancel the Audio Capturepermission requests. + /// + void(CEF_CALLBACK* abort_ask_audio_capture_permission)( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin); + + /// + /// Handle the Video Capture permission requests. + /// + void(CEF_CALLBACK* ask_video_capture_permission)( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin, + cef_permission_callback_t callback); + + /// + /// Cancel the Video Capturepermission requests. + /// + void(CEF_CALLBACK* abort_ask_video_capture_permission)( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin); + + /// + /// Handle the Clipboard Sanitized permission requests. + /// + void(CEF_CALLBACK* ask_clipboard_sanitized_write_permission)( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin, + cef_permission_callback_t callback); + + /// + /// Cancel the Clipboard Read Sanitezed permission requests. + /// + void(CEF_CALLBACK* abort_ask_clipboard_sanitized_write_permission)( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin); } cef_browser_permission_request_delegate_t; /// diff --git a/include/capi/cef_render_handler_capi.h b/include/capi/cef_render_handler_capi.h index 71a21dc596222b4ce0ad6bdf0723dbb476c36d52..f501bbd5d611f6d1436169795ebe71f2f4976e78 100644 --- a/include/capi/cef_render_handler_capi.h +++ b/include/capi/cef_render_handler_capi.h @@ -389,16 +389,6 @@ typedef struct _cef_render_handler_t { void(CEF_CALLBACK* release_resize_hold)(struct _cef_render_handler_t* self, struct _cef_browser_t* browser); - /// - /// Called when text input state has changed for the specified |browser|. - /// - void(CEF_CALLBACK* on_update_text_input_state_called)( - struct _cef_render_handler_t* self, - struct _cef_browser_t* browser, - const cef_string_t* text, - const cef_range_t* selected_range, - const cef_range_t* compositon_range); - /// /// Called when selecting word. /// @@ -426,6 +416,16 @@ typedef struct _cef_render_handler_t { struct _cef_browser_t* browser, const cef_rect_t* cef_screen_rect); + /// + /// Called when text input state has changed for the specified |browser|. + /// + void(CEF_CALLBACK* on_update_text_input_state_called)( + struct _cef_render_handler_t* self, + struct _cef_browser_t* browser, + const cef_string_t* text, + const cef_range_t* selected_range, + const cef_range_t* compositon_range); + /// /// Called to retrieve the visible view rectangle in screen DIP coordinates. /// This function must always provide a non-NULL rectangle. @@ -448,6 +448,12 @@ typedef struct _cef_render_handler_t { void(CEF_CALLBACK* set_fill_content)(struct _cef_render_handler_t* self, const char* content); + /// + /// SetGestureEventResult + /// + void(CEF_CALLBACK* set_gesture_event_result)(struct _cef_render_handler_t* self, + bool result); + /// /// Called when you need to start vibrator. /// diff --git a/include/capi/cef_request_capi.h b/include/capi/cef_request_capi.h index 2475ba790b40f9a034c72150311d85e90a496a39..beaf50e6abc09bdb4fefe720977ecd9a6b2870be 100644 --- a/include/capi/cef_request_capi.h +++ b/include/capi/cef_request_capi.h @@ -63,78 +63,78 @@ typedef struct _cef_request_t { /// /// Returns true (1) if this object is read-only. /// - int(CEF_CALLBACK *is_read_only)(struct _cef_request_t *self); + int(CEF_CALLBACK* is_read_only)(struct _cef_request_t* self); /// /// Get the fully qualified URL. /// // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK *get_url)(struct _cef_request_t *self); + cef_string_userfree_t(CEF_CALLBACK* get_url)(struct _cef_request_t* self); /// /// Set the fully qualified URL. /// - void(CEF_CALLBACK *set_url)(struct _cef_request_t *self, - const cef_string_t *url); + void(CEF_CALLBACK* set_url)(struct _cef_request_t* self, + const cef_string_t* url); /// /// Get the request function type. The value will default to POST if post data /// is provided and GET otherwise. /// // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK *get_method)(struct _cef_request_t *self); + cef_string_userfree_t(CEF_CALLBACK* get_method)(struct _cef_request_t* self); /// /// Set the request function type. /// - void(CEF_CALLBACK *set_method)(struct _cef_request_t *self, - const cef_string_t *method); + void(CEF_CALLBACK* set_method)(struct _cef_request_t* self, + const cef_string_t* method); /// /// Set the referrer URL and policy. If non-NULL the referrer URL must be /// fully qualified with an HTTP or HTTPS scheme component. Any username, /// password or ref component will be removed. /// - void(CEF_CALLBACK *set_referrer)(struct _cef_request_t *self, - const cef_string_t *referrer_url, + void(CEF_CALLBACK* set_referrer)(struct _cef_request_t* self, + const cef_string_t* referrer_url, cef_referrer_policy_t policy); /// /// Get the referrer URL. /// // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK *get_referrer_url)( - struct _cef_request_t *self); + cef_string_userfree_t(CEF_CALLBACK* get_referrer_url)( + struct _cef_request_t* self); /// /// Get the referrer policy. /// - cef_referrer_policy_t(CEF_CALLBACK *get_referrer_policy)( - struct _cef_request_t *self); + cef_referrer_policy_t(CEF_CALLBACK* get_referrer_policy)( + struct _cef_request_t* self); /// /// Get the post data. /// - struct _cef_post_data_t *(CEF_CALLBACK *get_post_data)( - struct _cef_request_t *self); + struct _cef_post_data_t*(CEF_CALLBACK* get_post_data)( + struct _cef_request_t* self); /// /// Set the post data. /// - void(CEF_CALLBACK *set_post_data)(struct _cef_request_t *self, - struct _cef_post_data_t *postData); + void(CEF_CALLBACK* set_post_data)(struct _cef_request_t* self, + struct _cef_post_data_t* postData); /// /// Get the header values. Will not include the Referer value if any. /// - void(CEF_CALLBACK *get_header_map)(struct _cef_request_t *self, + void(CEF_CALLBACK* get_header_map)(struct _cef_request_t* self, cef_string_multimap_t headerMap); /// /// Set the header values. If a Referer value exists in the header map it will /// be removed and ignored. /// - void(CEF_CALLBACK *set_header_map)(struct _cef_request_t *self, + void(CEF_CALLBACK* set_header_map)(struct _cef_request_t* self, cef_string_multimap_t headerMap); /// @@ -143,8 +143,9 @@ typedef struct _cef_request_t { /// |name| might have multiple values. /// // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK *get_header_by_name)( - struct _cef_request_t *self, const cef_string_t *name); + cef_string_userfree_t(CEF_CALLBACK* get_header_by_name)( + struct _cef_request_t* self, + const cef_string_t* name); /// /// Set the header |name| to |value|. If |overwrite| is true (1) any existing @@ -152,60 +153,61 @@ typedef struct _cef_request_t { /// any existing values will not be overwritten. The Referer value cannot be /// set using this function. /// - void(CEF_CALLBACK *set_header_by_name)(struct _cef_request_t *self, - const cef_string_t *name, - const cef_string_t *value, + void(CEF_CALLBACK* set_header_by_name)(struct _cef_request_t* self, + const cef_string_t* name, + const cef_string_t* value, int overwrite); /// /// Set all values at one time. /// - void(CEF_CALLBACK *set)(struct _cef_request_t *self, const cef_string_t *url, - const cef_string_t *method, - struct _cef_post_data_t *postData, + void(CEF_CALLBACK* set)(struct _cef_request_t* self, + const cef_string_t* url, + const cef_string_t* method, + struct _cef_post_data_t* postData, cef_string_multimap_t headerMap); /// /// Get the flags used in combination with cef_urlrequest_t. See /// cef_urlrequest_flags_t for supported values. /// - int(CEF_CALLBACK *get_flags)(struct _cef_request_t *self); + int(CEF_CALLBACK* get_flags)(struct _cef_request_t* self); /// /// Set the flags used in combination with cef_urlrequest_t. See /// cef_urlrequest_flags_t for supported values. /// - void(CEF_CALLBACK *set_flags)(struct _cef_request_t *self, int flags); + void(CEF_CALLBACK* set_flags)(struct _cef_request_t* self, int flags); /// /// Get the URL to the first party for cookies used in combination with /// cef_urlrequest_t. /// // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK *get_first_party_for_cookies)( - struct _cef_request_t *self); + cef_string_userfree_t(CEF_CALLBACK* get_first_party_for_cookies)( + struct _cef_request_t* self); /// /// Set the URL to the first party for cookies used in combination with /// cef_urlrequest_t. /// - void(CEF_CALLBACK *set_first_party_for_cookies)(struct _cef_request_t *self, - const cef_string_t *url); + void(CEF_CALLBACK* set_first_party_for_cookies)(struct _cef_request_t* self, + const cef_string_t* url); /// /// Get the resource type for this request. Only available in the browser /// process. /// - cef_resource_type_t(CEF_CALLBACK *get_resource_type)( - struct _cef_request_t *self); + cef_resource_type_t(CEF_CALLBACK* get_resource_type)( + struct _cef_request_t* self); /// /// Get the transition type for this request. Only available in the browser /// process and only applies to requests that represent a main frame or sub- /// frame navigation. /// - cef_transition_type_t(CEF_CALLBACK *get_transition_type)( - struct _cef_request_t *self); + cef_transition_type_t(CEF_CALLBACK* get_transition_type)( + struct _cef_request_t* self); /// /// Returns the globally unique identifier for this request or 0 if not @@ -213,35 +215,35 @@ typedef struct _cef_request_t { /// in the browser process to track a single request across multiple /// callbacks. /// - uint64(CEF_CALLBACK *get_identifier)(struct _cef_request_t *self); + uint64(CEF_CALLBACK* get_identifier)(struct _cef_request_t* self); /// /// Returns whether the request was made for the main frame document. Will be /// false (0) for subresources or iframes /// - int(CEF_CALLBACK *is_main_frame)(struct _cef_request_t *self); + int(CEF_CALLBACK* is_main_frame)(struct _cef_request_t* self); /// /// Returns whether the request was redirect. /// - int(CEF_CALLBACK *is_redirect)(struct _cef_request_t *self); + int(CEF_CALLBACK* is_redirect)(struct _cef_request_t* self); /// /// Returns whether the request was triggered by user gesture. /// - int(CEF_CALLBACK *has_user_gesture)(struct _cef_request_t *self); + int(CEF_CALLBACK* has_user_gesture)(struct _cef_request_t* self); /// /// Get the upload stream. /// - struct _cef_post_data_stream_t *(CEF_CALLBACK *get_upload_stream)( - struct _cef_request_t *self); + struct _cef_post_data_stream_t*(CEF_CALLBACK* get_upload_stream)( + struct _cef_request_t* self); } cef_request_t; /// /// Create a new cef_request_t object. /// -CEF_EXPORT cef_request_t *cef_request_create(void); +CEF_EXPORT cef_request_t* cef_request_create(void); /// /// Callback for init the stream. @@ -255,7 +257,7 @@ typedef struct _cef_post_data_stream_init_callback_t { /// /// Callback for init the stream. /// - void(CEF_CALLBACK *cont)(struct _cef_post_data_stream_init_callback_t *self, + void(CEF_CALLBACK* cont)(struct _cef_post_data_stream_init_callback_t* self, int result); } cef_post_data_stream_init_callback_t; @@ -271,8 +273,9 @@ typedef struct _cef_post_data_stream_read_callback_t { /// /// Callback for read from stream. /// - void(CEF_CALLBACK *cont)(struct _cef_post_data_stream_read_callback_t *self, - char *buffer, int bytes_read); + void(CEF_CALLBACK* cont)(struct _cef_post_data_stream_read_callback_t* self, + char* buffer, + int bytes_read); } cef_post_data_stream_read_callback_t; /// @@ -288,64 +291,66 @@ typedef struct _cef_post_data_stream_t { /// /// Set ready callback. /// - void(CEF_CALLBACK *set_read_callback)( - struct _cef_post_data_stream_t *self, - struct _cef_post_data_stream_read_callback_t *read_callback); + void(CEF_CALLBACK* set_read_callback)( + struct _cef_post_data_stream_t* self, + struct _cef_post_data_stream_read_callback_t* read_callback); /// /// Init the stream. /// - void(CEF_CALLBACK *init)( - struct _cef_post_data_stream_t *self, - struct _cef_post_data_stream_init_callback_t *init_callback); + void(CEF_CALLBACK* init)( + struct _cef_post_data_stream_t* self, + struct _cef_post_data_stream_init_callback_t* init_callback); /// /// Read the stream. /// - void(CEF_CALLBACK *read)( - struct _cef_post_data_stream_t *self, void *buffer, int buf_len, - struct _cef_post_data_stream_read_callback_t *read_callback); + void(CEF_CALLBACK* read)( + struct _cef_post_data_stream_t* self, + void* buffer, + int buf_len, + struct _cef_post_data_stream_read_callback_t* read_callback); /// /// Get the size of stream. /// - uint64(CEF_CALLBACK *get_size)(struct _cef_post_data_stream_t *self); + uint64(CEF_CALLBACK* get_size)(struct _cef_post_data_stream_t* self); /// /// Get the position of stream. /// - uint64(CEF_CALLBACK *get_position)(struct _cef_post_data_stream_t *self); + uint64(CEF_CALLBACK* get_position)(struct _cef_post_data_stream_t* self); /// /// Get if the stream is trunked. /// - int(CEF_CALLBACK *is_chunked)(struct _cef_post_data_stream_t *self); + int(CEF_CALLBACK* is_chunked)(struct _cef_post_data_stream_t* self); /// /// Get if the stream is trunked. /// - int(CEF_CALLBACK *has_null_source)(struct _cef_post_data_stream_t *self); + int(CEF_CALLBACK* has_null_source)(struct _cef_post_data_stream_t* self); /// /// Get if the stream is trunked. /// - int(CEF_CALLBACK *is_eof)(struct _cef_post_data_stream_t *self); + int(CEF_CALLBACK* is_eof)(struct _cef_post_data_stream_t* self); /// /// Get if the stream is trunked. /// - int(CEF_CALLBACK *is_in_memory)(struct _cef_post_data_stream_t *self); + int(CEF_CALLBACK* is_in_memory)(struct _cef_post_data_stream_t* self); /// /// reset(); /// - void(CEF_CALLBACK *reset)(struct _cef_post_data_stream_t *self); + void(CEF_CALLBACK* reset)(struct _cef_post_data_stream_t* self); } cef_post_data_stream_t; /// /// Create a new cef_post_data_stream_t object. /// -CEF_EXPORT cef_post_data_stream_t *cef_post_data_stream_create(void); +CEF_EXPORT cef_post_data_stream_t* cef_post_data_stream_create(void); /// /// Structure used to represent post data for a web request. The functions of @@ -360,7 +365,7 @@ typedef struct _cef_post_data_t { /// /// Returns true (1) if this object is read-only. /// - int(CEF_CALLBACK *is_read_only)(struct _cef_post_data_t *self); + int(CEF_CALLBACK* is_read_only)(struct _cef_post_data_t* self); /// /// Returns true (1) if the underlying POST data includes elements that are @@ -368,44 +373,44 @@ typedef struct _cef_post_data_t { /// file upload data). Modifying cef_post_data_t objects with excluded /// elements may result in the request failing. /// - int(CEF_CALLBACK *has_excluded_elements)(struct _cef_post_data_t *self); + int(CEF_CALLBACK* has_excluded_elements)(struct _cef_post_data_t* self); /// /// Returns the number of existing post data elements. /// - size_t(CEF_CALLBACK *get_element_count)(struct _cef_post_data_t *self); + size_t(CEF_CALLBACK* get_element_count)(struct _cef_post_data_t* self); /// /// Retrieve the post data elements. /// - void(CEF_CALLBACK *get_elements)(struct _cef_post_data_t *self, - size_t *elementsCount, - struct _cef_post_data_element_t **elements); + void(CEF_CALLBACK* get_elements)(struct _cef_post_data_t* self, + size_t* elementsCount, + struct _cef_post_data_element_t** elements); /// /// Remove the specified post data element. Returns true (1) if the removal /// succeeds. /// - int(CEF_CALLBACK *remove_element)(struct _cef_post_data_t *self, - struct _cef_post_data_element_t *element); + int(CEF_CALLBACK* remove_element)(struct _cef_post_data_t* self, + struct _cef_post_data_element_t* element); /// /// Add the specified post data element. Returns true (1) if the add /// succeeds. /// - int(CEF_CALLBACK *add_element)(struct _cef_post_data_t *self, - struct _cef_post_data_element_t *element); + int(CEF_CALLBACK* add_element)(struct _cef_post_data_t* self, + struct _cef_post_data_element_t* element); /// /// Remove all existing post data elements. /// - void(CEF_CALLBACK *remove_elements)(struct _cef_post_data_t *self); + void(CEF_CALLBACK* remove_elements)(struct _cef_post_data_t* self); } cef_post_data_t; /// /// Create a new cef_post_data_t object. /// -CEF_EXPORT cef_post_data_t *cef_post_data_create(void); +CEF_EXPORT cef_post_data_t* cef_post_data_create(void); /// /// Structure used to represent a single element in the request post data. The @@ -420,59 +425,61 @@ typedef struct _cef_post_data_element_t { /// /// Returns true (1) if this object is read-only. /// - int(CEF_CALLBACK *is_read_only)(struct _cef_post_data_element_t *self); + int(CEF_CALLBACK* is_read_only)(struct _cef_post_data_element_t* self); /// /// Remove all contents from the post data element. /// - void(CEF_CALLBACK *set_to_empty)(struct _cef_post_data_element_t *self); + void(CEF_CALLBACK* set_to_empty)(struct _cef_post_data_element_t* self); /// /// The post data element will represent a file. /// - void(CEF_CALLBACK *set_to_file)(struct _cef_post_data_element_t *self, - const cef_string_t *fileName); + void(CEF_CALLBACK* set_to_file)(struct _cef_post_data_element_t* self, + const cef_string_t* fileName); /// /// The post data element will represent bytes. The bytes passed in will be /// copied. /// - void(CEF_CALLBACK *set_to_bytes)(struct _cef_post_data_element_t *self, - size_t size, const void *bytes); + void(CEF_CALLBACK* set_to_bytes)(struct _cef_post_data_element_t* self, + size_t size, + const void* bytes); /// /// Return the type of this post data element. /// - cef_postdataelement_type_t(CEF_CALLBACK *get_type)( - struct _cef_post_data_element_t *self); + cef_postdataelement_type_t(CEF_CALLBACK* get_type)( + struct _cef_post_data_element_t* self); /// /// Return the file name. /// // The resulting string must be freed by calling cef_string_userfree_free(). - cef_string_userfree_t(CEF_CALLBACK *get_file)( - struct _cef_post_data_element_t *self); + cef_string_userfree_t(CEF_CALLBACK* get_file)( + struct _cef_post_data_element_t* self); /// /// Return the number of bytes. /// - size_t(CEF_CALLBACK *get_bytes_count)(struct _cef_post_data_element_t *self); + size_t(CEF_CALLBACK* get_bytes_count)(struct _cef_post_data_element_t* self); /// /// Read up to |size| bytes into |bytes| and return the number of bytes /// actually read. /// - size_t(CEF_CALLBACK *get_bytes)(struct _cef_post_data_element_t *self, - size_t size, void *bytes); + size_t(CEF_CALLBACK* get_bytes)(struct _cef_post_data_element_t* self, + size_t size, + void* bytes); } cef_post_data_element_t; /// /// Create a new cef_post_data_element_t object. /// -CEF_EXPORT cef_post_data_element_t *cef_post_data_element_create(void); +CEF_EXPORT cef_post_data_element_t* cef_post_data_element_create(void); #ifdef __cplusplus } #endif -#endif // CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_ +#endif // CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_ diff --git a/include/capi/cef_request_handler_capi.h b/include/capi/cef_request_handler_capi.h index b62892003285d76954d57a9d461296847ddb0024..32c329b9382d7959945294fbf38b69648986e7cf 100644 --- a/include/capi/cef_request_handler_capi.h +++ b/include/capi/cef_request_handler_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=b94100cfe1feea0a2b66e806163f1d5081299d1c$ +// $hash=c28fc87fe1ab76d594610e0171fbced678728165$ // #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_ @@ -272,6 +272,13 @@ typedef struct _cef_request_handler_t { void(CEF_CALLBACK* on_render_process_responding)( struct _cef_request_handler_t* self, struct _cef_browser_t* browser); + + /// + /// Called when mouse hovering the link + /// + void(CEF_CALLBACK* on_update_target_url)(struct _cef_request_handler_t* self, + struct _cef_browser_t* browser, + const cef_string_t* url); } cef_request_handler_t; #ifdef __cplusplus diff --git a/include/capi/cef_web_extension_api_handler_capi.h b/include/capi/cef_web_extension_api_handler_capi.h new file mode 100644 index 0000000000000000000000000000000000000000..621740cd3c4b9fcfbfce3450be1aa93b16bf39b9 --- /dev/null +++ b/include/capi/cef_web_extension_api_handler_capi.h @@ -0,0 +1,73 @@ +// Copyright (c) 2024 Marshall A. Greenblatt. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the name Chromium Embedded +// Framework nor the names of its contributors may be used to endorse +// or promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// --------------------------------------------------------------------------- +// +// This file was generated by the CEF translator tool and should not edited +// by hand. See the translator.README.txt file in the tools directory for +// more information. +// +// $hash=790c9adad66b57add27f42b4ce0bdc6a0115c384$ +// + +#ifndef CEF_INCLUDE_CAPI_CEF_WEB_EXTENSION_API_HANDLER_CAPI_H_ +#define CEF_INCLUDE_CAPI_CEF_WEB_EXTENSION_API_HANDLER_CAPI_H_ +#pragma once + +#include "include/capi/cef_base_capi.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/// +/// Implement this structure to handle webextension's api events. The functions +/// of +/// this class will be called on the UI thread. +/// +typedef struct _cef_web_extension_api_handler_t { + /// + /// Base structure. + /// + cef_base_ref_counted_t base; + + /// + /// Called when chrome.tabs.update. + /// + void(CEF_CALLBACK* on_tab_update_url)( + struct _cef_web_extension_api_handler_t* self, + int tab_id, + const cef_string_t* url); +} cef_web_extension_api_handler_t; + +#ifdef __cplusplus +} +#endif + +#endif // CEF_INCLUDE_CAPI_CEF_WEB_EXTENSION_API_HANDLER_CAPI_H_ diff --git a/include/cef_api_hash.h b/include/cef_api_hash.h index f8c804e1cdf7291b9c8ec24751bdb0989b096307..5032077aae90a7cc50508d616a81389e0c88774d 100644 --- a/include/cef_api_hash.h +++ b/include/cef_api_hash.h @@ -42,15 +42,15 @@ // way that may cause binary incompatibility with other builds. The universal // hash value will change if any platform is affected whereas the platform hash // values will change only if that particular platform is affected. -#define CEF_API_HASH_UNIVERSAL "11519792ccaa661800c47d8f8367dd1024ff78f7" +#define CEF_API_HASH_UNIVERSAL "585acfee166022285a36f4e74e561dc56848f561" #if defined(OS_WIN) -#define CEF_API_HASH_PLATFORM "1ef52c383cd0ece8f2d568a6fcf3a0f9ac33ba77" +#define CEF_API_HASH_PLATFORM "dec49866585b0622ce78c4163effdb325f834ba7" #elif defined(OS_MAC) -#define CEF_API_HASH_PLATFORM "03e8cf4e47fd30ef68b16e56f30710df19fbf008" +#define CEF_API_HASH_PLATFORM "50155c3f7d2c5a93f88b498e32cd9a1d5f719605" #elif defined(OS_LINUX) -#define CEF_API_HASH_PLATFORM "7281878a0dfcc9bd4f87244611538939912aa17b" +#define CEF_API_HASH_PLATFORM "35ff5ba36d1563a6d792e9f5131ae771a42f0793" #elif defined(OS_OHOS) -#define CEF_API_HASH_PLATFORM "7281878a0dfcc9bd4f87244611538939912aa17b" +#define CEF_API_HASH_PLATFORM "35ff5ba36d1563a6d792e9f5131ae771a42f0793" #endif #ifdef __cplusplus diff --git a/include/cef_browser.h b/include/cef_browser.h index 07811b91a43a621f5288e54f135956f256ec7322..4b1e4e50dc4f10e32e30b4b24a0e16862661b7c7 100644 --- a/include/cef_browser.h +++ b/include/cef_browser.h @@ -39,6 +39,9 @@ #pragma once #include +#include +#include + #include "include/cef_base.h" #include "include/cef_devtools_message_observer.h" #include "include/cef_drag_data.h" @@ -117,6 +120,25 @@ class CefWebMessageReceiver : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void OnMessage(CefRefPtr message) = 0; + + /// + /// The same as OnMessage, the result of the execution will be returned. + /// + /*--cef()--*/ + virtual bool OnMessageWithBoolResult(CefRefPtr message) = 0; +}; + +/// +/// CefSetLockCallback. +/// +/*--cef(source=client)--*/ +class CefSetLockCallback : public virtual CefBaseRefCounted { + public: + /// + /// Handle. + /// + /*--cef()--*/ + virtual void Handle(bool key) = 0; }; /// @@ -145,20 +167,6 @@ class CefCacheOptions : public virtual CefBaseRefCounted { /*--cef(default_retval=nullptr)--*/ virtual cef_string_map_t GetResponseHeaders() = 0; }; - -/// -/// CefSetLockCallback -/// -/*--cef(source=client)--*/ -class CefSetLockCallback : public virtual CefBaseRefCounted { - public: - /// - /// Handle. - /// - /*--cef()--*/ - virtual void Handle(bool key) = 0; -}; - /* ---------- ohos webview add end --------- */ #endif // BUILDFLAG(IS_OHOS) @@ -343,13 +351,13 @@ class CefBrowser : public virtual CefBaseRefCounted { /// display the selection control when click Free copy interface /// /*--cef()--*/ - virtual void SelectAndCopy() = 0; + virtual void ShowFreeCopyMenu() = 0; /// /// should show free copy menu /// /*--cef()--*/ - virtual bool ShouldShowFreeCopy() = 0; + virtual bool ShouldShowFreeCopyMenu() = 0; /// /// select password dialog to fill @@ -422,11 +430,22 @@ class CefBrowser : public virtual CefBaseRefCounted { virtual int GetNWebId() = 0; /// - /// Set whether the target_blank pop-up window is opened in the current tab. + /// Get whether Ads block is enabled. /// /*--cef()--*/ - virtual void SetEnableBlankTargetPopupIntercept( - bool enableBlankTargetPopup) = 0; + virtual bool IsAdsBlockEnabled() = 0; + + /// + /// Get whether Ads block is enabled for current page. + /// + /*--cef()--*/ + virtual bool IsAdsBlockEnabledForCurPage() = 0; + + /// + /// Set enable to allow automatically save password + /// + /*--cef()--*/ + virtual void EnableAdsBlock(bool enable) = 0; /// /// Whether automatically saving password had been enabled. @@ -458,12 +477,6 @@ class CefBrowser : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void SetSavePassword(bool enable) = 0; - /// - /// Get security level for current page. - /// - /*--cef()--*/ - virtual int GetSecurityLevel() = 0; - /// /// Enable the ability to check website security risks. /// @@ -477,34 +490,40 @@ class CefBrowser : public virtual CefBaseRefCounted { virtual bool IsSafeBrowsingEnabled() = 0; /// - /// Enable the ability to intelligent tracking prevention, default disabled. + /// Get security level for current page. /// /*--cef()--*/ - virtual void EnableIntelligentTrackingPrevention(bool enable) = 0; + virtual int GetSecurityLevel() = 0; /// - /// Get whether intelligent tracking prevention is enabled. + /// Get the shrink viewport height. /// /*--cef()--*/ - virtual bool IsIntelligentTrackingPreventionEnabled() = 0; + virtual int InsertBackForwardEntry(int index, const CefString& url) = 0; /// - /// Get whether Ads block is enabled. + /// Get the shrink viewport height. /// /*--cef()--*/ - virtual bool IsAdsBlockEnabled() = 0; + virtual int UpdateNavigationEntryUrl(int index, const CefString& url) = 0; /// - /// Get whether Ads block is enabled for current page. + /// Get the shrink viewport height. /// /*--cef()--*/ - virtual bool IsAdsBlockEnabledForCurPage() = 0; + virtual void ClearForwardList() = 0; /// - /// Set enable to allow automatically save password + /// Enable the ability to intelligent tracking prevention, default disabled. /// /*--cef()--*/ - virtual void EnableAdsBlock(bool enable) = 0; + virtual void EnableIntelligentTrackingPrevention(bool enable) = 0; + + /// + /// Get whether intelligent tracking prevention is enabled. + /// + /*--cef()--*/ + virtual bool IsIntelligentTrackingPreventionEnabled() = 0; /// /// Set url trust list. @@ -514,7 +533,19 @@ class CefBrowser : public virtual CefBaseRefCounted { const CefString& urlTrustList, CefString& detailErrMsg) = 0; /// - /// Set url trust list. + /// Set tabId. + /// + /*--cef()--*/ + virtual void SetTabId(int tab_id) = 0; + + /// + /// Get tabId. + /// + /*--cef()--*/ + virtual int GetTabId() = 0; + + /// + /// Set back forward cache options. /// /*--cef()--*/ virtual void SetBackForwardCacheOptions(int32_t size, int32_t timeToLive) = 0; @@ -1316,7 +1347,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted { const std::string& code, CefRefPtr callback, bool extention) = 0; - /// /// Execute a string of JavaScript code, return result by callback /// @@ -1349,13 +1379,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /// GetImageForContextNode /// /*--cef()--*/ - virtual void GetImageForContextNode() = 0; + virtual void GetImageForContextNode(int command_id) = 0; /// /// GetImageFromCache /// /*--cef()--*/ - virtual void GetImageFromCache(const CefString& url) = 0; + virtual void GetImageFromCache(const CefString& url, int command_id) = 0; /// /// ExitFullScreen @@ -1524,7 +1554,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /// Post a message to the port. /// /*--cef()--*/ - virtual void PostPortMessage(CefString& port_handle, + virtual void PostPortMessage(const CefString& port_handle, CefRefPtr message) = 0; /// @@ -1532,7 +1562,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void SetPortMessageCallback( - CefString& port_handle, + const CefString& port_handle, CefRefPtr callback) = 0; /// @@ -1794,6 +1824,14 @@ class CefBrowserHost : public virtual CefBaseRefCounted { virtual void SetOverscrollMode(int mode) = 0; + /// + /// Change the zoom factor for browser zoom. + /// If called on the UI thread the change will be applied immediately. + /// Otherwise, the change will be applied asynchronously on the UI thread. + /// + /*--cef()--*/ + virtual void SetBrowserZoomLevel(double zoomFactor) = 0; + /// /// Discard a webview window /// @@ -1807,24 +1845,34 @@ class CefBrowserHost : public virtual CefBaseRefCounted { virtual bool Restore() = 0; /// - /// Change the zoom factor for browser zoom. - /// If called on the UI thread the change will be applied immediately. - /// Otherwise, the change will be applied asynchronously on the UI thread. + /// Get the top controls offset. /// /*--cef()--*/ - virtual void SetBrowserZoomLevel(double zoomFactor) = 0; + virtual int GetTopControlsOffset() = 0; /// - /// Get the top controls offset. + /// Get the shrink viewport height. /// /*--cef()--*/ - virtual int GetTopControlsOffset() = 0; + virtual int GetShrinkViewportHeight() = 0; /// /// Get the shrink viewport height. /// /*--cef()--*/ - virtual int GetShrinkViewportHeight() = 0; + virtual int InsertBackForwardEntry(int index, const CefString& url) = 0; + + /// + /// Get the shrink viewport height. + /// + /*--cef()--*/ + virtual int UpdateNavigationEntryUrl(int index, const CefString& url) = 0; + + /// + /// Get the shrink viewport height. + /// + /*--cef()--*/ + virtual void ClearForwardList() = 0; /// /// Set background print enable. @@ -1845,7 +1893,13 @@ class CefBrowserHost : public virtual CefBaseRefCounted { virtual void SetScrollable(bool enable, int scrollType) = 0; /// - /// Start current camera. + /// Get the last javascript proxy calling frame url. + /// + /*--cef()--*/ + virtual CefString GetLastJavascriptProxyCallingFrameUrl() = 0; + + /// + /// Start current camera. /// /*--cef()--*/ virtual void StartCamera() = 0; @@ -1862,12 +1916,6 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void CloseCamera() = 0; - /// - /// Get the last javascript proxy calling frame url. - /// - /*--cef()--*/ - virtual CefString GetLastJavascriptProxyCallingFrameUrl() = 0; - /// /// Set NWebID. /// @@ -1881,14 +1929,10 @@ class CefBrowserHost : public virtual CefBaseRefCounted { virtual bool GetPendingSizeStatus() = 0; /// - /// precompile javascript and generate code cache. + /// Get CefDownloadItem by download_item_id. /// /*--cef()--*/ - virtual void PrecompileJavaScript( - const std::string& url, - const std::string& script, - CefRefPtr cacheOptions, - CefRefPtr callback) = 0; + virtual CefRefPtr GetDownloadItem(uint32 item_id) = 0; /// /// SetWakeLockHandler. @@ -1897,38 +1941,32 @@ class CefBrowserHost : public virtual CefBaseRefCounted { virtual void SetWakeLockHandler(int32_t windowId, CefRefPtr callback) = 0; /// - /// Get CefDownloadItem by download_item_id. + /// Notify browser host needs reoload when the render process terminated. /// /*--cef()--*/ - virtual CefRefPtr GetDownloadItem(uint32 item_id) = 0; + virtual void SetNeedsReload(bool needs_reload) = 0; /// - /// Notify browser host needs reload when the render process terminated. - /// - /*--cef()--*/ - virtual void NotifyNeedsReload(bool needs_reload) = 0; - - /// - /// Return true if needs reload page, or false if nees not reload. + /// Return true if needs reload page, or false if needs not reload. /// /*--cef()--*/ virtual bool NeedsReload() = 0; /// - /// Terminate render process + /// precompile javascript and generate code cache. /// /*--cef()--*/ - virtual bool TerminateRenderProcess() = 0; + virtual void PrecompileJavaScript( + const std::string& url, + const std::string& script, + CefRefPtr cacheOptions, + CefRefPtr callback) = 0; /// - /// RegisterNativeJSProxy + /// update DrawRect. /// /*--cef()--*/ - virtual void RegisterNativeJSProxy(const CefString& object_name, - const std::vector& method_list, - const int32_t object_id, - bool is_async, - const CefString& permission) = 0; + virtual void UpdateDrawRect() = 0; /// /// SendTouchpadFlingEvent @@ -1943,10 +1981,20 @@ class CefBrowserHost : public virtual CefBaseRefCounted { virtual void SetFitContentMode(int mode) = 0; /// - /// update draw_rect state. + /// Terminate render process /// /*--cef()--*/ - virtual void UpdateDrawRect() = 0; + virtual bool TerminateRenderProcess() = 0; + + /// + /// RegisterNativeJSProxy + /// + /*--cef()--*/ + virtual void RegisterNativeJSProxy(const CefString& object_name, + const std::vector& method_list, + const int32_t object_id, + bool is_async, + const CefString& permission) = 0; /// /// Called when text is selected. @@ -1975,6 +2023,12 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void AdvanceFocusForIME(int focusType) = 0; + /// + /// Called when image analyzer overlay is destoryed. + /// + /*--cef()--*/ + virtual void OnDestroyImageAnalyzerOverlay() = 0; + #if defined(OHOS_GET_SCROLL_OFFSET) /// /// Get the current scroll offset of the webpage. @@ -2008,23 +2062,34 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void SetGrantFileAccessDirs(const std::vector& dir_list) = 0; +#if defined(OHOS_ARKWEB_EXTENSIONS) /// - /// Set the callback of the autofill event. + /// Receiving the tab updated notification. /// /*--cef()--*/ - virtual void SetAutofillCallback(CefRefPtr callback) = 0; + virtual void WebExtensionTabUpdated( + int tab_id, + const std::vector& changed_property_names, + const CefString& url) = 0; +#endif /// - /// Fill autofill data. + /// ScrollFocusedEditableNodeIntoView. /// /*--cef()--*/ - virtual void FillAutofillData(CefRefPtr message) = 0; + virtual void ScrollFocusedEditableNodeIntoView() = 0; /// - /// ScrollFocusedEditableNodeIntoView. + /// Set the callback of the autofill event. /// /*--cef()--*/ - virtual void ScrollFocusedEditableNodeIntoView() = 0; + virtual void SetAutofillCallback(CefRefPtr callback) = 0; + + /// + /// Fill autofill data. + /// + /*--cef()--*/ + virtual void FillAutofillData(CefRefPtr message) = 0; /// /// Process autofill cancel content. diff --git a/include/cef_client.h b/include/cef_client.h index e6905e71b261ab8275c282003405a6b34d368576..c29044f640a293f18febdac08436ef19f2dada73 100644 --- a/include/cef_client.h +++ b/include/cef_client.h @@ -59,6 +59,7 @@ #include "include/cef_process_message.h" #include "include/cef_render_handler.h" #include "include/cef_request_handler.h" +#include "include/cef_web_extension_api_handler.h" #if BUILDFLAG(IS_OHOS) #include "include/cef_media_handler.h" @@ -316,6 +317,17 @@ class CefClient : public virtual CefBaseRefCounted { CefOwnPtr listener, const CefCustomMediaInfo& media_info) { return nullptr; } #endif // OHOS_CUSTOM_VIDEO_PLAYER + +#if defined(OHOS_ARKWEB_EXTENSIONS) + /// + /// Return the handler for web extension api. If no handler is provided the + /// default implementation will be used. + /// + /*--cef()--*/ + virtual CefRefPtr GetWebExtensionApiHandler() { + return nullptr; + } +#endif }; #endif // CEF_INCLUDE_CEF_CLIENT_H_ diff --git a/include/cef_context_menu_handler.h b/include/cef_context_menu_handler.h index ee1c7aee5de9bcc817bc2a69f9caeb3b9998e9fc..f2e581e9c0df591f74daaa258580986b4529c6dd 100644 --- a/include/cef_context_menu_handler.h +++ b/include/cef_context_menu_handler.h @@ -177,7 +177,7 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted { } /// - /// UpdateClippedSelectionBounds. + /// UpdateClippedSelectionBounds /// /*--cef()--*/ virtual bool UpdateClippedSelectionBounds(CefRefPtr browser, @@ -216,14 +216,14 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void OnGetImageForContextNode(CefRefPtr browser, - CefRefPtr image) {} + CefRefPtr image, int command_id) {} /// /// Called when GetImageFromCache function to get image from /// memory cache. /// /*--cef()--*/ - virtual void OnGetImageFromCache(CefRefPtr image) {} + virtual void OnGetImageFromCache(CefRefPtr image, int command_id) {} /// /// Called when you need to temporarily hide/restore the handle menu. @@ -231,6 +231,14 @@ class CefContextMenuHandler : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void HideHandleAndQuickMenuIfNecessary(bool hide) {} #endif + +#if defined(OHOS_CLIPBOARD) + /// + /// Called when you click on the selected area. + /// + /*--cef()--*/ + virtual void ChangeVisibilityOfQuickMenu() {} +#endif }; /// diff --git a/include/cef_cookie.h b/include/cef_cookie.h index ee6b4d85e10a666a4850b4dd8e9b487d702539d1..5b13e3615e1fc031991779951515f56701fc7467 100644 --- a/include/cef_cookie.h +++ b/include/cef_cookie.h @@ -97,7 +97,8 @@ class CefCookieManager : public virtual CefBaseRefCounted { virtual bool VisitUrlCookies(const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) = 0; + bool is_sync, + bool is_from_ndk) = 0; /// /// Sets a cookie given a valid URL and explicit user-provided cookie @@ -113,7 +114,8 @@ class CefCookieManager : public virtual CefBaseRefCounted { const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) = 0; + const CefString& str_cookie, + bool includeHttpOnly) = 0; /// /// Delete all cookies that match the specified parameters. If both |url| and diff --git a/include/cef_first_meaningful_paint_details.h b/include/cef_first_meaningful_paint_details.h index b92e162f51d0f388b9469bec506e8b90be82631d..b0a11e6aea557ffe2a63e0f68dc6883309d5f73e 100644 --- a/include/cef_first_meaningful_paint_details.h +++ b/include/cef_first_meaningful_paint_details.h @@ -59,4 +59,4 @@ class CefFirstMeaningfulPaintDetails : public virtual CefBaseRefCounted { virtual int64_t GetFirstMeaningfulPaintTime() = 0; }; -#endif //CEF_INCLUDE_CEF_FIRST_MEANINGFUL_PAINT_DETAILS_H +#endif //CEF_INCLUDE_CEF_FIRST_MEANINGFUL_PAINT_DETAILS_H \ No newline at end of file diff --git a/include/cef_keyboard_handler.h b/include/cef_keyboard_handler.h index 33f8ba5bd48905a75e95efee5d20db375bb48a2b..469cdeae014e0b4039cad75837215a0809de18c3 100644 --- a/include/cef_keyboard_handler.h +++ b/include/cef_keyboard_handler.h @@ -75,6 +75,7 @@ class CefKeyboardHandler : public virtual CefBaseRefCounted { CefEventHandle os_event) { return false; } + #if defined(OHOS_INPUT_EVENTS) /// /// This interface is invoked to notify the upper-layer application whether the key is used diff --git a/include/cef_load_handler.h b/include/cef_load_handler.h index 04c55cd7a997912670b62c613d6b497aae62e89d..6bfaa8e44a496d468fc59cf1c4fdfe420e07ece9 100644 --- a/include/cef_load_handler.h +++ b/include/cef_load_handler.h @@ -174,6 +174,12 @@ class CefLoadHandler : public virtual CefBaseRefCounted { virtual void OnFirstContentfulPaint(int64_t navigationStartTick, int64_t firstContentfulPaintMs) {} + /// + /// Called when received website security risk check result. + /// + /*--cef()--*/ + virtual void OnSafeBrowsingCheckResult(int threat_type) {} + /// /// Called when the first meaningful paint rendering of web page. /// @@ -195,13 +201,6 @@ class CefLoadHandler : public virtual CefBaseRefCounted { virtual void OnNavigationEntryCommitted( CefRefPtr details) {} - - /// - /// Called when received website security risk check result. - /// - /*--cef()--*/ - virtual void OnSafeBrowsingCheckResult(int threat_type) {} - /// /// Called when tracker's cookie is prevented. /// @@ -210,6 +209,14 @@ class CefLoadHandler : public virtual CefBaseRefCounted { const CefString& website_host, const CefString& tracker_host) {} +#ifdef OHOS_BFCACHE + /// + /// Called when page load from bfcache. + /// + /*--cef()--*/ + virtual void UpdateFavicon(CefRefPtr browser) {} +#endif // OHOS_BFCACHE + #endif // BUILDFLAG(IS_OHOS) }; diff --git a/include/cef_permission_request.h b/include/cef_permission_request.h index 5f79ee4ca9e50c08405b57173c48bbc8670eb2ef..e44ecd8a77a611259c9764631e7d4857f3d63d34 100644 --- a/include/cef_permission_request.h +++ b/include/cef_permission_request.h @@ -183,6 +183,42 @@ class CefBrowserPermissionRequestDelegate : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void NotifyGeolocationPermission(bool value, const CefString& origin) = 0; + + /// + /// Handle the Audio Capture permission requests. + /// + /*--cef()--*/ + virtual void AskAudioCapturePermission(const CefString& origin, + cef_permission_callback_t callback) = 0; + /// + /// Cancel the Audio Capturepermission requests. + /// + /*--cef()--*/ + virtual void AbortAskAudioCapturePermission(const CefString& origin) = 0; + + /// + /// Handle the Video Capture permission requests. + /// + /*--cef()--*/ + virtual void AskVideoCapturePermission(const CefString& origin, + cef_permission_callback_t callback) = 0; + /// + /// Cancel the Video Capturepermission requests. + /// + /*--cef()--*/ + virtual void AbortAskVideoCapturePermission(const CefString& origin) = 0; + + /// + /// Handle the Clipboard Sanitized permission requests. + /// + /*--cef()--*/ + virtual void AskClipboardSanitizedWritePermission(const CefString& origin, + cef_permission_callback_t callback) = 0; + /// + /// Cancel the Clipboard Read Sanitezed permission requests. + /// + /*--cef()--*/ + virtual void AbortAskClipboardSanitizedWritePermission(const CefString& origin) = 0; }; /// diff --git a/include/cef_render_handler.h b/include/cef_render_handler.h index 9dfd576731c829606ff6f393d79832dc43825632..7285858e27814451252139beb4e7a4ae34fffd7d 100644 --- a/include/cef_render_handler.h +++ b/include/cef_render_handler.h @@ -380,7 +380,7 @@ class CefRenderHandler : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void OnNativeEmbedVisibilityChange(const std::string& embed_id, - bool visibility) {} + bool visibility) {} /// /// Called when select all is clicked. @@ -393,16 +393,7 @@ class CefRenderHandler : public virtual CefBaseRefCounted { /// /*--cef()--*/ virtual void ReleaseResizeHold(CefRefPtr browser) {} - - /// - /// Called when text input state has changed for the specified |browser|. - /// - /*--cef()--*/ - virtual void OnUpdateTextInputStateCalled(CefRefPtr browser, - const CefString& text, - const CefRange& selected_range, - const CefRange& compositon_range) {} - + /// /// Called when selecting word. /// @@ -411,7 +402,7 @@ class CefRenderHandler : public virtual CefBaseRefCounted { const CefString& text, int8_t offset, CefPoint& select) {} - + /// /// Called when creating overlay. /// @@ -421,7 +412,7 @@ class CefRenderHandler : public virtual CefBaseRefCounted { const CefRect& cef_image_rect, const CefPoint& cef_touch_point, const CefRect& cef_screen_rect) {} - + /// /// Called when overlay state is changed. /// @@ -429,6 +420,15 @@ class CefRenderHandler : public virtual CefBaseRefCounted { virtual void OnOverlayStateChanged(CefRefPtr browser, const CefRect& cef_screen_rect) {} + /// + /// Called when text input state has changed for the specified |browser|. + /// + /*--cef()--*/ + virtual void OnUpdateTextInputStateCalled(CefRefPtr browser, + const CefString& text, + const CefRange& selected_range, + const CefRange& compositon_range) {} + /// /// Called to retrieve the visible view rectangle in screen DIP coordinates. This /// method must always provide a non-empty rectangle. @@ -449,6 +449,12 @@ class CefRenderHandler : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void SetFillContent(const std::string& content) {} + /// + /// SetGestureEventResult + /// + /*--cef()--*/ + virtual void SetGestureEventResult(const bool result) {} + /// /// Called when you need to start vibrator. /// diff --git a/include/cef_request_handler.h b/include/cef_request_handler.h index e7bb2cb75f0b570aec9eec4200a85350f23dd445..f94e279e212d603609432a383c64cf6447d5c148 100644 --- a/include/cef_request_handler.h +++ b/include/cef_request_handler.h @@ -286,16 +286,16 @@ class CefRequestHandler : public virtual CefBaseRefCounted { virtual bool OnOpenAppLink(const CefString &url, CefRefPtr callback) { return false; - } + } /// /// Called when render process not responding /// /*--cef()--*/ virtual void OnRenderProcessNotResponding(CefRefPtr browser, - const CefString& referrer, - int pid, - int reason) {} + const CefString& referrer, + int pid, + int reason) {} /// /// Called when render process responding again @@ -303,6 +303,11 @@ class CefRequestHandler : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void OnRenderProcessResponding(CefRefPtr browser) {} + /// + /// Called when mouse hovering the link + /// + /*--cef()--*/ + virtual void OnUpdateTargetURL(CefRefPtr browser, const CefString& url) {} }; #endif // CEF_INCLUDE_CEF_REQUEST_HANDLER_H_ diff --git a/include/cef_resource_request_handler.h b/include/cef_resource_request_handler.h index 01d667815571ae1645a54d727ce3e0b0ef08dfa2..dd97a0ff7ca375d7ead1a2b728cb536f3716f905 100644 --- a/include/cef_resource_request_handler.h +++ b/include/cef_resource_request_handler.h @@ -47,8 +47,23 @@ #include "include/cef_response.h" #include "include/cef_response_filter.h" +#include "include/cef_scheme.h" + class CefCookieAccessFilter; +/// +/// CefInterceptCallback +/// +/*--cef(source=library)--*/ +class CefInterceptCallback : public virtual CefBaseRefCounted { + public: + /// + /// Continue. + /// + /*--cef(capi_name=cont)--*/ + virtual void ContinueLoad(CefRefPtr resource_handler) {} +}; + /// /// Implement this interface to handle events related to browser requests. The /// methods of this class will be called on the IO thread unless otherwise @@ -195,7 +210,7 @@ class CefResourceRequestHandler : public virtual CefBaseRefCounted { /// of the request, and may be NULL for requests originating from service /// workers or CefURLRequest. |request| cannot be modified in this callback. /// Set |allow_os_execution| to true to attempt execution via the registered - /// OS protocol handler, if any. SECURITY WARNING: YOU SHOULD USE THIS METHOD + /// OS protocol handler, if any. SECURITY WARNING: YOU SHOULD USE THIS MET /// TO ENFORCE RESTRICTIONS BASED ON SCHEME, HOST OR OTHER URL ANALYSIS BEFORE /// ALLOWING OS EXECUTION. /// @@ -204,6 +219,18 @@ class CefResourceRequestHandler : public virtual CefBaseRefCounted { CefRefPtr frame, CefRefPtr request, bool& allow_os_execution) {} + + /// + /// GetResourceHandlerByIO. + /// + /*--cef(optional_param=browser,optional_param=frame)--*/ + virtual void GetResourceHandlerByIO( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + CefRefPtr callback, + CefRefPtr scheme_factory, + const CefString& scheme) {} }; /// diff --git a/include/cef_values.h b/include/cef_values.h index 913f361a61a429382c386fdfdeb70bca307269fa..006528ee4a2d7978f43a8ff46ec1bc029998e7a3 100644 --- a/include/cef_values.h +++ b/include/cef_values.h @@ -204,7 +204,6 @@ class CefValue : public virtual CefBaseRefCounted { /*--cef(optional_param=value)--*/ virtual bool SetString(const CefString& value) = 0; virtual bool SetStdString(const std::string& value) = 0; - /// /// Sets the underlying value as type binary. Returns true if the value was /// set successfully. This object keeps a reference to |value| and ownership diff --git a/include/cef_web_extension_api_handler.h b/include/cef_web_extension_api_handler.h new file mode 100644 index 0000000000000000000000000000000000000000..d87223ab52a5f976faeb97659b779442e4edb9f7 --- /dev/null +++ b/include/cef_web_extension_api_handler.h @@ -0,0 +1,58 @@ +// Copyright (c) 2012 Marshall A. Greenblatt. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the name Chromium Embedded +// Framework nor the names of its contributors may be used to endorse +// or promote products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// --------------------------------------------------------------------------- +// +// The contents of this file must follow a specific format in order to +// support the CEF translator tool. See the translator.README.txt file in the +// tools directory for more information. +// + +#ifndef CEF_INCLUDE_CEF_WEB_EXTENSION_API_HANDLER_H_ +#define CEF_INCLUDE_CEF_WEB_EXTENSION_API_HANDLER_H_ +#pragma once + +#include "include/cef_base.h" + +/// +/// Implement this interface to handle webextension's api events. The methods of +/// this class will be called on the UI thread. +/// +/*--cef(source=client)--*/ +class CefWebExtensionApiHandler : public virtual CefBaseRefCounted { + public: + + /// + /// Called when chrome.tabs.update. + /// + /*--cef()--*/ + virtual void OnUpdateTabUrl(int tab_id, const CefString& url) {} +}; + +#endif // CEF_INCLUDE_CEF_WEB_EXTENSION_API_HANDLER_H_ diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index b6ef91895e4dfb40c070387e3cc3a9866dea8c46..ed6df0b96a4619424077a532444ff65a94e54122 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -526,6 +526,11 @@ typedef struct _cef_request_context_settings_t { #if defined(OHOS_INCOGNITO_MODE) bool incognito_mode; #endif + +#if defined(OHOS_ARKWEB_EXTENSIONS) + /// Only used by Extensions's background script initialization during startup. + void* global_request_context; +#endif } cef_request_context_settings_t; /// @@ -697,15 +702,15 @@ typedef struct _cef_browser_settings_t { cef_state_t hide_horizontal_scrollbars; bool contextmenu_customization_enabled; cef_color_t scrollbar_color; - bool blank_target_popup_intercept_enabled; + bool is_safe_browsing_enable; cef_state_t native_embed_mode_enabled; cef_string_t embed_tag; cef_string_t embed_tag_type; bool scroll_enabled; - bool is_safe_browsing_enable; int draw_mode; cef_state_t text_autosizing_enabled; cef_state_t universal_access_from_file_urls; + bool force_zero_layout_height; /* ohos webview end */ #endif // BUILDFLAG(IS_OHOS) @@ -727,17 +732,20 @@ typedef struct _cef_browser_settings_t { bool custom_video_player_enable; bool custom_video_player_overlay; #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_MULTI_WINDOW) + bool supports_multiple_windows; +#endif // OHOS_MULTI_WINDOW #if defined(OHOS_SOFTWARE_COMPOSITOR) bool record_whole_document; #endif -#if defined(OHOS_MULTI_WINDOW) - bool supports_multiple_windows; -#endif // OHOS_MULTI_WINDOW #if defined(OHOS_RENDER_PROCESS_SHARE) cef_string_t shared_render_process_token; #endif +#ifdef OHOS_MEDIA_NETWORK_TRAFFIC_PROMPT + bool enable_media_network_traffic_prompt; +#endif // OHOS_MEDIA_NETWORK_TRAFFIC_PROMPT } cef_browser_settings_t; /// @@ -1863,6 +1871,11 @@ typedef enum { #if BUILDFLAG(IS_OHOS) MENU_ID_IMAGE_COPY = 221, #endif // BUILDFLAG(IS_OHOS) + +#if BUILDFLAG(IS_OHOS) + MENU_ID_IMAGE_SHARE = 222, + MENU_ID_FEED_SHARE = 223, +#endif MENU_ID_CUSTOM_LAST = 250, // All user-defined menu IDs should come between MENU_ID_USER_FIRST and diff --git a/include/internal/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h index 6c990e3875ff8f62be6d0a51d53939e567ccdc79..e6e00102cbc1facb6df4b14f756dd6d00a7aa978 100644 --- a/include/internal/cef_types_wrappers.h +++ b/include/internal/cef_types_wrappers.h @@ -500,6 +500,10 @@ struct CefRequestContextSettingsTraits { #if defined(OHOS_INCOGNITO_MODE) target->incognito_mode = src->incognito_mode; #endif + +#if defined(OHOS_ARKWEB_EXTENSIONS) + target->global_request_context = src->global_request_context; +#endif } }; @@ -605,17 +609,15 @@ struct CefBrowserSettingsTraits { target->contextmenu_customization_enabled = src->contextmenu_customization_enabled; target->scrollbar_color = src->scrollbar_color; - target->blank_target_popup_intercept_enabled = - src->blank_target_popup_intercept_enabled; - target->native_embed_mode_enabled = - src->native_embed_mode_enabled; + target->is_safe_browsing_enable = src->is_safe_browsing_enable; + target->native_embed_mode_enabled = src->native_embed_mode_enabled; cef_string_set(src->embed_tag.str, src->embed_tag.length, &target->embed_tag, copy); cef_string_set(src->embed_tag.str, src->embed_tag.length, &target->embed_tag_type, copy); target->scroll_enabled = src->scroll_enabled; - target->is_safe_browsing_enable = src->is_safe_browsing_enable; target->draw_mode = src->draw_mode; + target->force_zero_layout_height = src->force_zero_layout_height; /* ohos webview end */ #endif // BUILDFLAG(IS_OHOS) @@ -626,15 +628,14 @@ struct CefBrowserSettingsTraits { target->custom_video_player_enable = src->custom_video_player_enable; target->custom_video_player_overlay = src->custom_video_player_overlay; #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_MULTI_WINDOW) + target->supports_multiple_windows = src->supports_multiple_windows; +#endif // OHOS_MULTI_WINDOW #if defined(OHOS_SOFTWARE_COMPOSITOR) target->record_whole_document = src->record_whole_document; #endif -#if defined(OHOS_MULTI_WINDOW) - target->supports_multiple_windows = src->supports_multiple_windows; -#endif // OHOS_MULTI_WINDOW - #ifdef OHOS_NETWORK_LOAD target->universal_access_from_file_urls = src->universal_access_from_file_urls; #endif diff --git a/libcef/browser/alloy/alloy_browser_context.cc b/libcef/browser/alloy/alloy_browser_context.cc index 41eb2b17b3bbea928f031fab7f7034c6bfc47061..7240ae63e06e79e7fd51da66d2cf479aa3fb89ff 100644 --- a/libcef/browser/alloy/alloy_browser_context.cc +++ b/libcef/browser/alloy/alloy_browser_context.cc @@ -72,6 +72,11 @@ #include "extensions/browser/browser_context_keyed_service_factories.h" #endif +#ifdef OHOS_EX_UA +#include "content/public/common/content_switches.h" +#include "ohos_nweb_ex/overrides/cef/libcef/browser/alloy/alloy_browser_ua_config.h" +#endif + using content::BrowserThread; // Creates and manages VisitedLinkEventListener objects for each @@ -210,7 +215,12 @@ void AlloyBrowserContext::Initialize() { #endif extension_system_ = static_cast( extensions::ExtensionSystem::Get(this)); - +#if defined(OHOS_ARKWEB_EXTENSIONS) + if (settings_.global_request_context) { + extension_system_->SetGlobalRequestContext( + static_cast(settings_.global_request_context)); + } +#endif extension_system_->InitForRegularProfile(true); // Make sure the ProcessManager is created so that it receives extension // load notifications. This is necessary for the proper initialization of @@ -241,6 +251,22 @@ void AlloyBrowserContext::Initialize() { ChromePluginServiceFilter::GetInstance()->RegisterProfile(this); media_device_id_salt_ = new MediaDeviceIDSalt(pref_service); + +#ifdef OHOS_EX_UA + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + nweb_ex::AlloyBrowserUAConfig::GetInstance()->Init(pref_service); + std::string path; + uint64_t version = 0; + (void)nweb_ex::AlloyBrowserUAConfig::GetInstance() + ->ReadCloudConfigInfoFromPrefs(path, version); + nweb_ex::AlloyBrowserUAConfig::GetInstance() + ->UpdateCloudUAConfigAfterBrowserContextInit(path, version); + } +#endif +#if defined(OHOS_CLOUD_CONTROL) + OnContextInitialized(); +#endif } void AlloyBrowserContext::Shutdown() { @@ -579,3 +605,17 @@ AlloyBrowserContext::GetExtensionSpecialStoragePolicy() { #endif } #endif + +#if defined(OHOS_CLOUD_CONTROL) +void AlloyBrowserContext::OnWebViewShow() { + ScheduleUpdateCloudControl(this); +} + +void AlloyBrowserContext::OnContextInitialized() { + ScheduleUpdateCloudControl(this); +} +#endif + +#if defined(OHOS_CLOUD_CONTROL) && !defined(OHOS_NWEB_EX) +void AlloyBrowserContext::ScheduleUpdateCloudControl(content::BrowserContext* context) {} +#endif diff --git a/libcef/browser/alloy/alloy_browser_context.h b/libcef/browser/alloy/alloy_browser_context.h index 5ce3aa29597c147acbfe8f0742e87ff9615d928d..882d394e184ed69379b0d4488da5c305c8b2a8cb 100644 --- a/libcef/browser/alloy/alloy_browser_context.h +++ b/libcef/browser/alloy/alloy_browser_context.h @@ -134,9 +134,16 @@ class AlloyBrowserContext : public ChromeProfileAlloy, #if defined(OHOS_ARKWEB_EXTENSIONS) ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override; #endif + +#if defined(OHOS_CLOUD_CONTROL) + void OnWebViewShow(); + void OnContextInitialized(); +#endif private: ~AlloyBrowserContext() override; - +#if defined(OHOS_CLOUD_CONTROL) + void ScheduleUpdateCloudControl(content::BrowserContext* context); +#endif std::unique_ptr pref_service_; std::unique_ptr pref_proxy_config_tracker_; diff --git a/libcef/browser/alloy/alloy_browser_host_impl.cc b/libcef/browser/alloy/alloy_browser_host_impl.cc index 253d15ee63e35fe5ad3919b6608153c36b539512..48d0c9a9a13c6575c678b68463000ca20ecb264c 100644 --- a/libcef/browser/alloy/alloy_browser_host_impl.cc +++ b/libcef/browser/alloy/alloy_browser_host_impl.cc @@ -59,6 +59,8 @@ #include "base/ohos/ltpo/include/dynamic_frame_rate_decision.h" #include "base/ohos/sys_info_utils.h" #include "content/browser/gpu/gpu_process_host.h" +#include "content/public/common/content_switches.h" +#include "libcef/browser/alloy/render_process_state_handler.h" #include "libcef/browser/osr/render_widget_host_view_osr.h" #include "libcef/browser/osr/touch_selection_controller_client_osr.h" #include "libcef/browser/prefs/renderer_prefs.h" @@ -98,6 +100,8 @@ #include "libcef/browser/alloy/alloy_off_the_record_browser_context.h" #endif +#include "libcef/browser/safe_browsing/safe_browsing_tab_helper.h" + #if defined(OHOS_SECURE_JAVASCRIPT_PROXY) #include "libcef/browser/javascript/oh_javascript_injector.h" #endif @@ -713,7 +717,6 @@ void AlloyBrowserHostImpl::ScrollFocusedEditableNodeIntoView() { base::BindOnce(&AlloyBrowserHostImpl::ScrollFocusedEditableNodeIntoView, this)); return; } - if (platform_delegate_) { platform_delegate_->ScrollFocusedEditableNodeIntoView(); } @@ -777,13 +780,13 @@ void AlloyBrowserHostImpl::WasOccluded(bool occluded) { void AlloyBrowserHostImpl::OnWindowShow() { TRACE_EVENT0("base", "AlloyBrowserHostImpl::OnWindowShow"); LOG(DEBUG) << "AlloyBrowserHostImpl::OnWindowShow"; - ReportRenderProcessStatus(false); + RenderProcessStateHandler::GetInstance()->UpdateRenderProcessState(GetRenderProcessId(), nweb_id_, false); } void AlloyBrowserHostImpl::OnWindowHide() { TRACE_EVENT0("base", "AlloyBrowserHostImpl::OnWindowHide"); LOG(DEBUG) << "AlloyBrowserHostImpl::OnWindowHide"; - ReportRenderProcessStatus(true); + RenderProcessStateHandler::GetInstance()->UpdateRenderProcessState(GetRenderProcessId(), nweb_id_, true); SetVisible(false); } @@ -833,35 +836,26 @@ void AlloyBrowserHostImpl::SetVisible(bool visible) } } -void AlloyBrowserHostImpl::ReportRenderProcessStatus(bool is_web_hidden) { - using namespace OHOS::NWeb; - +base::ProcessId AlloyBrowserHostImpl::GetRenderProcessId() { content::WebContents* contents = web_contents(); if (!contents) { - LOG(ERROR) << "AlloyBrowserHostImpl::ReportRenderProcessStatus web_contents is null"; - return; + LOG(ERROR) << "AlloyBrowserHostImpl::GetRenderProcessId web_contents is null"; + return 0; } if (auto render_view_host = contents->GetRenderViewHost()) { auto render_process_host = render_view_host->GetProcess(); if (!render_process_host) { - LOG(ERROR) << "AlloyBrowserHostImpl::ReportRenderProcessStatus render_process_host is null"; - return; + LOG(ERROR) << "AlloyBrowserHostImpl::GetRenderProcessId render_process_host is null"; + return 0; } - - ResSchedStatusAdapter status = is_web_hidden - ? ResSchedStatusAdapter::WEB_INACTIVE - : ResSchedStatusAdapter::WEB_ACTIVE; - base::ProcessId process_id = render_process_host->GetProcess().Pid(); - ResSchedClientAdapter::ReportRenderProcessStatus(status, process_id); - TRACE_EVENT2("base", "ResSchedClientAdapter::ReportRenderProcessStatus", "status", static_cast(status), - "process_id", process_id); - LOG(DEBUG) << "AlloyBrowserHostImpl::ReportRenderProcessStatus is_web_hidden: " << is_web_hidden << " process_id: " << process_id; + return render_process_host->GetProcess().Pid(); } else { - LOG(ERROR) << "AlloyBrowserHostImpl::ReportRenderProcessStatus render_view_host is null"; - return; + LOG(ERROR) << "AlloyBrowserHostImpl::GetRenderProcessId render_view_host is null"; + return 0; } } + void AlloyBrowserHostImpl::SetEnableLowerFrameRate(bool enabled) { LOG(DEBUG) << "SetEnableLowerFrameRate:" << enabled; if (!CEF_CURRENTLY_ON_UIT()) { @@ -1564,6 +1558,21 @@ void AlloyBrowserHostImpl::UpdateTargetURL(content::WebContents* source, contents_delegate_->UpdateTargetURL(source, url); } +#if defined(OHOS_ARKWEB_EXTENSIONS) +void AlloyBrowserHostImpl::WebExtensionUpdateTabUrl( + int32_t tab_id, const GURL& url) { + contents_delegate_->WebExtensionUpdateTabUrl(tab_id, url); +} + +void AlloyBrowserHostImpl::SetTabId(int32_t tab_id) { + tab_id_ = tab_id; +} + +int32_t AlloyBrowserHostImpl::GetTabId() { + return tab_id_; +} +#endif + bool AlloyBrowserHostImpl::DidAddMessageToConsole( content::WebContents* source, blink::mojom::ConsoleMessageLevel level, @@ -1654,7 +1663,6 @@ bool AlloyBrowserHostImpl::WebHandleKeyboardEvent( ContentsZoomChange(zoom_in); return true; } - return false; } #endif @@ -1897,17 +1905,10 @@ void AlloyBrowserHostImpl::ExitPictureInPicture() { } bool AlloyBrowserHostImpl::IsBackForwardCacheSupported() { -#if BUILDFLAG(IS_OHOS) - // Turn this switch on and see if there's anything wrong, - // issue #3237 not reproduced, maybe had been fixed. #ifdef OHOS_BFCACHE if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableBFCache)) -#endif return true; - -#ifdef OHOS_BFCACHE return false; -#endif #else // Disabled due to issue #3237. return false; @@ -1974,6 +1975,7 @@ void AlloyBrowserHostImpl::OnNativeEmbedStatusUpdate( data_info.info.params = native_embed_info.params; platform_delegate_->OnNativeEmbedLifecycleChange(data_info); + } void AlloyBrowserHostImpl::OnLayerRectVisibilityChange(const std::string& embed_id, bool visibility) { @@ -1983,6 +1985,7 @@ void AlloyBrowserHostImpl::OnLayerRectVisibilityChange(const std::string& embed_ platform_delegate_->OnNativeEmbedVisibilityChange(embed_id, visibility); } + #endif // content::WebContentsObserver methods. // ----------------------------------------------------------------------------- @@ -1996,6 +1999,7 @@ void AlloyBrowserHostImpl::DidFinishNavigation( return; } #endif + auto cef_browser_context = static_cast(web_contents()->GetBrowserContext()); if (cef_browser_context) { @@ -2274,6 +2278,7 @@ void AlloyBrowserHostImpl::AddVisitedLinks(const std::vector& urls) { return; } #endif + auto cef_browser_context = static_cast(web_contents()->GetBrowserContext()); if (cef_browser_context) { @@ -2421,6 +2426,7 @@ void AlloyBrowserHostImpl::UpdateBackgroundColor(int color) { } void AlloyBrowserHostImpl::RenderViewReady() { + RenderProcessStateHandler::GetInstance()->InitRenderProcessState(GetRenderProcessId(), nweb_id_); if (!CEF_CURRENTLY_ON_UIT()) { CEF_POST_TASK( CEF_UIT, @@ -2428,7 +2434,6 @@ void AlloyBrowserHostImpl::RenderViewReady() { return; } ReportWindowStatus(true); - ReportRenderProcessStatus(is_hidden_); LOG(DEBUG) << "AlloyBrowserHostImpl::RenderViewReady"; SetVisible(true); #if BUILDFLAG(IS_OHOS) @@ -2485,9 +2490,7 @@ void AlloyBrowserHostImpl::ReportWindowStatus(bool first_view_ready) { void AlloyBrowserHostImpl::UpdateZoomSupportEnabled() { auto rvh = web_contents()->GetRenderViewHost(); - CefRenderWidgetHostViewOSR* view = - static_cast(rvh->GetWidget()->GetView()); - + auto view = rvh->GetWidget()->GetView(); if (view) { view->SetDoubleTapSupportEnabled(settings_.supports_double_tap_zoom); view->SetMultiTouchZoomSupportEnabled(settings_.supports_multi_touch_zoom); @@ -2673,12 +2676,8 @@ void AlloyBrowserHostImpl::SetDrawRect(int x, int y, int width, int height) { } void AlloyBrowserHostImpl::SetDrawMode(int mode) { - if (drawMode_ != mode) { - drawMode_ = mode; - - if (platform_delegate_) - platform_delegate_->SetDrawMode(drawMode_); - } + if (platform_delegate_) + platform_delegate_->SetDrawMode(mode); } void AlloyBrowserHostImpl::SetFitContentMode(int mode) { @@ -2686,10 +2685,6 @@ void AlloyBrowserHostImpl::SetFitContentMode(int mode) { platform_delegate_->SetFitContentMode(mode); } -int AlloyBrowserHostImpl::GetDrawMode() { - return drawMode_; -} - void AlloyBrowserHostImpl::SetShouldFrameSubmissionBeforeDraw(bool should) { if (!CEF_CURRENTLY_ON_UIT()) { CEF_POST_TASK(CEF_UIT, @@ -2766,7 +2761,6 @@ bool AlloyBrowserHostImpl::GetPrintBackground() { } #endif // defined(OHOS_PRINT) - bool AlloyBrowserHostImpl::Discard() { if (!CEF_CURRENTLY_ON_UIT()) { LOG(ERROR) << "AlloyBrowserHostImpl::Discard failed, called on invalid thread"; @@ -2850,6 +2844,20 @@ CefString AlloyBrowserHostImpl::GetLastJavascriptProxyCallingFrameUrl() { } #endif +#ifdef OHOS_RENDER_PROCESS_MODE +void AlloyBrowserHostImpl::SetNeedsReload(bool needs_reload) { + if (is_hidden_ && needs_reload) { + web_contents()->GetController().SetNeedsReload(); + } + LOG(INFO) << "Set needs reload: " << needs_reload; + needs_reload_ = needs_reload; +} + +bool AlloyBrowserHostImpl::NeedsReload() { + return needs_reload_; +} +#endif // OHOS_RENDER_PROCESS_MODE + #if defined(OHOS_CUSTOM_VIDEO_PLAYER) std::unique_ptr AlloyBrowserHostImpl::CreateCustomMediaPlayer( @@ -2903,17 +2911,41 @@ AlloyBrowserHostImpl::CreateCustomMediaPlayer( } #endif // OHOS_CUSTOM_VIDEO_PLAYER -#ifdef OHOS_RENDER_PROCESS_MODE -void AlloyBrowserHostImpl::NotifyNeedsReload(bool needs_reload) { - if (is_hidden_ && needs_reload) { - web_contents()->GetController().SetNeedsReload(); +#if defined(OHOS_RENDERER_ANR_DUMP) +void AlloyBrowserHostImpl::RendererUnresponsive( + content::WebContents* source, + content::RenderWidgetHost* render_widget_host, + base::RepeatingClosure hang_monitor_restarter, + content::RenderProcessNotRespondingReason reason + +) { + content::RenderProcessHost* host = + source->GetPrimaryMainFrame()->GetProcess(); + if (!host->IsReady() || !source->GetPrimaryMainFrame()->IsRenderFrameLive()) { + OnDumpJavaScriptStackCallback(host->GetProcess().Pid(), reason, ""); + return; } - LOG(INFO) << "NotifyNeedsReload set needs reload: " << needs_reload; - needs_reload_ = needs_reload; + host->dumpCurrentJavaScriptStackInMainThread( + base::BindOnce(&AlloyBrowserHostImpl::OnDumpJavaScriptStackCallback, this, + host->GetProcess().Pid(), reason)); } -bool AlloyBrowserHostImpl::NeedsReload() { - return needs_reload_; +void AlloyBrowserHostImpl::OnDumpJavaScriptStackCallback( + int pid, + content::RenderProcessNotRespondingReason reason, + const std::string& stack) { + if (auto handler = client_->GetRequestHandler()) { + handler->OnRenderProcessNotResponding(this, stack, pid, + static_cast(reason)); + } +} + +void AlloyBrowserHostImpl::RendererResponsive( + content::WebContents* source, + content::RenderWidgetHost* render_widget_host) { + if (auto handler = client_->GetRequestHandler()) { + handler->OnRenderProcessResponding(this); + } } #endif @@ -2933,6 +2965,12 @@ void AlloyBrowserHostImpl::OnTextSelected(bool flag) { } } +void AlloyBrowserHostImpl::OnDestroyImageAnalyzerOverlay() { + if (platform_delegate_) { + platform_delegate_->OnDestroyImageAnalyzerOverlay(); + } +} + float AlloyBrowserHostImpl::GetPageScaleFactor() { if (platform_delegate_) { return platform_delegate_->GetPageScaleFactor(); diff --git a/libcef/browser/alloy/alloy_browser_host_impl.h b/libcef/browser/alloy/alloy_browser_host_impl.h index 5bc03f5fbd31b7e59f94604ec6585efc087b8e46..97ebc248823c76a6d0a45df97e445818cbb13ca4 100644 --- a/libcef/browser/alloy/alloy_browser_host_impl.h +++ b/libcef/browser/alloy/alloy_browser_host_impl.h @@ -251,8 +251,20 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase, #endif #ifdef OHOS_RENDER_PROCESS_MODE -void NotifyNeedsReload(bool needs_reload) override; -bool NeedsReload() override; + void SetNeedsReload(bool needs_reload) override; + bool NeedsReload() override; +#endif + +#if defined(OHOS_RENDERER_ANR_DUMP) + void RendererUnresponsive( + content::WebContents* source, + content::RenderWidgetHost* render_widget_host, + base::RepeatingClosure hang_monitor_restarter, + content::RenderProcessNotRespondingReason reason) override; + + void RendererResponsive( + content::WebContents* source, + content::RenderWidgetHost* render_widget_host) override; #endif enum DestructionState { @@ -403,7 +415,6 @@ bool NeedsReload() override; void SetBackgroundColor(int color) override; SkColor GetBackgroundColor() const; void GetZoomLevelCallback(); - int GetDrawMode(); void SetTouchInsertHandleMenuShow(bool show) { web_contents()->SetTouchInsertHandleMenuShow(show); @@ -437,6 +448,12 @@ bool NeedsReload() override; bool is_site_first_report) override; #endif +#if defined(OHOS_ARKWEB_EXTENSIONS) + void WebExtensionUpdateTabUrl(int32_t tab_id, const GURL& url) override; + void SetTabId(int32_t tab_id) override; + int32_t GetTabId() override; +#endif + #if defined(OHOS_EX_PASSWORD) void ShowPasswordDialog(bool is_update, const std::string& url) override; #endif @@ -472,6 +489,7 @@ bool NeedsReload() override; const gfx::Point& touch_point, const gfx::Rect& screen_rect); void OnTextSelected(bool flag) override; + void OnDestroyImageAnalyzerOverlay() override; float GetPageScaleFactor() override; #endif @@ -513,7 +531,7 @@ bool NeedsReload() override; void UpdateZoomSupportEnabled(); void ReportWindowStatus(bool first_view_ready); void InactiveUnloadOldProcess(base::ProcessId pid); - void ReportRenderProcessStatus(bool is_web_hidden); + base::ProcessId GetRenderProcessId(); void UpdateVSyncFrequency(); void ResetVSyncFrequency(); void SetVisible(bool visible); @@ -535,9 +553,10 @@ bool NeedsReload() override; void SetFitContentMode(int mode) override; #endif // defined(OHOS_COMPOSITE_RENDER) #if defined(OHOS_RENDERER_ANR_DUMP) - void OnDumpJavaScriptStackCallback(int pid, - content::RenderProcessNotRespondingReason reason, - const std::string& stack); + void OnDumpJavaScriptStackCallback( + int pid, + content::RenderProcessNotRespondingReason reason, + const std::string& stack); #endif CefWindowHandle opener_; @@ -578,19 +597,23 @@ bool NeedsReload() override; int window_id_ = -1; int nweb_id_ = -1; base::ProcessId last_pid_ = -1; + + int video_stream_cnt_ = 0; bool has_video_playing_ = false; bool has_touch_event_ = false; bool set_lower_frame_rate_ = false; static constexpr int WAIT_TOUCH_EVENT_DELAY_TIME = 3000/*ms*/; - int video_stream_cnt_ = 0; +#endif - int drawMode_ = 0; +#if defined(OHOS_ARKWEB_EXTENSIONS) + int tab_id_ = -1; #endif bool start_play_ = false; #ifdef OHOS_RENDER_PROCESS_MODE bool needs_reload_ = false; #endif + }; #endif // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_HOST_IMPL_H_ diff --git a/libcef/browser/alloy/alloy_content_browser_client.cc b/libcef/browser/alloy/alloy_content_browser_client.cc index 2cb276c44b0b4f9aaf7a5920ea14d38852210edd..0fdfded106691115068993f20d120397e391f938 100644 --- a/libcef/browser/alloy/alloy_content_browser_client.cc +++ b/libcef/browser/alloy/alloy_content_browser_client.cc @@ -218,7 +218,7 @@ constexpr int32_t APPLICATION_API_10 = 10; #endif #if OHOS_URL_TRUST_LIST -#include "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.h" +#include "libcef/browser/safe_browsing/url_trust_list_navigation_throttle.h" #endif #if defined(OHOS_EX_PASSWORD) || defined(OHOS_PASSWORD_AUTOFILL) @@ -250,9 +250,11 @@ constexpr int32_t APPLICATION_API_10 = 10; #include "components/embedder_support/content_settings_utils.h" #include "content/public/browser/allow_service_worker_result.h" #include "content/public/browser/site_isolation_policy.h" +#include "extensions/browser/api/messaging/messaging_api_message_filter.h" #include "extensions/browser/api/web_request/web_request_api.h" #include "extensions/browser/api/web_request/web_request_proxying_webtransport.h" #include "extensions/browser/extension_navigation_throttle.h" +#include "extensions/browser/extension_service_worker_message_filter.h" #include "extensions/browser/extension_util.h" #include "extensions/browser/service_worker/service_worker_host.h" #include "services/network/public/cpp/self_deleting_url_loader_factory.h" @@ -273,6 +275,12 @@ using extensions::mojom::APIPermissionID; #include "components/security_interstitials/content/security_interstitial_tab_helper.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#include "chrome/browser/content_settings/page_specific_content_settings_delegate.h" +#include "components/content_settings/browser/page_specific_content_settings.h" +#endif + #if defined(OHOS_CRASHPAD) #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -289,6 +297,12 @@ using extensions::mojom::APIPermissionID; #if defined(OHOS_SITE_ISOLATION) bool g_siteIsolationMode = false; #endif + +#ifdef OHOS_ARKWEB_ADBLOCK +#include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h" +#include "libcef/browser/subresource_filter/adblock_content_subresource_filter_web_contents_helper_factory.h" +#endif // OHOS_ARKWEB_ADBLOCK + namespace { #if BUILDFLAG(IS_OHOS) void TransferVector(const std::vector& source, @@ -990,6 +1004,11 @@ void AlloyContentBrowserClient::RenderProcessWillLaunch( if (extensions::ExtensionsEnabled()) { host->AddFilter(new extensions::ExtensionMessageFilter(id, profile)); +#if defined(OHOS_ARKWEB_EXTENSIONS) + host->AddFilter(new extensions::ExtensionServiceWorkerMessageFilter( + id, profile, host->GetStoragePartition()->GetServiceWorkerContext())); + host->AddFilter(new extensions::MessagingAPIMessageFilter(id, profile)); +#endif } // If the renderer process crashes then the host may already have @@ -1002,6 +1021,18 @@ void AlloyContentBrowserClient::RenderProcessWillLaunch( Profile* original_profile = profile->GetOriginalProfile(); RendererUpdaterFactory::GetForProfile(original_profile) ->InitializeRenderer(host); + +#if defined(OHOS_EX_EXCEPTION_LIST) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + auto renderer_configuration = GetRendererConfiguration(host); + RendererContentSettingRules rules; + content_settings::GetRendererContentSettingRules( + HostContentSettingsMapFactory::GetForProfile(host->GetBrowserContext()), + &rules); + renderer_configuration->SetContentSettingRules(rules); + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) } bool AlloyContentBrowserClient::ShouldUseProcessPerSite( @@ -1162,35 +1193,7 @@ void AlloyContentBrowserClient::SiteInstanceGotProcess( } extensions::ProcessMap::Get(context)->Insert( - extension->id(), site_instance->GetProcess()->GetID(), - site_instance->GetId()); -} - -void AlloyContentBrowserClient::SiteInstanceDeleting( - content::SiteInstance* site_instance) { - if (!extensions::ExtensionsEnabled()) { - return; - } - - if (!site_instance->HasProcess()) { - return; - } - - auto context = site_instance->GetBrowserContext(); - auto registry = extensions::ExtensionRegistry::Get(context); - if (!registry) { - return; - } - - auto extension = registry->enabled_extensions().GetExtensionOrAppByURL( - site_instance->GetSiteURL()); - if (!extension) { - return; - } - - extensions::ProcessMap::Get(context)->Remove( - extension->id(), site_instance->GetProcess()->GetID(), - site_instance->GetId()); + extension->id(), site_instance->GetProcess()->GetID()); } void AlloyContentBrowserClient::BindHostReceiverForRenderer( @@ -1627,11 +1630,6 @@ void AlloyContentBrowserClient::OverrideWebkitPrefs( prefs->force_enable_zoom = web_contents->GetForceEnableZoom(); #endif -#if BUILDFLAG(IS_OHOS) && defined(OHOS_EX_BLANK_TARGET_POPUP_INTERCEPT) - prefs->blank_target_popup_intercept_enabled = - web_contents->GetEnableBlankTargetPopupIntercept(); -#endif - web_contents->SetPageBaseBackgroundColor(base_background_color); } @@ -1810,7 +1808,7 @@ AlloyContentBrowserClient::CreateThrottlesForNavigation( #endif #if OHOS_URL_TRUST_LIST - throttles.push_back(ohos_safe_browsing::OhosUrlTrustListNavigationThrottle::Create( + throttles.push_back(ohos_safe_browsing::UrlTrustListNavigationThrottle::Create( navigation_handle)); #endif @@ -1905,7 +1903,8 @@ AlloyContentBrowserClient::CreateURLLoaderThrottles( } if (!is_same_host) { - result.push_back(std::make_unique(frame_tree_node_id)); + result.push_back(std::make_unique(frame_tree_node_id, + (request.transition_type & ui::PAGE_TRANSITION_CLIENT_REDIRECT) != 0)); } } #endif @@ -2629,6 +2628,10 @@ void AlloyContentBrowserClient::OnNetworkServiceCreated( DCHECK(SystemNetworkContextManager::GetInstance()); SystemNetworkContextManager::GetInstance()->OnNetworkServiceCreated( network_service); +#ifdef OHOS_EX_NETWORK_CONNECTION + network_service->BindDnsToNetwork(net_service::NetHelpers::network); + net::NetworkChangeNotifier::BindToNetwork(net_service::NetHelpers::network); +#endif #if defined(OHOS_HTTP_DNS) if (net_service::NetHelpers::HasValidDnsOverHttpConfig()) { @@ -2756,9 +2759,9 @@ bool AlloyContentBrowserClient::ConfigureNetworkContextParams( // In order to make better use of cache, we use the same strategy as // chromium for httpcache. // Determined by DiskCache itself. - network_context_params->http_cache_max_size = 0; + network_context_params->http_cache_max_size = 0; } else { - network_context_params->http_cache_max_size = 20 * 1024 * 1024; + network_context_params->http_cache_max_size = 100 * 1024 * 1024; } } #endif // defined(OHOS_CACHE) @@ -3026,6 +3029,12 @@ void AlloyContentBrowserClient::OnWebContentsCreated( #ifdef OHOS_FCP cef::InitializePageLoadMetricsForWebContents(web_contents); #endif + +#if defined(OHOS_EX_EXCEPTION_LIST) + content_settings::PageSpecificContentSettings::CreateForWebContents( + web_contents, + std::make_unique(web_contents)); +#endif // defined(OHOS_EX_EXCEPTION_LIST) } bool AlloyContentBrowserClient::IsFindInPageDisabledForOrigin( @@ -3084,6 +3093,17 @@ bool AlloyContentBrowserClient::ShouldAllowInsecureLocalNetworkRequests( return content_settings::ShouldAllowInsecureLocalNetworkRequests( HostContentSettingsMapFactory::GetForProfile(browser_context), origin); } + +bool AlloyContentBrowserClient::ShouldDisableOriginAgentClusterDefault( + content::BrowserContext* browser_context) { + // The enterprise policy for kOriginAgentClusterDefaultEnabled defaults to + // true to defer to Chromium's decision. If it is set to false, it should + // override Chromium's decision and use site-keyed agent clusters by default + // instead. + return !Profile::FromBrowserContext(browser_context) + ->GetPrefs() + ->GetBoolean(prefs::kOriginAgentClusterDefaultEnabled); +} #endif #if BUILDFLAG(IS_OHOS) @@ -3167,6 +3187,21 @@ bool AlloyContentBrowserClient::WillCreateRestrictedCookieManager( #endif +#if defined(OHOS_EX_EXCEPTION_LIST) +mojo::AssociatedRemote +AlloyContentBrowserClient::GetRendererConfiguration( + content::RenderProcessHost* render_process_host) { + IPC::ChannelProxy* channel = render_process_host->GetChannel(); + if (!channel) + return mojo::AssociatedRemote(); + + mojo::AssociatedRemote + renderer_configuration; + channel->GetRemoteAssociatedInterface(&renderer_configuration); + return renderer_configuration; +} +#endif // defined(OHOS_EX_EXCEPTION_LIST) + #if BUILDFLAG(IS_OHOS) bool AlloyContentBrowserClient::ShouldOverrideUrlLoading( int frame_tree_node_id, diff --git a/libcef/browser/alloy/alloy_content_browser_client.h b/libcef/browser/alloy/alloy_content_browser_client.h index b5810cea4adb2b17b366f7f2c9f03de816726b8b..341f7eaf4ff3c1baadd2207f0c51bbafc64dbb2f 100644 --- a/libcef/browser/alloy/alloy_content_browser_client.h +++ b/libcef/browser/alloy/alloy_content_browser_client.h @@ -20,6 +20,11 @@ #include "libcef/browser/net_service/proxy_config_monitor.h" #endif +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "chrome/common/renderer_configuration.mojom.h" +#include "mojo/public/cpp/bindings/associated_remote.h" +#endif + class AlloyBrowserMainParts; class CefDevToolsDelegate; @@ -68,7 +73,6 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient { bool IsWebUIAllowedToMakeNetworkRequests(const url::Origin& origin) override; bool IsHandledURL(const GURL& url) override; void SiteInstanceGotProcess(content::SiteInstance* site_instance) override; - void SiteInstanceDeleting(content::SiteInstance* site_instance) override; void BindHostReceiverForRenderer( content::RenderProcessHost* render_process_host, mojo::GenericPendingReceiver receiver) override; @@ -275,6 +279,8 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient { bool ShouldAllowInsecureLocalNetworkRequests( content::BrowserContext* browser_context, const url::Origin& origin) override; + bool ShouldDisableOriginAgentClusterDefault( + content::BrowserContext* browser_context) override; #endif #if BUILDFLAG(IS_OHOS) @@ -418,6 +424,11 @@ CefRefPtr off_the_record_request_context() const; #endif AlloyBrowserMainParts* browser_main_parts_ = nullptr; + +#if defined(OHOS_EX_EXCEPTION_LIST) + mojo::AssociatedRemote + GetRendererConfiguration(content::RenderProcessHost* render_process_host); +#endif // defined(OHOS_EX_EXCEPTION_LIST) }; #endif // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_CONTENT_BROWSER_CLIENT_H_ diff --git a/libcef/browser/alloy/alloy_off_the_record_browser_context.cc b/libcef/browser/alloy/alloy_off_the_record_browser_context.cc index c5338e49597c74f8b32bb55d120cbd9a9248ce88..a6736677c77d61ec49da8c92ee8cde65965c050f 100644 --- a/libcef/browser/alloy/alloy_off_the_record_browser_context.cc +++ b/libcef/browser/alloy/alloy_off_the_record_browser_context.cc @@ -103,6 +103,9 @@ void AlloyOffTheRecordBrowserContext::StoreOrTriggerInitCallback( void AlloyOffTheRecordBrowserContext::Initialize() { CefBrowserContext::Initialize(); + LOG(INFO) << "OffTheRecordBrowserContext Initialize cache_path_ is empty:" + << cache_path_.empty(); + Profile* original_profile = AsProfile()->GetOriginalProfile(); DCHECK(original_profile); key_ = std::make_unique(cache_path_, @@ -171,6 +174,7 @@ void AlloyOffTheRecordBrowserContext::Initialize() { DCHECK(pref_service); user_prefs::UserPrefs::Set(this, pref_service); key_->SetPrefs(pref_service); + media_device_id_salt_ = new MediaDeviceIDSalt(pref_service); TrackZoomLevelsFromParent(); @@ -243,6 +247,7 @@ CefRefPtr AlloyOffTheRecordBrowserContext::GetExtension( } bool AlloyOffTheRecordBrowserContext::UnloadExtension(const CefString& extension_id) { + DCHECK(extensions::ExtensionsEnabled()); return true; } diff --git a/libcef/browser/alloy/browser_platform_delegate_alloy.cc b/libcef/browser/alloy/browser_platform_delegate_alloy.cc index ede6319b7dbcbdfa8a3e7209dda10a6820e87e0f..ab0de2a228d78eb9a2130efb5ba6bdb07b8ad677 100644 --- a/libcef/browser/alloy/browser_platform_delegate_alloy.cc +++ b/libcef/browser/alloy/browser_platform_delegate_alloy.cc @@ -245,12 +245,12 @@ void CefBrowserPlatformDelegateAlloy::BrowserCreated( } #if defined(OHOS_DATALIST) - autofill::OhAutofillClient::CreateForWebContents(web_contents_, true); + autofill::OhAutofillClient::CreateForWebContents(web_contents_, false); #endif #if defined(OHOS_EX_PASSWORD) || defined(OHOS_DATALIST) || defined(OHOS_PASSWORD_AUTOFILL) // need use components/autofill/core/browser/ module impl save password - autofill::OhAutofillClient::CreateForWebContents(web_contents_, true); + autofill::OhAutofillClient::CreateForWebContents(web_contents_, false); OhPasswordManagerClient::CreateForWebContentsWithAutofillClient( web_contents_, autofill::OhAutofillClient::FromWebContents(web_contents_)); diff --git a/libcef/browser/alloy/chrome_browser_process_alloy.cc b/libcef/browser/alloy/chrome_browser_process_alloy.cc index a7cd7af3696f36ff52bd5e0fafb9852c16ddd102..d744e75caf4eaa781989379aef48183c4af746a6 100644 --- a/libcef/browser/alloy/chrome_browser_process_alloy.cc +++ b/libcef/browser/alloy/chrome_browser_process_alloy.cc @@ -56,7 +56,7 @@ ChromeBrowserProcessAlloy::ChromeBrowserProcessAlloy() ChromeBrowserProcessAlloy::~ChromeBrowserProcessAlloy() { DCHECK((!initialized_ && !context_initialized_) || shutdown_); - + LOG(INFO) << "ChromeBrowserProcessAlloy::~ChromeBrowserProcessAlloy"; if (extensions::ExtensionsEnabled()) { extensions::ExtensionsBrowserClient::Set(nullptr); extensions_browser_client_.reset(); @@ -212,7 +212,6 @@ PrefService* ChromeBrowserProcessAlloy::local_state() { if (!base::PathExists(root_cache_path)) { if (!base::CreateDirectory(root_cache_path)) { LOG(ERROR) << "Create directory failed:" << root_cache_path.value(); - return nullptr; } } } diff --git a/libcef/browser/alloy/chrome_off_the_record_profile_alloy.cc b/libcef/browser/alloy/chrome_off_the_record_profile_alloy.cc index b19fb12c6c3a19f3337782b38a5205b94e85828d..3f2c65cb726fc7b64ae0db3f62e3b8a5918977c9 100644 --- a/libcef/browser/alloy/chrome_off_the_record_profile_alloy.cc +++ b/libcef/browser/alloy/chrome_off_the_record_profile_alloy.cc @@ -12,7 +12,6 @@ #include "net/url_request/url_request_context.h" #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" #include "components/zoom/zoom_event_manager.h" - namespace { class CefVariationsClient : public variations::VariationsClient { @@ -187,9 +186,10 @@ void ChromeOffTheRecordProfileAlloy::TrackZoomLevelsFromParent() { // Also track changes to the parent profile's default zoom level. parent_default_zoom_level_subscription_ = original_profile_->GetZoomLevelPrefs() - ->RegisterDefaultZoomLevelCallback(base::BindRepeating( - &ChromeOffTheRecordProfileAlloy::UpdateDefaultZoomLevel, - base::Unretained(this))); + ->RegisterDefaultZoomLevelCallback( + base::BindRepeating( + &ChromeOffTheRecordProfileAlloy::UpdateDefaultZoomLevel, + base::Unretained(this))); } void ChromeOffTheRecordProfileAlloy::OnParentZoomLevelChanged( @@ -211,7 +211,7 @@ void ChromeOffTheRecordProfileAlloy::OnParentZoomLevelChanged( void ChromeOffTheRecordProfileAlloy::UpdateDefaultZoomLevel() { if (!original_profile_->GetZoomLevelPrefs()) { - return; + return; } content::HostZoomMap* host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(this); diff --git a/libcef/browser/alloy/render_process_state_handler.cc b/libcef/browser/alloy/render_process_state_handler.cc new file mode 100644 index 0000000000000000000000000000000000000000..999c6fd4281e04157abe48ab1e08bd4b953c9392 --- /dev/null +++ b/libcef/browser/alloy/render_process_state_handler.cc @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "cef/libcef/browser/alloy/render_process_state_handler.h" +#include "base/logging.h" +#include "base/trace_event/trace_event.h" +#include "res_sched_client_adapter.h" + +RenderProcessStateHandler* RenderProcessStateHandler::instance = nullptr; + +RenderProcessStateHandler::RenderProcessStateHandler() {} + +RenderProcessStateHandler* RenderProcessStateHandler::GetInstance() { + if (instance == nullptr) { + instance = new RenderProcessStateHandler(); + } + return instance; +} + +RenderProcessStateHandler::~RenderProcessStateHandler() { + instance = nullptr; +} + +void RenderProcessStateHandler::UpdateRenderProcessState( + uint32_t render_process_id, + int nweb_id, + bool is_to_background) { + using namespace OHOS::NWeb; + if (render_process_id == 0) { + LOG(DEBUG) << "RenderProcessStateHandler::UpdateRenderProcessState: render " + "process has not init, nweb_id: " + << nweb_id << " is_to_background: " << is_to_background; + WebComponentState initial_web_component = {nweb_id, is_to_background}; + initial_web_component_list_.push_back(initial_web_component); + return; + } + + LOG(DEBUG) + << "RenderProcessStateHandler::UpdateRenderProcessState: render_id:" + << render_process_id << " nweb_id: " << nweb_id + << " is_to_background: " << is_to_background; + bool report_background_state = is_to_background; + bool is_render_init = true; + for (RenderProcessStateMap& item : render_process_map_list_) { + LOG(DEBUG) + << "RenderProcessStateHandler::UpdateRenderProcessState: for_render_id:" + << item.render_process_id; + if (item.render_process_id != render_process_id) { + continue; + } + is_render_init = false; + + bool is_web_init = true; + for (WebComponentState& web_component_state : item.web_component_list) { + LOG(DEBUG) << "RenderProcessStateHandler::UpdateRenderProcessState: " + "item.nweb_id: " + << web_component_state.nweb_id + << " state: " << web_component_state.state; + if (web_component_state.nweb_id != nweb_id) { + if (report_background_state && !web_component_state.state) { + report_background_state = false; + } + continue; + } + is_web_init = false; + web_component_state.state = is_to_background; + } + + if (is_web_init) { + LOG(DEBUG) << "RenderProcessStateHandler::UpdateRenderProcessState: add " + "new web: " + << nweb_id << " state: " << is_to_background; + + WebComponentState new_web_component = {nweb_id, is_to_background}; + item.web_component_list.push_back(new_web_component); + } + } + + if (is_render_init) { + LOG(DEBUG) << "RenderProcessStateHandler::UpdateRenderProcessState: add " + "new render: " + << render_process_id << " nweb_id: " << nweb_id + << " state: " << is_to_background; + WebComponentState new_web_component = {nweb_id, is_to_background}; + std::vector web_component_list; + web_component_list.push_back(new_web_component); + RenderProcessStateMap new_render_process_state_map = {render_process_id, web_component_list}; + render_process_map_list_.push_back(new_render_process_state_map); + } + + LOG(INFO) << "RenderProcessStateHandler::UpdateRenderProcessState: " + "ReportRenderProcessStatus render_id: " + << render_process_id + << " report_background_state: " << report_background_state; + ResSchedStatusAdapter status = report_background_state + ? ResSchedStatusAdapter::WEB_INACTIVE + : ResSchedStatusAdapter::WEB_ACTIVE; + ResSchedClientAdapter::ReportRenderProcessStatus(status, render_process_id); + TRACE_EVENT2("base", "ResSchedClientAdapter::ReportRenderProcessStatus", + "render_process_id", render_process_id, "status", + static_cast(status)); +} + +void RenderProcessStateHandler::InitRenderProcessState( + uint32_t render_process_id, + int nweb_id) { + LOG(DEBUG) << "RenderProcessStateHandler::InitRenderProcessState: render_id: " + << render_process_id << " nweb_id: " << nweb_id; + if (initial_web_component_list_.size() == 0) { + LOG(DEBUG) << "RenderProcessStateHandler::InitRenderProcessState: No task"; + return; + } + + for (auto item = initial_web_component_list_.begin(); + item != initial_web_component_list_.end(); ++item) { + if (item->nweb_id == nweb_id) { + UpdateRenderProcessState(render_process_id, nweb_id, item->state); + item = initial_web_component_list_.erase(item); + LOG(DEBUG) << "RenderProcessStateHandler::InitRenderProcessState: size: " + << initial_web_component_list_.size(); + return; + } + } +} \ No newline at end of file diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h b/libcef/browser/alloy/render_process_state_handler.h similarity index 33% rename from libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h rename to libcef/browser/alloy/render_process_state_handler.h index 597f9e517b3b5d8684f33316844419d6ea5dce8b..239986a5a484c90f91d907a5a0dc1845b2afb583 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h +++ b/libcef/browser/alloy/render_process_state_handler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,20 +12,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#ifndef CEF_LIBCEF_BROWSER_ALLOY_RENDER_PROCESS_STATE_HANDLER_H_ +#define CEF_LIBCEF_BROWSER_ALLOY_RENDER_PROCESS_STATE_HANDLER_H_ -#ifndef CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_PREFS_H_ -#define CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_PREFS_H_ +#include -#include "components/prefs/pref_registry_simple.h" +struct WebComponentState +{ + int nweb_id; + bool state; +}; -namespace ohos_safe_browsing { +struct RenderProcessStateMap +{ + uint32_t render_process_id; + std::vector web_component_list; +}; -extern const char kMaliciousAllowList[]; +class RenderProcessStateHandler +{ +private: + RenderProcessStateHandler(); + ~RenderProcessStateHandler(); -extern const char kIncognitoMaliciousAllowList[]; + RenderProcessStateHandler(const RenderProcessStateHandler &) = delete; + RenderProcessStateHandler &operator=(const RenderProcessStateHandler &) = delete; -void RegisterProfilePrefs(PrefRegistrySimple* registry); + std::vector render_process_map_list_; -} // namespace ohos_safe_browsing + std::vector initial_web_component_list_; -#endif // CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_PREFS_H_ + static RenderProcessStateHandler *instance; + +public: + static RenderProcessStateHandler *GetInstance(); + + void UpdateRenderProcessState( + uint32_t render_process_id, + int nweb_id, + bool is_to_background); + + void InitRenderProcessState( + uint32_t render_process_id, + int nweb_id); +}; + +#endif // CEF_LIBCEF_BROWSER_ALLOY_RENDER_PROCESS_STATE_HANDLER_H_ \ No newline at end of file diff --git a/libcef/browser/anti_tracking/anti_tracking_delegate_ohos.cc b/libcef/browser/anti_tracking/anti_tracking_delegate_ohos.cc index 75f6bdd787099537a0d16c0029689e4630be9ecd..92c9134627b6a96f14fe7a36b2e94404c5bd2b4e 100644 --- a/libcef/browser/anti_tracking/anti_tracking_delegate_ohos.cc +++ b/libcef/browser/anti_tracking/anti_tracking_delegate_ohos.cc @@ -20,4 +20,4 @@ namespace ohos_anti_tracking { void ThirdPartyCookieAccessPolicy::EnableIntelligentTrackingPrevention( content::BrowserContext* browser_context, bool enable) {} -} // ohos_anti_tracking +} // ohos_anti_tracking \ No newline at end of file diff --git a/libcef/browser/anti_tracking/third_party_cookie_access_policy.cc b/libcef/browser/anti_tracking/third_party_cookie_access_policy.cc index 2f92937fb9d52811481ddcb386d6120746bd3246..621bd9892e936a3803c0219d27bedb655033dc02 100644 --- a/libcef/browser/anti_tracking/third_party_cookie_access_policy.cc +++ b/libcef/browser/anti_tracking/third_party_cookie_access_policy.cc @@ -123,7 +123,8 @@ bool ThirdPartyCookieAccessPolicy::IsHostInITPBypassingList(const std::string& h return bypassing_host_list_.find(host) != bypassing_host_list_.end(); } -bool ThirdPartyCookieAccessPolicy::AllowGetCookies(const network::ResourceRequest& request) { +bool ThirdPartyCookieAccessPolicy::AllowGetCookies( + const network::ResourceRequest& request, const GURL& main_frame_url) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); if (request.resource_type == static_cast(blink::mojom::ResourceType::kMainFrame)) { @@ -136,7 +137,8 @@ bool ThirdPartyCookieAccessPolicy::AllowGetCookies(const network::ResourceReques return true; } - if (IsHostInITPBypassingList(request.url.host())) { + if (main_frame_url.is_valid() && main_frame_url.has_host() && + IsHostInITPBypassingList(main_frame_url.host())) { return true; } @@ -211,9 +213,7 @@ void ThirdPartyCookieAccessPolicy::AddITPBypassingListOnIOThread( const std::vector& host_list) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - bypassing_host_list_.clear(); - bypassing_host_list_ = - std::set(host_list.begin(), host_list.end()); + bypassing_host_list_.insert(host_list.begin(), host_list.end()); LOG(INFO) << "AddITPBypassingListOnIOThread done, host_list size " << host_list.size() << ", block host allow list size " diff --git a/libcef/browser/anti_tracking/third_party_cookie_access_policy.h b/libcef/browser/anti_tracking/third_party_cookie_access_policy.h index 08f37b96c71868d97a36d178c2a9ab073a62dbae..4a147d58478ba1d1d5e337c680f1f46e77a895c4 100644 --- a/libcef/browser/anti_tracking/third_party_cookie_access_policy.h +++ b/libcef/browser/anti_tracking/third_party_cookie_access_policy.h @@ -28,7 +28,8 @@ class ThirdPartyCookieAccessPolicy { public: static ThirdPartyCookieAccessPolicy* GetInstance(); - bool AllowGetCookies(const network::ResourceRequest& request); + bool AllowGetCookies(const network::ResourceRequest& request, + const GURL& main_frame_host); void SetTBWFilePath(const base::FilePath& tbw_path); void AddITPBypassingList(const std::vector& host_list); @@ -63,4 +64,4 @@ class ThirdPartyCookieAccessPolicy { } // namespace ohos_anti_tracking -#endif // CEF_LIBCEF_BROWSER_ANTI_TRACKING_THIRD_PARTY_COOKIE_ACCESS_POLICY_H +#endif // CEF_LIBCEF_BROWSER_ANTI_TRACKING_THIRD_PARTY_COOKIE_ACCESS_POLICY_H \ No newline at end of file diff --git a/libcef/browser/autofill/oh_autofill_client.cc b/libcef/browser/autofill/oh_autofill_client.cc index a1a848761423afc743c5fe29e4400237264b934c..2d808f1d68bb807fc88a36320be8af1419a2ef3b 100644 --- a/libcef/browser/autofill/oh_autofill_client.cc +++ b/libcef/browser/autofill/oh_autofill_client.cc @@ -55,22 +55,25 @@ OhAutofillClient::~OhAutofillClient() { } void OhAutofillClient::FillData(CefRefPtr data) { +#if defined(OHOS_AUTOFILL) std::string json_str = data->GetStdString(); content::RenderFrameHost* rfh = GetWebContents().GetFocusedFrame(); autofill::ContentAutofillDriver* driver = autofill::ContentAutofillDriver::GetForRenderFrameHost(rfh); - auto mgr = static_cast(driver->autofill_manager()); + auto mgr = static_cast(driver->oh_autofill_manager()); if (mgr) { mgr->FillData(json_str); } +#endif } -void OhAutofillClient::OnAutofillEvent(const std::string& json_str) { +bool OhAutofillClient::OnAutofillEvent(const std::string& json_str) { if (callback_) { CefRefPtr data = CefValue::Create(); data->SetStdString(json_str); - callback_->OnMessage(data); + return callback_->OnMessageWithBoolResult(data); } + return false; } void OhAutofillClient::SetSaveFormData(bool enabled) { @@ -440,6 +443,14 @@ void OhAutofillClient::SuggestionSelected(int position) { } } +void DriverInit(AutofillClient* client, const std::string& app_locale, + ContentAutofillDriver* driver) { + autofill::BrowserDriverInitHook(client, app_locale, driver); +#if defined(OHOS_AUTOFILL) + autofill::OhDriverInitHook(client, driver); +#endif +} + // Ownership: The native object is created (if autofill enabled) and owned by // AwContents. The native object creates the java peer which handles most // autofill functionality at the java side. The java peer is owned by Java @@ -450,7 +461,7 @@ OhAutofillClient::OhAutofillClient(WebContents* contents, contents, use_autofill_manager ? base::BindRepeating(&autofill::OhDriverInitHook, this) - : base::BindRepeating(&autofill::BrowserDriverInitHook, + : base::BindRepeating(&autofill::DriverInit, this, g_browser_process->GetApplicationLocale())) #if DCHECK_IS_ON() diff --git a/libcef/browser/autofill/oh_autofill_client.h b/libcef/browser/autofill/oh_autofill_client.h index 1e7304f2c583bf884f8607a75cfd473cf54aa54d..f80b0d7bcc8bd1921db4ff11d05793a5b98be172 100644 --- a/libcef/browser/autofill/oh_autofill_client.h +++ b/libcef/browser/autofill/oh_autofill_client.h @@ -82,7 +82,7 @@ class OhAutofillClient : public autofill::ContentAutofillClient, callback_ = callback; } void FillData(CefRefPtr data); - void OnAutofillEvent(const std::string& json_str); + bool OnAutofillEvent(const std::string& json_str); bool IsOffTheRecord() override; scoped_refptr GetURLLoaderFactory() override; autofill::AutofillDownloadManager* GetDownloadManager() override; diff --git a/libcef/browser/autofill/oh_autofill_manager.cc b/libcef/browser/autofill/oh_autofill_manager.cc index bf09605925bc2e585bcb07aa4cd45d89bc8b5f09..4fd763aa394660699aa16fdfd3313cf4db657d8f 100644 --- a/libcef/browser/autofill/oh_autofill_manager.cc +++ b/libcef/browser/autofill/oh_autofill_manager.cc @@ -48,9 +48,10 @@ const std::string KEY_PLACEHOLDER = "placeholder"; const std::string KEY_VALUE = "value"; #if defined(OHOS_PASSWORD_AUTOFILL) -const std::string KEY_PAGE_URL = "pageUrl"; const std::string KEY_USERNAME = "username"; const std::string KEY_PASSWORD = "password"; +const std::string KEY_RETURN_PAGE_URL = "autofill_viewdata_origin_pageurl"; +const std::string KEY_RETURN_OTHER_ACCOUNT = "autofill_viewdata_other_account"; #endif } // namespace @@ -59,12 +60,15 @@ namespace autofill { using base::TimeTicks; void OhDriverInitHook(AutofillClient* client, ContentAutofillDriver* driver) { +#if defined(OHOS_AUTOFILL) + driver->set_oh_autofill_manager( + base::WrapUnique(new OhAutofillManager(driver, client))); +#else driver->set_autofill_manager( base::WrapUnique(new OhAutofillManager(driver, client))); +#endif driver->GetAutofillAgent()->SetUserGestureRequired(false); - driver->GetAutofillAgent()->SetSecureContextRequired(true); driver->GetAutofillAgent()->SetFocusRequiresScroll(false); - driver->GetAutofillAgent()->SetQueryPasswordSuggestion(true); } OhAutofillManager::OhAutofillManager(AutofillDriver* driver, @@ -83,6 +87,15 @@ CreditCardAccessManager* OhAutofillManager::GetCreditCardAccessManager() { return nullptr; } +std::string OhAutofillManager::GetAttributeOrUniqueId(const FormFieldData& field) { + auto attribute = field.autocomplete_attribute; + if (!attribute.empty()) { + return attribute; + } + auto unique_renderer_id = base::NumberToString(field.unique_renderer_id.value()); + return unique_renderer_id; +} + absl::optional OhAutofillManager::FormDataToJson( const FormData& form, const FormFieldData& field, @@ -109,9 +122,10 @@ absl::optional OhAutofillManager::FormDataToJson( std::wstring_convert, char16_t> convert; for (const FormFieldData& field_data : form.fields) { base::Value::List list; + auto key = GetAttributeOrUniqueId(field_data); list.Append(base::Value::Dict().Set( KEY_FOUCS, - field_data.autocomplete_attribute == field.autocomplete_attribute ? 1 : 0)); + key == GetAttributeOrUniqueId(field) ? 1 : 0)); list.Append(base::Value::Dict().Set( KEY_RECT_X, static_cast((field_data.bounds.x() + offset.x()) * ratio))); @@ -127,7 +141,7 @@ absl::optional OhAutofillManager::FormDataToJson( list.Append( base::Value::Dict().Set(KEY_VALUE, convert.to_bytes(field_data.value))); - auto dict = base::Value::Dict().Set(field_data.autocomplete_attribute, std::move(list)); + auto dict = base::Value::Dict().Set(key, std::move(list)); view_data_list.Append(std::move(dict)); } @@ -162,6 +176,7 @@ absl::optional OhAutofillManager::FormDataToJsonForSave(const FormD int32_t index = 0; for (const FormFieldData& field_data : form.fields) { base::Value::List list; + auto key = GetAttributeOrUniqueId(field_data); list.Append(base::Value::Dict().Set(KEY_FOUCS, 0)); list.Append(base::Value::Dict().Set( KEY_RECT_X, @@ -178,7 +193,7 @@ absl::optional OhAutofillManager::FormDataToJsonForSave(const FormD list.Append( base::Value::Dict().Set(KEY_VALUE, convert.to_bytes(field_data.value))); - auto dict = base::Value::Dict().Set(field_data.autocomplete_attribute, std::move(list)); + auto dict = base::Value::Dict().Set(key, std::move(list)); view_data_list.Append(std::move(dict)); index++; } @@ -187,10 +202,6 @@ absl::optional OhAutofillManager::FormDataToJsonForSave(const FormD } void OhAutofillManager::FillData(const std::string& json_str) { - if (form_ == nullptr) { - return; - } - absl::optional root = base::JSONReader::Read(json_str); if (!root.has_value()) { return; @@ -202,26 +213,48 @@ void OhAutofillManager::FillData(const std::string& json_str) { } #if defined(OHOS_PASSWORD_AUTOFILL) - const std::string* page_url = root_dict->FindString(KEY_PAGE_URL); const std::string* username = root_dict->FindString(KEY_USERNAME); const std::string* password = root_dict->FindString(KEY_PASSWORD); + const std::string* page_url = root_dict->FindString(KEY_RETURN_PAGE_URL); + bool is_other_account = root_dict->FindBool(KEY_RETURN_OTHER_ACCOUNT).value_or(false); if (username || password) { ForwardDataToPasswordManager(page_url ? *page_url : std::string(), username ? *username : std::string(), - password ? *password : std::string()); + password ? *password : std::string(), + is_other_account); return; } #endif + if (form_ == nullptr) { + return; + } + std::wstring_convert, char16_t> convert; for (const FormFieldData& field_data : form_->fields) { const std::string* value = root_dict->FindString(field_data.autocomplete_attribute); - if (!value) { + if (!value || value->empty()) { continue; } driver()->RendererShouldFillFieldWithValue(field_data.global_id(), convert.from_bytes(*value)); } + for (auto it = root_dict->begin(); it != root_dict->end(); it++) { + const base::Value::Dict* sub_dict = root_dict->FindDict(it->first); + if (sub_dict) { + const std::string* str = sub_dict->FindString(KEY_VALUE); + if (!str) { + continue; + } + absl::optional index = sub_dict->FindInt(KEY_PLACEHOLDER); + if (!index.has_value() || index.value() <= 0 || index.value() > form_->fields.size()) { + continue; + } + uint32_t i = static_cast(index.value()) - 1; + driver()->RendererShouldFillFieldWithValue(form_->fields[i].global_id(), + convert.from_bytes(*str)); + } + } is_show_ = false; } @@ -229,8 +262,9 @@ void OhAutofillManager::FillData(const std::string& json_str) { void OhAutofillManager::ForwardDataToPasswordManager( const std::string& page_url, const std::string& username, - const std::string& password) { - LOG(INFO) << "autofill save, forward to password_manager"; + const std::string& password, + bool is_other_account) { + LOG(INFO) << "autofill fill data, forward to password_manager"; auto* rfh = static_cast(driver())->render_frame_host(); if (!rfh || !rfh->IsActive()) { @@ -248,10 +282,7 @@ void OhAutofillManager::ForwardDataToPasswordManager( return; } - std::wstring_convert, char16_t> convert; - password_manager->FillAccountSuggestion(GURL(page_url), - convert.from_bytes(username), - convert.from_bytes(password)); + password_manager->FillData(page_url, username, password, is_other_account); } bool OhAutofillManager::IsUsernamePasswordFormField(FormRendererId form_id, @@ -490,6 +521,7 @@ void OhAutofillManager::OnContextMenuShownInField( NOTREACHED(); } +#ifndef OHOS_FUZZ_COMPILE_ERROR_FIX AutofillProvider* OhAutofillManager::GetAutofillProvider() { if (auto* rfh = static_cast(driver())->render_frame_host()) { @@ -501,7 +533,7 @@ AutofillProvider* OhAutofillManager::GetAutofillProvider() { } return nullptr; } - +#endif void OhAutofillManager::FillOrPreviewForm(mojom::RendererFormDataAction action, const FormData& form, FieldTypeGroup field_type_group, diff --git a/libcef/browser/autofill/oh_autofill_manager.h b/libcef/browser/autofill/oh_autofill_manager.h index af53aa40817ceb1ecd79cad4e938e920f0d8e7bf..226c9e05673833cee5d376387a917dbb7c7b56e1 100644 --- a/libcef/browser/autofill/oh_autofill_manager.h +++ b/libcef/browser/autofill/oh_autofill_manager.h @@ -94,11 +94,13 @@ class OhAutofillManager : public AutofillManager { const std::string& event); absl::optional FormDataToJsonForSave(const FormData& form); void FillData(const std::string& json_str); + std::string GetAttributeOrUniqueId(const FormFieldData& field); #if defined(OHOS_PASSWORD_AUTOFILL) void ForwardDataToPasswordManager(const std::string& page_url, const std::string& username, - const std::string& password); + const std::string& password, + bool is_other_account); bool IsUsernamePasswordFormField(FormRendererId form_id, FieldRendererId field_id); @@ -168,8 +170,9 @@ class OhAutofillManager : public AutofillManager { #endif // UNIT_TEST private: +#ifndef OHOS_FUZZ_COMPILE_ERROR_FIX AutofillProvider* GetAutofillProvider(); - +#endif void StartNewLoggingSession(); bool has_server_prediction_ = false; base::WeakPtrFactory weak_ptr_factory_{this}; diff --git a/libcef/browser/browser_contents_delegate.cc b/libcef/browser/browser_contents_delegate.cc index 3f58f54839cd6a4711943660c547c233fdadeaf9..4988045abb6c61deb22f2b44c53eac75b084572f 100644 --- a/libcef/browser/browser_contents_delegate.cc +++ b/libcef/browser/browser_contents_delegate.cc @@ -46,6 +46,11 @@ #include "libcef/browser/load_committed_details_impl.h" #endif // defined(OHOS_NAVIGATION) +#if defined(OHOS_ARKWEB_EXTENSIONS) +#include "chrome/browser/extensions/api/tabs/tabs_constants.h" +#include "libcef/browser/extensions/api/tabs/tabs_windows_api.h" +#endif + using content::KeyboardEventProcessingResult; namespace { @@ -78,7 +83,12 @@ void MaybeSetUserAgentOverrideForMainFrame( } std::string host = url.host(); - if (!navigation->HasUserGesture()) { + bool is_reload = + PageTransitionCoreTypeIs(navigation->GetPageTransition(), + ui::PageTransition::PAGE_TRANSITION_RELOAD); + // Check whether the UA of referrer_url is used only when the main frame + // is not overloaded or triggered by user gestures. + if (navigation->IsInMainFrame() && !navigation->HasUserGesture() && !is_reload) { const GURL referrer_url = navigation->GetReferrer().url; if (referrer_url.is_valid() && !referrer_url.is_empty() && referrer_url.has_host()) { @@ -96,8 +106,9 @@ void MaybeSetUserAgentOverrideForMainFrame( std::string final_ua = nweb_ex::AlloyBrowserUAConfig::GetInstance()->GetUserAgentForHost(host); LOG(DEBUG) << "DidStartNavigation, host " << host << ", final_ua " << final_ua - << ", user_gesture " << navigation->HasUserGesture() << ", url " - << url.spec(); + << ", user_gesture " << navigation->HasUserGesture() + << ", is_main_frame " << navigation->IsInMainFrame() + << ", is_reload " << is_reload << ", url " << url.spec(); navigation->SetRequestHeader(net::HttpRequestHeaders::kUserAgent, final_ua); if (!navigation->IsInMainFrame()) { @@ -300,6 +311,17 @@ void CefBrowserContentsDelegate::LoadingStateChanged( can_go_forward); } } + +#if defined(OHOS_ARKWEB_EXTENSIONS) + int32_t tab_id = browser()->GetTabId(); + if (tab_id >= 0) { + std::vector changed_properties; + changed_properties.push_back(extensions::tabs_constants::kStatusKey); + extensions::cef::TabsWindowsAPI::Get( + source->GetBrowserContext())->TabUpdated( + tab_id, source, changed_properties, ""); + } +#endif } void CefBrowserContentsDelegate::UpdateTargetURL(content::WebContents* source, @@ -309,7 +331,25 @@ void CefBrowserContentsDelegate::UpdateTargetURL(content::WebContents* source, handler->OnStatusMessage(browser(), url.spec()); } } +#ifdef OHOS_NWEB_EX + if (auto c = client()) { + if (auto handler = c->GetRequestHandler()) { + handler->OnUpdateTargetURL(browser(), url.spec()); + } + } +#endif +} + +#if defined(OHOS_ARKWEB_EXTENSIONS) +void CefBrowserContentsDelegate::WebExtensionUpdateTabUrl( + int32_t tab_id, const GURL& url) { + if (auto c = client()) { + if (auto handler = c->GetWebExtensionApiHandler()) { + handler->OnUpdateTabUrl(tab_id, url.spec()); + } + } } +#endif bool CefBrowserContentsDelegate::DidAddMessageToConsole( content::WebContents* source, @@ -674,7 +714,7 @@ void CefBrowserContentsDelegate::PrimaryMainFrameRenderProcessGone( #ifdef OHOS_RENDER_PROCESS_MODE } else if (status == base::TERMINATION_STATUS_NORMAL_TERMINATION) { if (browser() && browser()->GetHost()) { - browser()->GetHost()->NotifyNeedsReload(true); + browser()->GetHost()->SetNeedsReload(true); } #endif } else if (status != base::TERMINATION_STATUS_ABNORMAL_TERMINATION) { @@ -858,6 +898,15 @@ void CefBrowserContentsDelegate::DidFinishNavigation( OnLoadStart(frame.get(), navigation_handle->GetPageTransition()); if (navigation_handle->IsServedFromBackForwardCache()) { // We won't get an OnLoadEnd notification from anywhere else. +#ifdef OHOS_BFCACHE + LOG(INFO) << "[Favicon] page load form bfcache."; + if (auto c = client()) { + if (auto handler = c->GetLoadHandler()) { + auto navigation_lock = browser_info_->CreateNavigationLock(); + handler->UpdateFavicon(browser()); + } + } +#endif // OHOS_BFCACHE OnLoadEnd(frame.get(), navigation_handle->GetURL(), 0); } } @@ -953,8 +1002,14 @@ void CefBrowserContentsDelegate::TitleWasSet(content::NavigationEntry* entry) { // navigated. if (entry) { OnTitleChange(entry->GetTitle()); +#ifdef OHOS_NETWORK_LOAD + observe_need_report_title_ = false; +#endif } else if (web_contents()) { OnTitleChange(web_contents()->GetTitle()); +#ifdef OHOS_NETWORK_LOAD + observe_need_report_title_ = false; +#endif } } @@ -1003,15 +1058,28 @@ void CefBrowserContentsDelegate::WebContentsDestroyed() { } } +#ifdef OHOS_NETWORK_LOAD +void CefBrowserContentsDelegate::DidStartLoading() { + observe_need_report_title_ = true; +} +#endif + void CefBrowserContentsDelegate::Observe( int type, const content::NotificationSource& source, const content::NotificationDetails& details) { DCHECK_EQ(type, content::NOTIFICATION_LOAD_STOP); +#ifdef OHOS_NETWORK_LOAD + if (type == content::NOTIFICATION_LOAD_STOP && observe_need_report_title_) { + OnTitleChange(web_contents()->GetTitle()); + observe_need_report_title_ = false; + } +#else if (type == content::NOTIFICATION_LOAD_STOP) { OnTitleChange(web_contents()->GetTitle()); } +#endif } bool CefBrowserContentsDelegate::OnSetFocus(cef_focus_source_t source) { diff --git a/libcef/browser/browser_contents_delegate.h b/libcef/browser/browser_contents_delegate.h index a1f06bf07c8309efeb7806eedf4d89d882d8b54a..c104c70ddfbb96f92c0de803eff772b54ff944a2 100644 --- a/libcef/browser/browser_contents_delegate.h +++ b/libcef/browser/browser_contents_delegate.h @@ -94,6 +94,9 @@ class CefBrowserContentsDelegate : public content::WebContentsDelegate, void LoadingStateChanged(content::WebContents* source, bool should_show_loading_ui) override; void UpdateTargetURL(content::WebContents* source, const GURL& url) override; +#if defined(OHOS_ARKWEB_EXTENSIONS) + void WebExtensionUpdateTabUrl(int32_t tab_id, const GURL& url) override; +#endif bool DidAddMessageToConsole(content::WebContents* source, blink::mojom::ConsoleMessageLevel log_level, const std::u16string& message, @@ -157,6 +160,9 @@ class CefBrowserContentsDelegate : public content::WebContentsDelegate, content::RenderWidgetHost* render_widget_host) override; void OnFocusChangedInPage(content::FocusedNodeDetails* details) override; void WebContentsDestroyed() override; +#ifdef OHOS_NETWORK_LOAD + void DidStartLoading() override; +#endif #if defined(OHOS_WPT) void DidStartNavigation(content::NavigationHandle* navigation) override; @@ -292,6 +298,10 @@ class CefBrowserContentsDelegate : public content::WebContentsDelegate, base::WeakPtrFactory weak_factory_{this}; #endif + +#ifdef OHOS_NETWORK_LOAD + bool observe_need_report_title_ = false; +#endif }; #endif // CEF_LIBCEF_BROWSER_BROWSER_CONTENTS_DELEGATE_H_ diff --git a/libcef/browser/browser_context_keyed_service_factories.cc b/libcef/browser/browser_context_keyed_service_factories.cc index 5739cde36eadcfee685a651f3a40ee0be0428bbf..9455f415c6adb294f2baa64f09c9e60c491dd1bd 100644 --- a/libcef/browser/browser_context_keyed_service_factories.cc +++ b/libcef/browser/browser_context_keyed_service_factories.cc @@ -23,6 +23,7 @@ #include "extensions/browser/renderer_startup_helper.h" #include "services/network/public/cpp/features.h" #if defined(OHOS_ARKWEB_EXTENSIONS) +#include "libcef/browser/extensions/api/tabs/tabs_windows_api.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" #include "extensions/browser/api/management/management_api.h" #endif @@ -45,6 +46,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { extensions::DeveloperPrivateAPI::GetFactoryInstance(); extensions::ManagementAPI::GetFactoryInstance(); extensions::WebRequestAPI::GetFactoryInstance(); + extensions::cef::TabsWindowsAPI::GetFactoryInstance(); #endif } diff --git a/libcef/browser/browser_frame.cc b/libcef/browser/browser_frame.cc index a58611482dccfbec8e7333ec52eacd62622bacd5..a6e9605ccd6aa0113d42c078b30919199bb98a1b 100644 --- a/libcef/browser/browser_frame.cc +++ b/libcef/browser/browser_frame.cc @@ -83,15 +83,15 @@ CefRefPtr CefBrowserFrame::GetFrameHost( #if BUILDFLAG(IS_OHOS) void CefBrowserFrame::OnGetImageForContextNode( - cef::mojom::GetImageForContextNodeParamsPtr params) { + cef::mojom::GetImageForContextNodeParamsPtr params, int command_id) { if (auto host = GetFrameHost()) { - host->OnGetImageForContextNode(std::move(params)); + host->OnGetImageForContextNode(std::move(params), command_id); } } -void CefBrowserFrame::OnGetImageForContextNodeNull() { +void CefBrowserFrame::OnGetImageForContextNodeNull(int command_id) { if (auto host = GetFrameHost()) { - host->OnGetImageForContextNodeNull(); + host->OnGetImageForContextNodeNull(command_id); } } diff --git a/libcef/browser/browser_frame.h b/libcef/browser/browser_frame.h index 3c464acb6984851a32938096b7acb6e2c8e8bf38..55ed1dcc27bc374b518d2e52c921307d88d8c108 100644 --- a/libcef/browser/browser_frame.h +++ b/libcef/browser/browser_frame.h @@ -47,8 +47,8 @@ class CefBrowserFrame #if BUILDFLAG(IS_OHOS) void OnGetImageForContextNode( - cef::mojom::GetImageForContextNodeParamsPtr params) override; - void OnGetImageForContextNodeNull() override; + cef::mojom::GetImageForContextNodeParamsPtr params, int command_id) override; + void OnGetImageForContextNodeNull(int command_id) override; void ShouldOverrideUrlLoading(const std::string& url, const std::string& request_method, diff --git a/libcef/browser/browser_host_base.cc b/libcef/browser/browser_host_base.cc index f2bfe12010c0ec3cc0b1c64df940785cf6253761..85bf6bf6117e03fcdd141a74136212e4deaf33cd 100644 --- a/libcef/browser/browser_host_base.cc +++ b/libcef/browser/browser_host_base.cc @@ -49,6 +49,7 @@ #include "content/public/browser/message_port_provider.h" #include "content/public/common/mhtml_generation_params.h" #include "content/public/common/url_constants.h" +#include "content/public/common/referrer.h" #include "libcef/browser/devtools/devtools_manager_delegate.h" #include "libcef/browser/javascript/oh_javascript_injector.h" #include "libcef/browser/navigation_state_serializer.h" @@ -64,6 +65,10 @@ #include "content/browser/media/session/media_session_impl.h" #endif // defined(OHOS_MEDIA_POLICY) +#if defined(OHOS_MEDIA_POLICY) +#include "content/browser/media/session/media_session_impl.h" +#endif // defined(OHOS_MEDIA_POLICY) + #if defined(OHOS_EX_UA) #include "content/public/common/content_switches.h" #endif @@ -96,6 +101,10 @@ #include "cc/input/browser_controls_state.h" #endif +#if defined(OHOS_EX_NAVIGATION) +#include "content/public/browser/navigation_controller.h" +#endif + #ifdef OHOS_ITP #include "cef/libcef/browser/anti_tracking/third_party_cookie_access_policy.h" #endif @@ -111,9 +120,12 @@ #endif #ifdef OHOS_URL_TRUST_LIST -#include "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.h" +#include "libcef/browser/safe_browsing/url_trust_list_manager.h" #endif +#if defined(OHOS_ARKWEB_EXTENSIONS) +#include "libcef/browser/extensions/api/tabs/tabs_windows_api.h" +#endif namespace { #if defined(OHOS_INPUT_EVENTS) @@ -332,8 +344,10 @@ CefBrowserHostBase::CefBrowserHostBase( contents_delegate_->AddObserver(this); #if BUILDFLAG(IS_OHOS) contents_delegate_->InitIconHelper(); - permission_request_handler_.reset(new AlloyPermissionRequestHandler( - client_->GetPermissionRequest(), GetWebContents())); + if (client) { + permission_request_handler_.reset(new AlloyPermissionRequestHandler( + client->GetPermissionRequest(), GetWebContents())); + } #endif } @@ -434,7 +448,7 @@ void CefBrowserHostBase::StartDownload(const CefString& url) { web_contents, gurl, MISSING_TRAFFIC_ANNOTATION)); content::Referrer referrer = content::Referrer::SanitizeForRequest( gurl, content::Referrer(web_contents->GetLastCommittedURL(), - network::mojom::ReferrerPolicy::kDefault)); + network::mojom::ReferrerPolicy::kDefault)); params->set_referrer(referrer.url); manager->DownloadUrl(std::move(params)); } @@ -894,6 +908,7 @@ void CefBrowserHostBase::UpdateBrowserSettings( settings_.embed_tag_type); settings_.draw_mode = browser_settings.draw_mode; settings_.text_autosizing_enabled = browser_settings.text_autosizing_enabled; + settings_.force_zero_layout_height = browser_settings.force_zero_layout_height; #endif // BUILDFLAG(IS_OHOS) #ifdef OHOS_SCROLLBAR settings_.scrollbar_color = browser_settings.scrollbar_color; @@ -913,18 +928,22 @@ void CefBrowserHostBase::UpdateBrowserSettings( settings_.custom_video_player_overlay = browser_settings.custom_video_player_overlay; #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_MULTI_WINDOW) + settings_.supports_multiple_windows = browser_settings.supports_multiple_windows; +#endif // OHOS_MULTI_WINDOW #if defined(OHOS_SOFTWARE_COMPOSITOR) settings_.record_whole_document = browser_settings.record_whole_document; #endif -#if defined(OHOS_MULTI_WINDOW) - settings_.supports_multiple_windows = browser_settings.supports_multiple_windows; -#endif // OHOS_MULTI_WINDOW - #ifdef OHOS_NETWORK_LOAD settings_.universal_access_from_file_urls = browser_settings.universal_access_from_file_urls; #endif + +#ifdef OHOS_MEDIA_NETWORK_TRAFFIC_PROMPT + settings_.enable_media_network_traffic_prompt = + browser_settings.enable_media_network_traffic_prompt; +#endif // OHOS_MEDIA_NETWORK_TRAFFIC_PROMPT } void CefBrowserHostBase::SetWebPreferences( @@ -1049,8 +1068,7 @@ void CefBrowserHostBase::JavaScriptOnDocumentStart( js_injection::JsCommunicationHost::AddScriptResult result = host->AddDocumentStartJavaScript(script, scriptRules); if (result.script_id.has_value()) { - document_start_script_result_map_.emplace( - std::make_pair(stdScript, result.script_id.value())); + document_start_script_result_map_[stdScript] = result.script_id.value(); } } } @@ -1079,8 +1097,7 @@ void CefBrowserHostBase::JavaScriptOnDocumentEnd( js_injection::JsCommunicationHost::AddScriptResult result = host->AddDocumentEndJavaScript(script, scriptRules); if (result.script_id.has_value()) { - document_end_script_result_map_.emplace( - std::make_pair(stdScript, result.script_id.value())); + document_end_script_result_map_[stdScript] = result.script_id.value(); } } } @@ -1297,7 +1314,7 @@ bool CefBrowserHostBase::TerminateRenderProcess() { auto frame = GetMainFrame(); if (frame && frame->IsValid()) { static_cast(frame.get())->TerminateRenderProcess(result); - LOG(DEBUG) << "TerminateRenderProcess result:" << result; + LOG(INFO) << "TerminateRenderProcess result:" << result; } return result; } @@ -1557,10 +1574,12 @@ void CefBrowserHostBase::SetBrowserUserAgentString( #if defined(OHOS_I18N) void CefBrowserHostBase::UpdateLocale(const CefString& locale) { std::string update_locale = locale.ToString(); + // need to notify renderer preference to change accepted_language. if (!GetWebContents()) { return; } + auto prefs = GetWebContents()->GetMutableRendererPrefs(); if (prefs->accept_languages.compare(update_locale)) { prefs->accept_languages = update_locale; @@ -1576,7 +1595,7 @@ void CefBrowserHostBase::UpdateLocale(const CefString& locale) { std::string origin_locale = ui::ResourceBundle::GetSharedInstance().GetLoadedLocaleForTesting(); if (origin_locale == update_locale) { - LOG(ERROR) << "CefBrowserHostBase::UpdateLocale no need to update locale"; + LOG(WARNING) << "CefBrowserHostBase::UpdateLocale no need to update locale"; return; } @@ -1986,6 +2005,48 @@ void CefBrowserHostBase::AbortAskClipboardReadWritePermission( permission_request_handler_->CancelRequest( origin, AlloyAccessRequest::Resources::CLIPBOARD_READ_WRITE); } + +void CefBrowserHostBase::AskClipboardSanitizedWritePermission( + const CefString& origin, + cef_permission_callback_t callback) { + permission_request_handler_->SendRequest(new AlloyAccessRequest( + origin, AlloyAccessRequest::Resources::CLIPBOARD_SANITIZED_WRITE, + std::move(callback))); +} + +void CefBrowserHostBase::AbortAskClipboardSanitizedWritePermission( + const CefString& origin) { + permission_request_handler_->CancelRequest( + origin, AlloyAccessRequest::Resources::CLIPBOARD_SANITIZED_WRITE); +} + +void CefBrowserHostBase::AskAudioCapturePermission( + const CefString& origin, + cef_permission_callback_t callback) { + permission_request_handler_->SendRequest(new AlloyAccessRequest( + origin, AlloyAccessRequest::Resources::AUDIO_CAPTURE, + std::move(callback))); +} + +void CefBrowserHostBase::AbortAskAudioCapturePermission( + const CefString& origin) { + permission_request_handler_->CancelRequest( + origin, AlloyAccessRequest::Resources::AUDIO_CAPTURE); +} + +void CefBrowserHostBase::AskVideoCapturePermission( + const CefString& origin, + cef_permission_callback_t callback) { + permission_request_handler_->SendRequest(new AlloyAccessRequest( + origin, AlloyAccessRequest::Resources::VIDEO_CAPTURE, + std::move(callback))); +} + +void CefBrowserHostBase::AbortAskVideoCapturePermission( + const CefString& origin) { + permission_request_handler_->CancelRequest( + origin, AlloyAccessRequest::Resources::VIDEO_CAPTURE); +} #endif CefRefPtr CefBrowserHostBase::GetFrameForHost( @@ -2305,6 +2366,11 @@ CefString CefBrowserHostBase::Title() { // WebMessagePort>> portMap_; first is the paif of port_handles. second is the // WebMessagePort of the pipe. void CefBrowserHostBase::CreateWebMessagePorts(std::vector& ports) { + if (!CEF_CURRENTLY_ON_UIT()) { + CHECK(false) << "called on invalid thread"; + return; + } + base::AutoLock msg_lock(web_message_lock_); auto web_contents = GetWebContents(); if (web_contents) { int retry_times = 0; @@ -2317,16 +2383,13 @@ void CefBrowserHostBase::CreateWebMessagePorts(std::vector& ports) { return; } uint64_t pointer0 = base::RandUint64(); - if (pointer0 == ULLONG_MAX) { + if (pointer0 == ULLONG_MAX || (pointer0 + 1) == ULLONG_MAX) { retry_times++; continue; } + pointer0 = ((pointer0 % 2) == 0) ? (pointer0 + 1) : pointer0; uint64_t pointer1 = pointer0 + 1; - auto iter = std::find_if(portMap_.begin(), portMap_.end(), [&pointer0, &pointer1](auto& cc){ - std::pair rnd = cc.first; - return (rnd.first == pointer0 || rnd.second == pointer0 || rnd.first == pointer1); - }); - + auto iter = portMap_.find(std::make_pair(pointer0, pointer1)); if (iter == portMap_.end()) { portMap_[std::make_pair(pointer0, pointer1)] = std::make_pair(std::move(portArr[0]), std::move(portArr[1])); @@ -2347,6 +2410,11 @@ void CefBrowserHostBase::CreateWebMessagePorts(std::vector& ports) { void CefBrowserHostBase::PostWebMessage(CefString& message, std::vector& port_handles, CefString& targetUri) { + if (!CEF_CURRENTLY_ON_UIT()) { + CHECK(false) << "called on invalid thread"; + return; + } + base::AutoLock msg_lock(web_message_lock_); auto web_contents = GetWebContents(); if (!web_contents) { LOG(ERROR) << "PostWebMessage web_contents its null"; @@ -2390,6 +2458,11 @@ void CefBrowserHostBase::PostWebMessage(CefString& message, // WebMessagePort>> portMap_; first is the paif of port_handles. second is the // WebMessagePort of the pipe. void CefBrowserHostBase::ClosePort(CefString& portHandle) { + if (!CEF_CURRENTLY_ON_UIT()) { + CHECK(false) << "called on invalid thread"; + return; + } + base::AutoLock msg_lock(web_message_lock_); LOG(DEBUG) << "ClosePort ClosePort"; auto web_contents = GetWebContents(); if (!web_contents) { @@ -2535,14 +2608,10 @@ bool CefBrowserHostBase::ConvertCefValueToBlinkMsg( return true; } -void CefBrowserHostBase::PostPortMessage(CefString& portHandle, +void CefBrowserHostBase::PostPortMessageInternal(const CefString& portHandle, CefRefPtr data) { - auto web_contents = GetWebContents(); - if (!web_contents) { - LOG(ERROR) << "GetWebContents null"; - return; - } - + base::ScopedAllowBlocking scoped_allow_blocking; + base::AutoLock msg_lock(web_message_lock_); // construct blink message blink::WebMessagePort::Message message; if (!ConvertCefValueToBlinkMsg(data, message)) { @@ -2571,27 +2640,19 @@ void CefBrowserHostBase::PostPortMessage(CefString& portHandle, } } -// in the std::map, std::pair> portMap_; first is the paif of port_handles. second is the -// WebMessagePort of the pipe. -void CefBrowserHostBase::SetPortMessageCallback( - CefString& portHandle, - CefRefPtr callback) { - auto web_contents = GetWebContents(); - if (!web_contents) { - LOG(ERROR) << "GetWebContents null"; - return; - } +void CefBrowserHostBase::PostPortMessage(const CefString& portHandle, + CefRefPtr data) { + sequenced_task_runner_->PostTask( + FROM_HERE, base::BindOnce(&CefBrowserHostBase::PostPortMessageInternal, + this, portHandle, data)); +} - // get sequenced task runner +void CefBrowserHostBase::SetPortMessageCallbackInternal( + const CefString& portHandle, + CefRefPtr callback) { + base::ScopedAllowBlocking scoped_allow_blocking; + base::AutoLock msg_lock(web_message_lock_); std::string pointer0 = portHandle.ToString(); - if (!base::SequencedTaskRunner::HasCurrentDefault()) - { - LOG(ERROR) << "not in SequencedTaskRunner"; - return; - } - - auto sequenced_task_runner_ = base::SequencedTaskRunner::GetCurrentDefault(); // get web message receiver instance std::shared_ptr webMsgReceiver; @@ -2628,7 +2689,19 @@ void CefBrowserHostBase::SetPortMessageCallback( receiverMap_[pointer0] = webMsgReceiver; } +// in the std::map, std::pair> portMap_; first is the paif of port_handles. second is the +// WebMessagePort of the pipe. +void CefBrowserHostBase::SetPortMessageCallback( + const CefString& portHandle, + CefRefPtr callback) { + sequenced_task_runner_->PostTask( + FROM_HERE, base::BindOnce(&CefBrowserHostBase::SetPortMessageCallbackInternal, + this, portHandle, callback)); +} + void CefBrowserHostBase::DestroyAllWebMessagePorts() { + base::AutoLock msg_lock(web_message_lock_); LOG(DEBUG) << "clear all message ports"; portMap_.clear(); receiverMap_.clear(); @@ -2804,10 +2877,16 @@ void CefBrowserHostBase::LoadWithDataAndBaseUrl(const CefString& baseUrl, } buildData.append(";base64"); buildData.append(","); + std::string emtry_data_url = buildData; dataBase = GetDataURI(dataBase); buildData.append(dataBase); GURL data_url = GURL(buildData); content::NavigationController::LoadURLParams loadUrlParams(data_url); + if (data_url.spec().size() > url::kMaxURLChars) { + loadUrlParams.url = GURL(emtry_data_url); + loadUrlParams.data_url_as_string = + base::MakeRefCounted(std::move(buildData)); + } if (!(url.find("data:") == 0)) { loadUrlParams.virtual_url_for_data_url = GURL(historyUrlBase); @@ -2843,9 +2922,15 @@ void CefBrowserHostBase::LoadWithData(const CefString& data, buildData.append(";base64"); } buildData.append(","); + std::string emtry_data_url = buildData; buildData.append(dataBase); GURL data_url = GURL(buildData); content::NavigationController::LoadURLParams loadUrlParams(data_url); + if (data_url.spec().size() > url::kMaxURLChars) { + loadUrlParams.url = GURL(emtry_data_url); + loadUrlParams.data_url_as_string = + base::MakeRefCounted(std::move(buildData)); + } auto web_contents = GetWebContents(); if (web_contents) { @@ -3057,26 +3142,26 @@ bool CefBrowserHostBase::GetWebDebuggingAccess() { return is_web_debugging_access_; } -void CefBrowserHostBase::GetImageForContextNode() { +void CefBrowserHostBase::GetImageForContextNode(int command_id) { auto frame = GetMainFrame(); if (frame && frame->IsValid()) { - static_cast(frame.get())->GetImageForContextNode(); + static_cast(frame.get())->GetImageForContextNode(command_id); } } -void CefBrowserHostBase::GetImageFromCache(const CefString& url) { - LOG(ERROR) << "CefBrowserHostBase::GetImageFromCache"; +void CefBrowserHostBase::GetImageFromCache(const CefString& url, int command_id) { + LOG(INFO) << "CefBrowserHostBase::GetImageFromCache"; auto web_contents = GetWebContents(); auto frame = GetMainFrame(); if (web_contents && frame && frame->IsValid()) { content::RenderFrameHost* rfh = web_contents->GetPrimaryMainFrame(); if (rfh) { - LOG(ERROR) << "CefBrowserHostBase::GetImageFromCache"; + LOG(INFO) << "CefBrowserHostBase::GetImageFromCache"; rfh->GetImageFromCache( url.ToString(), base::BindOnce(&CefFrameHostImpl::OnGetImageFromCache, static_cast(frame.get()), - url.ToString())); + url.ToString(), command_id)); } } } @@ -3094,6 +3179,7 @@ void CefBrowserHostBase::WasOccluded(bool occluded) { // TODO(ohos): please impl the function and remove this comment. } + // TODO(ohos): please impl the function and remove this comment. void CefBrowserHostBase::OnWindowShow() { // TODO(ohos): please impl the function and remove this comment. } @@ -3106,8 +3192,7 @@ void CefBrowserHostBase::OnOnlineRenderToForeground() { // TODO(ohos): please impl the function and remove this comment. } -void CefBrowserHostBase::SendTouchEventList( - const std::vector& event_list) { +void CefBrowserHostBase::SendTouchEventList(const std::vector& event_list) { // TODO(ohos): please impl the function and remove this comment. } @@ -3342,22 +3427,22 @@ void CefBrowserHostBase::SetShouldFrameSubmissionBeforeDraw(bool should) { // TODO(ohos): please impl the function and remove this comment. } -void CefBrowserHostBase::SelectAndCopy() { +void CefBrowserHostBase::ShowFreeCopyMenu() { #if defined(OHOS_EX_FREE_COPY) if (!GetWebContents()) { return; } LOG(DEBUG) << "select and copy invoke"; - GetWebContents()->SelectAndCopy(); + GetWebContents()->ShowFreeCopyMenu(); #endif } -bool CefBrowserHostBase::ShouldShowFreeCopy() { +bool CefBrowserHostBase::ShouldShowFreeCopyMenu() { #if defined(OHOS_EX_FREE_COPY) if (!GetWebContents()) { return false; } - return GetWebContents()->ShouldShowFreeCopy(); + return GetWebContents()->ShouldShowFreeCopyMenu(); #else return false; #endif @@ -3485,16 +3570,6 @@ bool CefBrowserHostBase::GetForceEnableZoom() { #endif // #if defined (OHOS_EX_FORCE_ZOOM) } -void CefBrowserHostBase::SetEnableBlankTargetPopupIntercept( - bool enableBlankTargetPopup) { -#ifdef OHOS_EX_BLANK_TARGET_POPUP_INTERCEPT - if (!GetWebContents()) { - return; - } - GetWebContents()->SetEnableBlankTargetPopupIntercept(enableBlankTargetPopup); -#endif -} - void CefBrowserHostBase::SaveOrUpdatePassword(bool is_update) { #if defined(OHOS_EX_PASSWORD) if (!GetWebContents()) { @@ -3515,6 +3590,7 @@ void CefBrowserHostBase::EnableAdsBlock(bool enable) { return; } GetWebContents()->EnableAdsBlock(enable); + LOG(INFO) << "web adblock enabled : " << enable; OHOS::adblock::AdBlockConfig::GetInstance()->ReadFromPrefService(); @@ -3678,6 +3754,28 @@ bool CefBrowserHostBase::GetSavePassword() { } // #endif // defined(OHOS_NWEB_EX) +int CefBrowserHostBase::GetTopControlsOffset() { +#if defined(OHOS_EX_TOPCONTROLS) + if (platform_delegate_) { + return platform_delegate_->GetTopControlsOffset(); + } + return 0; +#else + return 0; +#endif +} + +int CefBrowserHostBase::GetShrinkViewportHeight() { +#if defined(OHOS_EX_TOPCONTROLS) + if (platform_delegate_) { + return platform_delegate_->GetShrinkViewportHeight(); + } + return 0; +#else + return 0; +#endif +} + #if BUILDFLAG(IS_OHOS) int CefBrowserHostBase::GetSecurityLevel() { if (!GetWebContents()) { @@ -3695,27 +3793,76 @@ int CefBrowserHostBase::GetSecurityLevel() { } #endif // BUILDFLAG(IS_OHOS) -int CefBrowserHostBase::GetTopControlsOffset() { -#if defined(OHOS_EX_TOPCONTROLS) - if (platform_delegate_) { - return platform_delegate_->GetTopControlsOffset(); +#if defined(OHOS_EX_NAVIGATION) +int CefBrowserHostBase::InsertBackForwardEntry(int index, + const CefString& url) { + if (!GetWebContents()) { + return static_cast( + content::NavigationController::NavigationEntryUpdateError::ERR_OTHER); } - return 0; -#else - return 0; + GURL gurl = GURL(url.ToString()); + if (gurl.is_empty() || !gurl.is_valid()) { + return static_cast( + content::NavigationController::NavigationEntryUpdateError::ERR_OTHER); + } + return static_cast( + GetWebContents()->GetController().InsertBackForwardEntry(index, gurl)); +} + +int CefBrowserHostBase::UpdateNavigationEntryUrl(int index, + const CefString& url) { + if (!GetWebContents()) { + return static_cast( + content::NavigationController::NavigationEntryUpdateError::ERR_OTHER); + } + GURL gurl = GURL(url.ToString()); + if (gurl.is_empty() || !gurl.is_valid()) { + return static_cast( + content::NavigationController::NavigationEntryUpdateError::ERR_OTHER); + } + return static_cast( + GetWebContents()->GetController().UpdateNavigationEntryUrl(index, gurl)); +} +void CefBrowserHostBase::ClearForwardList() { + if (!GetWebContents()) { + return; + } + + GetWebContents()->GetController().PruneForwardEntries(); +} #endif + +#ifdef OHOS_ITP +void CefBrowserHostBase::EnableIntelligentTrackingPrevention(bool enable) { + { + base::AutoLock locker(lock_); + intelligent_tracking_prevention_cookies_enabled_ = enable; + } + LOG(INFO) << "Intelligent tracking prevention cookies enabled " << enable; + ohos_anti_tracking::ThirdPartyCookieAccessPolicy::GetInstance()-> + EnableIntelligentTrackingPrevention(GetBrowserContext(), enable); } -int CefBrowserHostBase::GetShrinkViewportHeight() { -#if defined(OHOS_EX_TOPCONTROLS) - if (platform_delegate_) { - return platform_delegate_->GetShrinkViewportHeight(); +bool CefBrowserHostBase::IsIntelligentTrackingPreventionEnabled() { + base::AutoLock locker(lock_); + return intelligent_tracking_prevention_cookies_enabled_; +} + +GURL CefBrowserHostBase::GetLastCommittedURL() { + GURL url; + if (!GetWebContents()) { + return url; } - return 0; -#else - return 0; + url = GetWebContents()->GetLastCommittedURL(); + return url; +} #endif + +#if defined(OHOS_SECURE_JAVASCRIPT_PROXY) +CefString CefBrowserHostBase::GetLastJavascriptProxyCallingFrameUrl() { + return base::EmptyString(); } +#endif void CefBrowserHostBase::StartCamera() { #if defined(OHOS_WEBRTC) @@ -3750,29 +3897,6 @@ void CefBrowserHostBase::CloseCamera() { #endif // defined(OHOS_WEBRTC) } -#if defined(OHOS_SECURE_JAVASCRIPT_PROXY) -CefString CefBrowserHostBase::GetLastJavascriptProxyCallingFrameUrl() { - return base::EmptyString(); -} -#endif - -#ifdef OHOS_ITP -void CefBrowserHostBase::EnableIntelligentTrackingPrevention(bool enable) { - { - base::AutoLock locker(lock_); - intelligent_tracking_prevention_cookies_enabled_ = enable; - } - LOG(INFO) << "Intelligent tracking prevention cookies enabled " << enable; - ohos_anti_tracking::ThirdPartyCookieAccessPolicy::GetInstance()-> - EnableIntelligentTrackingPrevention(GetBrowserContext(), enable); -} - -bool CefBrowserHostBase::IsIntelligentTrackingPreventionEnabled() { - base::AutoLock locker(lock_); - return intelligent_tracking_prevention_cookies_enabled_; -} -#endif - void CefBrowserHostBase::SetNWebId(int NWebID) { #if defined(OHOS_WEBRTC) auto web_contents = GetWebContents(); @@ -3784,6 +3908,14 @@ void CefBrowserHostBase::SetNWebId(int NWebID) { #endif // defined(OHOS_WEBRTC) } +#ifdef OHOS_RENDER_PROCESS_MODE +void CefBrowserHostBase::SetNeedsReload(bool needs_reload) {} + +bool CefBrowserHostBase::NeedsReload() { + return false; +} +#endif + #if BUILDFLAG(IS_OHOS) void CefBrowserHostBase::PrecompileJavaScript(const std::string& url, const std::string& script, @@ -3817,7 +3949,7 @@ oh_code_cache::NextOp CefBrowserHostBase::WriteResponseCache( auto response_cache = oh_code_cache::ResponseCache::CreateResponseCache(url); if (!response_cache) { - LOG(ERROR) << "Create response cache error."; + LOG(DEBUG) << "Create response cache error."; return oh_code_cache::NextOp::THROW_ERROR; } @@ -3865,14 +3997,20 @@ void CefBrowserHostBase::OnDidGenerateCodeCache(CefRefPtr } #endif -#ifdef OHOS_RENDER_PROCESS_MODE -void CefBrowserHostBase::NotifyNeedsReload(bool needs_reload) { +#ifdef OHOS_AI +void CefBrowserHostBase::OnTextSelected(bool flag) { // TODO(ohos): please impl the function and remove this comment. } -bool CefBrowserHostBase::NeedsReload() { +void CefBrowserHostBase::OnDestroyImageAnalyzerOverlay() { // TODO(ohos): please impl the function and remove this comment. - return false; +} + +float CefBrowserHostBase::GetPageScaleFactor() { + if (platform_delegate_) { + return platform_delegate_->GetPageScaleFactor(); + } + return 1; } #endif @@ -3898,19 +4036,6 @@ void CefBrowserHostBase::NotifyForNextTouchEvent() { } #endif -#ifdef OHOS_AI -void CefBrowserHostBase::OnTextSelected(bool flag) { - // TODO(ohos): please impl the function and remove this comment. -} - -float CefBrowserHostBase::GetPageScaleFactor() { - if (platform_delegate_) { - return platform_delegate_->GetPageScaleFactor(); - } - return 1; -} -#endif - #if defined(OHOS_SOFTWARE_COMPOSITOR) bool CefBrowserHostBase::WebPageSnapshot( const char* id, @@ -3934,19 +4059,18 @@ int CefBrowserHostBase::SetUrlTrustListWithErrMsg( LOG(ERROR) << "SetUrlTrustListWithErrMsg failed, web contents is error."; return static_cast(ohos_safe_browsing::UrlListSetResult::INIT_ERROR); } - ohos_safe_browsing::OhosUrlTrustListManager* manager = - reinterpret_cast( + ohos_safe_browsing::UrlTrustListManager* manager = + reinterpret_cast( webContents->GetUserData( - &ohos_safe_browsing::OhosUrlTrustListInterface::interfaceKey)); + &ohos_safe_browsing::UrlTrustListInterface::interfaceKey)); if (!manager) { - manager = new ohos_safe_browsing::OhosUrlTrustListManager(); + manager = new ohos_safe_browsing::UrlTrustListManager(); if (!manager) { LOG(ERROR) << "SetUrlTrustListWithErrMsg failed, new UrlTrustListManager failed."; - return static_cast( - ohos_safe_browsing::UrlListSetResult::INIT_ERROR); + return static_cast(ohos_safe_browsing::UrlListSetResult::INIT_ERROR); } webContents->SetUserData( - &ohos_safe_browsing::OhosUrlTrustListInterface::interfaceKey, + &ohos_safe_browsing::UrlTrustListInterface::interfaceKey, std::unique_ptr(manager)); } int res = static_cast(manager->SetUrlTrustListWithErrMsg( @@ -3956,6 +4080,37 @@ int CefBrowserHostBase::SetUrlTrustListWithErrMsg( } #endif +#if defined(OHOS_ARKWEB_EXTENSIONS) +void CefBrowserHostBase::SetTabId(int tab_id) {} +int CefBrowserHostBase::GetTabId() { return -1; } + +void CefBrowserHostBase::WebExtensionTabUpdated( + int tab_id, + const std::vector& changed_property_names, + const CefString& url) { + content::WebContents* web_contents = GetWebContents(); + if (!web_contents) { + LOG(ERROR) << "TabUpdated get contents failed."; + return; + } + + auto browser_context = web_contents->GetBrowserContext(); + if (!browser_context) { + LOG(ERROR) << "TabUpdated get browser context failed."; + return; + } + + std::vector changed_properties; + std::for_each(changed_property_names.begin(), changed_property_names.end(), + [&changed_properties] (const CefString& name) { + changed_properties.emplace_back(name.ToString()); + }); + + extensions::cef::TabsWindowsAPI::Get(browser_context)->TabUpdated( + tab_id, web_contents, changed_properties, url.ToString()); +} +#endif + #ifdef OHOS_BFCACHE void CefBrowserHostBase::SetBackForwardCacheOptions(int32_t size, int32_t timeToLive) { auto web_contents = GetWebContents(); @@ -3964,6 +4119,8 @@ void CefBrowserHostBase::SetBackForwardCacheOptions(int32_t size, int32_t timeTo return; } + LOG(INFO) << "SetBackForwardCacheOptions size: " << size + << " timeToLive: " << timeToLive; content::NavigationController& controller = web_contents->GetController(); controller.GetBackForwardCache().SetCacheSize(size); controller.GetBackForwardCache().SetTimeToLive(timeToLive); diff --git a/libcef/browser/browser_host_base.h b/libcef/browser/browser_host_base.h index 3e7c3ca437bf8d5ebee8fdbdd5aa614921f7b132..bd5fabc3e0618d940e2246c525593a242b8c21d4 100644 --- a/libcef/browser/browser_host_base.h +++ b/libcef/browser/browser_host_base.h @@ -260,6 +260,7 @@ class CefBrowserHostBase : public CefBrowserHost, void PutUserAgent(const CefString& ua) override; CefString DefaultUserAgent() override; void UpdateBrowserSettings(const CefBrowserSettings& browser_settings); + void RegisterNativeJSProxy(const CefString& object_name, const std::vector& method_list, const int32_t object_id, @@ -297,8 +298,8 @@ class CefBrowserHostBase : public CefBrowserHost, const CefString& base_name, bool auto_name, CefRefPtr callback) override; - void GetImageForContextNode() override; - void GetImageFromCache(const CefString& url) override; + void GetImageForContextNode(int command_id) override; + void GetImageFromCache(const CefString& url, int command_id) override; void SetBrowserUserAgentString(const CefString& user_agent) override; void ExitFullScreen() override; void GetRootBrowserAccessibilityManager(void** manager) override; @@ -333,7 +334,6 @@ class CefBrowserHostBase : public CefBrowserHost, int current, bool animate) override; void UpdateBrowserControlsHeight(int height, bool animate) override; - void StartCamera() override; void StopCamera() override; void CloseCamera() override; @@ -351,8 +351,8 @@ class CefBrowserHostBase : public CefBrowserHost, #endif #ifdef OHOS_RENDER_PROCESS_MODE -void NotifyNeedsReload(bool needs_reload) override; -bool NeedsReload() override; + void SetNeedsReload(bool needs_reload) override; + bool NeedsReload() override; #endif // CefBrowser methods: @@ -436,6 +436,7 @@ bool NeedsReload() override; void WasKeyboardResized() override; void SetWindowId(int window_id, int nweb_id) override; void SetWakeLockHandler(int32_t windowId, CefRefPtr callback) override; + #if defined(OHOS_PRINT) void SetToken(void* token) override; void CreateWebPrintDocumentAdapter(const CefString& jobName, @@ -481,13 +482,14 @@ bool NeedsReload() override; bool Discard() override { return false; } bool Restore() override { return false; } // #ifdef OHOS_EX_FREE_COPY - void SelectAndCopy() override; - bool ShouldShowFreeCopy() override; + void ShowFreeCopyMenu() override; + bool ShouldShowFreeCopyMenu() override; // #endif int GetNWebId() override; #ifdef OHOS_ITP void EnableIntelligentTrackingPrevention(bool enable) override; bool IsIntelligentTrackingPreventionEnabled() override; + GURL GetLastCommittedURL(); #endif #endif // BUILDFLAG(IS_OHOS) @@ -511,10 +513,10 @@ bool NeedsReload() override; void ClosePort(CefString& port_handle) override; bool ConvertCefValueToBlinkMsg(CefRefPtr& original, blink::WebMessagePort::Message& message); - void PostPortMessage(CefString& port_handle, + void PostPortMessage(const CefString& port_handle, CefRefPtr message) override; void SetPortMessageCallback( - CefString& port_handle, + const CefString& port_handle, CefRefPtr callback) override; void DestroyAllWebMessagePorts() override; #endif // defined(OHOS_MSGPORT) @@ -536,9 +538,7 @@ bool NeedsReload() override; void SetForceEnableZoom(bool forceEnableZoom) override; bool GetForceEnableZoom() override; - // #ifdef OHOS_EX_BLANK_TARGET_POPUP_INTERCEPT - void SetEnableBlankTargetPopupIntercept(bool enableBlankTargetPopup) override; - // #endif + // if defined(OHOS_EX_PASSWORD) void PasswordSuggestionSelected(int list_index) override; bool GetSavePasswordAutomatically() override; @@ -690,6 +690,18 @@ bool TerminateRenderProcess() override; void AskClipboardReadWritePermission(const CefString& origin, cef_permission_callback_t callback) override; void AbortAskClipboardReadWritePermission(const CefString& origin) override; + + void AskClipboardSanitizedWritePermission(const CefString& origin, + cef_permission_callback_t callback) override; + void AbortAskClipboardSanitizedWritePermission( + const CefString& origin) override; + + void AskAudioCapturePermission(const CefString& origin, + cef_permission_callback_t callback) override; + void AbortAskAudioCapturePermission(const CefString& origin) override; + void AskVideoCapturePermission(const CefString& origin, + cef_permission_callback_t callback) override; + void AbortAskVideoCapturePermission(const CefString& origin) override; // Geolocation API support void PopupGeolocationPrompt(std::string origin, cef_permission_callback_t callback); @@ -719,17 +731,24 @@ bool TerminateRenderProcess() override; #if defined(OHOS_SECURE_JAVASCRIPT_PROXY) CefString GetLastJavascriptProxyCallingFrameUrl() override; #endif -#endif // IS_OHOS -#ifdef OHOS_DISPLAY_CUTOUT - void OnSafeInsetsChange(int left, int top, int right, int bottom) override; +#endif // IS_OHOS +#if defined(OHOS_EX_NAVIGATION) + int InsertBackForwardEntry(int index, const CefString& url) override; + int UpdateNavigationEntryUrl(int index, const CefString& url) override; + void ClearForwardList() override; #endif #ifdef OHOS_AI void OnTextSelected(bool flag) override; + void OnDestroyImageAnalyzerOverlay() override; float GetPageScaleFactor() override; #endif +#ifdef OHOS_DISPLAY_CUTOUT + void OnSafeInsetsChange(int left, int top, int right, int bottom) override; +#endif + #ifdef OHOS_URL_TRUST_LIST int SetUrlTrustListWithErrMsg( const CefString& urlTrustList, CefString& detailErrMsg) override; @@ -742,6 +761,15 @@ bool TerminateRenderProcess() override; cef_web_snapshot_callback_t callback)override; #endif +#if defined(OHOS_ARKWEB_EXTENSIONS) + void WebExtensionTabUpdated( + int tab_id, + const std::vector& changed_property_names, + const CefString& url) override; + void SetTabId(int tab_id) override; + int GetTabId() override; +#endif + #ifdef OHOS_BFCACHE void SetBackForwardCacheOptions(int32_t size, int32_t timeToLive) override; #endif @@ -829,6 +857,13 @@ bool TerminateRenderProcess() override; CefRefPtr callback); void OnDidGenerateCodeCache(CefRefPtr callback, int32_t result); + + void SetPortMessageCallbackInternal( + const CefString& portHandle, + CefRefPtr callback); + void PostPortMessageInternal(const CefString& portHandle, + CefRefPtr data); + // GURL is supplied by the content layer as requesting frame. // Callback is supplied by the content layer, and is invoked with the result // from the permission prompt. @@ -838,10 +873,13 @@ bool TerminateRenderProcess() override; using MessagePipe = std::pair; using PortHandle = std::pair; - std::map portMap_; - std::set postedPorts_; + base::Lock web_message_lock_; + std::map portMap_ GUARDED_BY(web_message_lock_); + std::set postedPorts_ GUARDED_BY(web_message_lock_); std::unordered_map> - receiverMap_; + receiverMap_ GUARDED_BY(web_message_lock_); + scoped_refptr sequenced_task_runner_ = + base::ThreadPool::CreateSequencedTaskRunner({}); #if defined(OHOS_INPUT_EVENTS) uint64_t last_zoom_time_ = 0; diff --git a/libcef/browser/browser_platform_delegate.cc b/libcef/browser/browser_platform_delegate.cc index b1eeb645963bcb8047eab4822925a259de064537..0acc165c552bef96097d8ccc320eb4d728dac0a9 100644 --- a/libcef/browser/browser_platform_delegate.cc +++ b/libcef/browser/browser_platform_delegate.cc @@ -495,15 +495,6 @@ int CefBrowserPlatformDelegate::GetShrinkViewportHeight() { } #endif -#ifdef OHOS_DISPLAY_CUTOUT -void CefBrowserPlatformDelegate::OnSafeInsetsChange(int left, - int top, - int right, - int bottom) { - NOTIMPLEMENTED(); -} -#endif - #ifdef OHOS_AI void CefBrowserPlatformDelegate::CreateOverlay(const gfx::ImageSkia& image, const gfx::Rect& image_rect, @@ -516,11 +507,24 @@ void CefBrowserPlatformDelegate::OnTextSelected(bool flag) { DCHECK(false); } +void CefBrowserPlatformDelegate::OnDestroyImageAnalyzerOverlay() { + DCHECK(false); +} + float CefBrowserPlatformDelegate::GetPageScaleFactor() { return 1; } #endif +#ifdef OHOS_DISPLAY_CUTOUT +void CefBrowserPlatformDelegate::OnSafeInsetsChange(int left, + int top, + int right, + int bottom) { + NOTIMPLEMENTED(); +} +#endif + #if defined(OHOS_SOFTWARE_COMPOSITOR) bool CefBrowserPlatformDelegate::WebPageSnapshot( const char* id, diff --git a/libcef/browser/browser_platform_delegate.h b/libcef/browser/browser_platform_delegate.h index fdb65214422c079124216fe4c618f2ce6d43f76e..ec61a09d7270490c2c3a3bea5127867bc3cf90cd 100644 --- a/libcef/browser/browser_platform_delegate.h +++ b/libcef/browser/browser_platform_delegate.h @@ -467,6 +467,7 @@ class CefBrowserPlatformDelegate { int32_t height, double keyboard) {} virtual bool ShouldVirtualKeyboardOverlay() { return false; } + virtual void OnNativeEmbedLifecycleChange( const CefRenderHandler::CefNativeEmbedData& info) {} virtual void OnNativeEmbedVisibilityChange( @@ -480,19 +481,20 @@ class CefBrowserPlatformDelegate { virtual int GetShrinkViewportHeight(); #endif -#ifdef OHOS_DISPLAY_CUTOUT - virtual void OnSafeInsetsChange(int left, int top, int right, int bottom); -#endif - #ifdef OHOS_AI virtual void CreateOverlay(const gfx::ImageSkia& image, const gfx::Rect& image_rect, const gfx::Point& touch_point, const gfx::Rect& screen_rect); virtual void OnTextSelected(bool flag); + virtual void OnDestroyImageAnalyzerOverlay(); virtual float GetPageScaleFactor(); #endif +#ifdef OHOS_DISPLAY_CUTOUT + virtual void OnSafeInsetsChange(int left, int top, int right, int bottom); +#endif + #if defined(OHOS_SOFTWARE_COMPOSITOR) virtual bool WebPageSnapshot(const char* id, int width, diff --git a/libcef/browser/browser_platform_delegate_unittest.cc b/libcef/browser/browser_platform_delegate_unittest.cc new file mode 100644 index 0000000000000000000000000000000000000000..9c3febf13f672be47468f2215a5190621d317900 --- /dev/null +++ b/libcef/browser/browser_platform_delegate_unittest.cc @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define protected public +#include "libcef/browser/browser_platform_delegate.h" +#undef protected + +#include "libcef/browser/alloy/alloy_browser_host_impl.h" + +#include "base/logging.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/browser/render_widget_host.h" +#include "content/public/browser/render_widget_host_view.h" + +#include +#include + +std::shared_ptr g_browser_platform_delegate; + +class CefBrowserPlatformDelegateTest : public testing::Test { + public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); +}; + +void CefBrowserPlatformDelegateTest::SetUpTestCase(void) {} + +void CefBrowserPlatformDelegateTest::TearDownTestCase(void) {} + +void CefBrowserPlatformDelegateTest::SetUp(void) { + g_browser_platform_delegate = std::make_shared(); + ASSERT_NE(g_browser_platform_delegate, nullptr); +} + +void CefBrowserPlatformDelegateTest::TearDown(void) { + g_browser_platform_delegate = nullptr; +} + +TEST_F(CefBrowserPlatformDelegateTest, WebPageSnapshot) { + const char* id = "test_id"; + int width = 1024; + int height = 768; + bool result = false; + + result = g_browser_platform_delegate->WebPageSnapshot( + id, width, height, + base::BindOnce([](const char* str, bool is, void* ptr, int a, int b) {})); + EXPECT_FALSE(result); +} \ No newline at end of file diff --git a/libcef/browser/certificate_query.cc b/libcef/browser/certificate_query.cc index 220bdc481f26047ea49ba5d7a096e190af19c046..cfbafcde065dc0629a6b87591962e242fbaf9d02 100644 --- a/libcef/browser/certificate_query.cc +++ b/libcef/browser/certificate_query.cc @@ -209,7 +209,6 @@ CertificateErrorCallback AllowAllCertificateError( new CefAllowCertificateErrorCallbackImpl(std::move(callback))); result = OnCertificateError(web_contents, cert_error, sslInfo, request_url, is_main_frame_request, strict_enforcement, origin_url, referrer, mainCallbackImpl, true); - if (!result) { callback = mainCallbackImpl->Disconnect(); LOG_IF(ERROR, callback.is_null()) << "Should return true from OnCertificateError when executing the callback"; diff --git a/libcef/browser/chrome/chrome_content_browser_client_cef.cc b/libcef/browser/chrome/chrome_content_browser_client_cef.cc index b875ed946b28aae48ba1f219d601357a41ad47e1..055b3f1d8eebf19fb4853981684543fe2fc691a8 100644 --- a/libcef/browser/chrome/chrome_content_browser_client_cef.cc +++ b/libcef/browser/chrome/chrome_content_browser_client_cef.cc @@ -170,7 +170,7 @@ void ChromeContentBrowserClientCef::AllowCertificateError( #ifdef OHOS_NETWORK_LOAD auto returned_callback = certificate_query::AllowAllCertificateError( web_contents, cert_error, ssl_info, request_url, is_main_frame_request, - strict_enforcement, + strict_enforcement, origin_url, referrer, std::move(callback), /*default_disallow=*/false @@ -178,7 +178,7 @@ void ChromeContentBrowserClientCef::AllowCertificateError( #else auto returned_callback = certificate_query::AllowCertificateError( web_contents, cert_error, ssl_info, request_url, is_main_frame_request, - strict_enforcement, + strict_enforcement, std::move(callback), /*default_disallow=*/false ); #endif diff --git a/libcef/browser/context.cc b/libcef/browser/context.cc index 495c0e521248b1998d2b8d8470c5f246051b2499..308d5dc827a2fd3d1d383598f66bbb6c05a3db62 100644 --- a/libcef/browser/context.cc +++ b/libcef/browser/context.cc @@ -486,15 +486,15 @@ void CefSetDownloadHandler(CefRefPtr download_handler) { #endif // OHOS_EX_DOWNLOAD } -CefRefPtr CefGetDownloadItem(const std::string& guid){ +CefRefPtr CefGetDownloadItem(const std::string& guid) { LOG(DEBUG) << "get download item for " << guid; - for(auto& context: CefBrowserContext::GetAll()){ + for (auto& context: CefBrowserContext::GetAll()) { content::DownloadManager* manager = context->AsBrowserContext()->GetDownloadManager(); - if(!manager){ + if (!manager) { continue; } download::DownloadItem* item = manager->GetDownloadByGuid(guid); - if(item){ + if (item) { CefRefPtr download_item( new CefDownloadItemImpl(item)); return download_item; @@ -688,6 +688,10 @@ void CefContext::PopulateGlobalRequestContextSettings( #if defined(OHOS_INCOGNITO_MODE) settings->incognito_mode = false; #endif + +#if defined(OHOS_ARKWEB_EXTENSIONS) + settings->global_request_context = nullptr; +#endif } #if defined(OHOS_INCOGNITO_MODE) @@ -704,6 +708,10 @@ void CefContext::PopulateGlobalOTRRequestContextSettings( settings->cookieable_schemes_exclude_defaults = settings_.cookieable_schemes_exclude_defaults; settings->incognito_mode = true; + +#if defined(OHOS_ARKWEB_EXTENSIONS) + settings->global_request_context = nullptr; +#endif } #endif diff --git a/libcef/browser/download_manager_delegate.cc b/libcef/browser/download_manager_delegate.cc index 29255524a5dd95fdaab7b7bc4a6e46573da295e6..44d8e48176402bc4e197b4d512d121f70cdf2aa2 100644 --- a/libcef/browser/download_manager_delegate.cc +++ b/libcef/browser/download_manager_delegate.cc @@ -53,9 +53,9 @@ class CefBeforeDownloadCallbackImpl : public CefBeforeDownloadCallback { suggested_name_(suggested_name), callback_(std::move(callback)) { #if defined(OHOS_EX_DOWNLOAD) - download_id_for_ohos_ = download_id; + download_id_for_ohos_ = download_id; #endif - } +} CefBeforeDownloadCallbackImpl(const CefBeforeDownloadCallbackImpl&) = delete; CefBeforeDownloadCallbackImpl& operator=( @@ -462,10 +462,12 @@ void CefDownloadManagerDelegate::OnDownloadCreated(DownloadManager* manager, // associated WebContents and consequently no associated CEF browser. In // that case DetermineDownloadTarget will be called before this method. // TODO(cef): Figure out how to expose this via a client callback. +#if !defined(OHOS_EX_DOWNLOAD) const std::vector& url_chain = item->GetUrlChain(); if (!url_chain.empty()) { LOG(INFO) << "Rejected download of " << url_chain.back().spec(); } +#endif #if defined(OHOS_EX_DOWNLOAD) // When download item not has associated browser, do not cancel the download item. #else diff --git a/libcef/browser/extensions/api/tabs/tabs_api.cc b/libcef/browser/extensions/api/tabs/tabs_api.cc index 8da799d3b57911ba532ca2b9cbe87d56309dae8d..eb6f446616b5928b14bdef1fe103680cac10f547 100644 --- a/libcef/browser/extensions/api/tabs/tabs_api.cc +++ b/libcef/browser/extensions/api/tabs/tabs_api.cc @@ -212,6 +212,9 @@ bool TabsUpdateFunction::UpdateURL(const std::string& url_string, return false; } +#if defined(OHOS_ARKWEB_EXTENSIONS) + web_contents_->WebExtensionUpdateTabUrl(tab_id, url); +#else content::NavigationController::LoadURLParams load_params(url); // Treat extension-initiated navigations as renderer-initiated so that the URL @@ -234,7 +237,7 @@ bool TabsUpdateFunction::UpdateURL(const std::string& url_string, DCHECK_EQ(url, web_contents_->GetController().GetPendingEntry()->GetVirtualURL()); - +#endif return true; } @@ -545,5 +548,31 @@ ExtensionFunction::ResponseAction TabsGetZoomSettingsFunction::Run() { ArgumentList(api::tabs::GetZoomSettings::Results::Create(zoom_settings))); } +#if defined(OHOS_ARKWEB_EXTENSIONS) +ExtensionFunction::ResponseAction TabsReloadFunction::Run() { + absl::optional params = + tabs::Reload::Params::Create(args()); + EXTENSION_FUNCTION_VALIDATE(params); + + bool bypass_cache = false; + if (params->reload_properties && params->reload_properties->bypass_cache) { + bypass_cache = *params->reload_properties->bypass_cache; + } + + int tab_id = params->tab_id ? *params->tab_id : -1; + content::WebContents* web_contents = GetWebContents(tab_id); + if (!web_contents) { + return RespondNow(Error(std::move(error_))); + } + + web_contents->GetController().Reload( + bypass_cache ? content::ReloadType::BYPASSING_CACHE + : content::ReloadType::NORMAL, + true); + + return RespondNow(NoArguments()); +} +#endif + } // namespace cef } // namespace extensions diff --git a/libcef/browser/extensions/api/tabs/tabs_api.h b/libcef/browser/extensions/api/tabs/tabs_api.h index 409d758db5f9620a6ea1a370d403d3136a2a056b..cc7bf54a9c25b566e156d78e1a7f0d30464d4339 100644 --- a/libcef/browser/extensions/api/tabs/tabs_api.h +++ b/libcef/browser/extensions/api/tabs/tabs_api.h @@ -181,6 +181,15 @@ class TabsGetZoomSettingsFunction : public BaseAPIFunction { DECLARE_EXTENSION_FUNCTION("tabs.getZoomSettings", TABS_GETZOOMSETTINGS) }; +#if defined(OHOS_ARKWEB_EXTENSIONS) +class TabsReloadFunction : public BaseAPIFunction { +private: + ~TabsReloadFunction() override {} + ResponseAction Run() override; + DECLARE_EXTENSION_FUNCTION("tabs.reload", TABS_RELOAD) +}; +#endif + } // namespace cef } // namespace extensions diff --git a/libcef/browser/extensions/api/tabs/tabs_event_router.cc b/libcef/browser/extensions/api/tabs/tabs_event_router.cc new file mode 100644 index 0000000000000000000000000000000000000000..a0e13ba1a7a21bae13c4f1eb1d5e70be9f08b9c4 --- /dev/null +++ b/libcef/browser/extensions/api/tabs/tabs_event_router.cc @@ -0,0 +1,164 @@ +// Copyright 2013 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "libcef/browser/extensions/api/tabs/tabs_event_router.h" + +#include + +#include +#include +#include + +#include "base/functional/bind.h" +#include "chrome/browser/extensions/api/tabs/tabs_constants.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/common/extensions/extension_constants.h" +#include "content/public/browser/browser_context.h" +#include "content/public/browser/favicon_status.h" +#include "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/web_contents.h" +#include "extensions/common/features/feature.h" +#include "extensions/common/mojom/event_dispatcher.mojom-forward.h" +#include "third_party/abseil-cpp/absl/types/optional.h" +#include "ui/gfx/geometry/size.h" + +using base::Value; +using content::WebContents; + +namespace extensions { +namespace cef{ +namespace { + +bool HasValidMainFrameProcess(content::WebContents* contents) { + content::RenderFrameHost* main_frame_host = contents->GetPrimaryMainFrame(); + content::RenderProcessHost* process_host = main_frame_host->GetProcess(); + return process_host->IsReady() && process_host->IsInitializedAndNotDead(); +} + +api::tabs::TabStatus GetLoadingStatus(WebContents* contents) { + if (contents->IsLoading()) + return api::tabs::TAB_STATUS_LOADING; + + // Anything that isn't backed by a process is considered unloaded. + if (!HasValidMainFrameProcess(contents)) + return api::tabs::TAB_STATUS_UNLOADED; + + // Otherwise its considered loaded. + return api::tabs::TAB_STATUS_COMPLETE; +} + +api::tabs::MutedInfo CreateMutedInfo( + content::WebContents* contents) { + DCHECK(contents); + api::tabs::MutedInfo info; + info.muted = contents->IsAudioMuted(); + return info; +} + +api::tabs::Tab CreateTabObject( + int tab_id, + WebContents* contents, + const std::string& url) { + api::tabs::Tab tab_object; + tab_object.id = tab_id; + tab_object.index = -1; + tab_object.window_id = -1; + tab_object.status = GetLoadingStatus(contents); + tab_object.active = false; + tab_object.selected = false; + tab_object.highlighted = false; + tab_object.pinned = false; + tab_object.group_id = -1; + tab_object.audible = false; + tab_object.discarded = false; + tab_object.auto_discardable = false; + tab_object.muted_info = CreateMutedInfo(contents); + tab_object.incognito = contents->GetBrowserContext()->IsOffTheRecord(); + gfx::Size contents_size = contents->GetContainerBounds().size(); + tab_object.width = contents_size.width(); + tab_object.height = contents_size.height(); + tab_object.url = url.length() > 0 ? url : + contents->GetLastCommittedURL().spec(); + + content::NavigationEntry* pending_entry = + contents->GetController().GetPendingEntry(); + if (pending_entry) { + tab_object.pending_url = pending_entry->GetVirtualURL().spec(); + } + tab_object.title = base::UTF16ToUTF8(contents->GetTitle()); + content::NavigationEntry* visible_entry = + contents->GetController().GetVisibleEntry(); + if (visible_entry && visible_entry->GetFavicon().valid) { + tab_object.fav_icon_url = visible_entry->GetFavicon().url.spec(); + } + return tab_object; +} + +bool WillDispatchTabUpdatedEvent( + int tab_id, + WebContents* contents, + std::string url, + const std::vector changed_property_names, + content::BrowserContext* browser_context, + Feature::Context target_context, + const Extension* extension, + const base::Value::Dict* listener_filter, + absl::optional& event_args_out, + mojom::EventFilteringInfoPtr& event_filtering_info_out) { + api::tabs::Tab tab_object = CreateTabObject(tab_id, contents, url); + + base::Value::Dict tab_value = tab_object.ToValue(); + + base::Value::Dict changed_properties; + for (const auto& property : changed_property_names) { + if (const base::Value* value = tab_value.Find(property)) { + changed_properties.Set(property, value->Clone()); + } + } + + event_args_out.emplace(); + event_args_out->Append(tab_id); + event_args_out->Append(std::move(changed_properties)); + event_args_out->Append(std::move(tab_value)); + return true; +} + +} // namespace + +TabsEventRouter::TabsEventRouter(Profile* profile) : profile_(profile) { + DCHECK(!profile->IsOffTheRecord()); +} + +TabsEventRouter::~TabsEventRouter() {} + +void TabsEventRouter::DispatchTabUpdatedEvent( + int tab_id, + WebContents* contents, + const std::vector& changed_property_names, + const std::string& url) { + DCHECK(!changed_property_names.empty()); + DCHECK(contents); + + std::vector changes = changed_property_names; + if (url.length() > 0) { + changes.push_back(tabs_constants::kStatusKey); + } + + Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); + + auto event = std::make_unique( + events::TABS_ON_UPDATED, api::tabs::OnUpdated::kEventName, + // The event arguments depend on the extension's permission. They are set + // in WillDispatchTabUpdatedEvent(). + base::Value::List(), profile); + event->user_gesture = EventRouter::USER_GESTURE_NOT_ENABLED; + event->will_dispatch_callback = + base::BindRepeating(&WillDispatchTabUpdatedEvent, tab_id, + contents, url, std::move(changes)); + EventRouter::Get(profile)->BroadcastEvent(std::move(event)); +} + +} // namespace cef +} // namespace extensions diff --git a/libcef/browser/extensions/api/tabs/tabs_event_router.h b/libcef/browser/extensions/api/tabs/tabs_event_router.h new file mode 100644 index 0000000000000000000000000000000000000000..0790c7a497864ca3eff316fdc78ce8cde4e968ad --- /dev/null +++ b/libcef/browser/extensions/api/tabs/tabs_event_router.h @@ -0,0 +1,55 @@ +// Copyright 2013 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_EVENT_ROUTER_H_ +#define CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_EVENT_ROUTER_H_ + +#include +#include +#include + +#include "base/memory/raw_ptr.h" +#include "base/scoped_multi_source_observation.h" +#include "base/scoped_observation.h" +#include "libcef/browser/extensions/api/tabs/tabs_api.h" +#include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/event_router.h" + +namespace content { +class WebContents; +} + +namespace extensions { +namespace cef { + +// The TabsEventRouter listens to tab events and routes them to listeners inside +// extension process renderers. +// TabsEventRouter will only route events from windows/tabs within a profile to +// extension processes in the same profile. +class TabsEventRouter { + public: + explicit TabsEventRouter(Profile* profile); + + TabsEventRouter(const TabsEventRouter&) = delete; + TabsEventRouter& operator=(const TabsEventRouter&) = delete; + + ~TabsEventRouter(); + + // Packages |changed_property_names| as a tab updated event for the tab + // |contents| and dispatches the event to the extension. + void DispatchTabUpdatedEvent( + int tab_id, + content::WebContents* contents, + const std::vector& changed_property_names, + const std::string& url); + + private: + // The main profile that owns this event router. + raw_ptr profile_; +}; + +} // namespace cef +} // namespace extensions + +#endif // CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_EVENT_ROUTER_H_ diff --git a/libcef/browser/extensions/api/tabs/tabs_windows_api.cc b/libcef/browser/extensions/api/tabs/tabs_windows_api.cc new file mode 100644 index 0000000000000000000000000000000000000000..84ecafe990c4743d091cacc7230eae668df3a64a --- /dev/null +++ b/libcef/browser/extensions/api/tabs/tabs_windows_api.cc @@ -0,0 +1,93 @@ +// Copyright 2012 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "libcef/browser/extensions/api/tabs/tabs_windows_api.h" + +#include + +#include "base/lazy_instance.h" +#include "chrome/browser/profiles/profile.h" +#include "libcef/browser/extensions/api/tabs/tabs_event_router.h" +#include "libcef/browser/extensions/api/tabs/tabs_api.h" +#include "extensions/browser/event_router.h" +#include "extensions/browser/extension_system.h" + +namespace extensions { +namespace cef { + +TabsWindowsAPI::TabsWindowsAPI(content::BrowserContext* context) + : browser_context_(context) { + EventRouter* event_router = EventRouter::Get(browser_context_); + + // Register these events' observer for initialize tabs_event_router. + // Tabs API Events. + event_router->RegisterObserver(this, api::tabs::OnCreated::kEventName); + event_router->RegisterObserver(this, api::tabs::OnUpdated::kEventName); + event_router->RegisterObserver(this, api::tabs::OnMoved::kEventName); + event_router->RegisterObserver(this, + api::tabs::OnSelectionChanged::kEventName); + event_router->RegisterObserver(this, api::tabs::OnActiveChanged::kEventName); + event_router->RegisterObserver(this, api::tabs::OnActivated::kEventName); + event_router->RegisterObserver(this, + api::tabs::OnHighlightChanged::kEventName); + event_router->RegisterObserver(this, api::tabs::OnHighlighted::kEventName); + event_router->RegisterObserver(this, api::tabs::OnDetached::kEventName); + event_router->RegisterObserver(this, api::tabs::OnAttached::kEventName); + event_router->RegisterObserver(this, api::tabs::OnRemoved::kEventName); + event_router->RegisterObserver(this, api::tabs::OnReplaced::kEventName); + event_router->RegisterObserver(this, api::tabs::OnZoomChange::kEventName); + + // Windows API Events. + event_router->RegisterObserver(this, api::windows::OnCreated::kEventName); + event_router->RegisterObserver(this, api::windows::OnRemoved::kEventName); + event_router->RegisterObserver(this, + api::windows::OnFocusChanged::kEventName); + event_router->RegisterObserver(this, + api::windows::OnBoundsChanged::kEventName); +} + +TabsWindowsAPI::~TabsWindowsAPI() { +} + +// static +TabsWindowsAPI* TabsWindowsAPI::Get(content::BrowserContext* context) { + return BrowserContextKeyedAPIFactory::Get(context); +} + +TabsEventRouter* TabsWindowsAPI::tabs_event_router() { + if (!tabs_event_router_.get()) { + tabs_event_router_ = std::make_unique( + Profile::FromBrowserContext(browser_context_)); + } + return tabs_event_router_.get(); +} + +void TabsWindowsAPI::TabUpdated(int tab_id, + content::WebContents* contents, + const std::vector& changed_property_names, + const std::string& url) { + tabs_event_router()->DispatchTabUpdatedEvent( + tab_id, contents, changed_property_names, url); +} + +void TabsWindowsAPI::Shutdown() { + EventRouter::Get(browser_context_)->UnregisterObserver(this); +} + +static base::LazyInstance>:: + DestructorAtExit g_tabs_windows_api_factory = LAZY_INSTANCE_INITIALIZER; + +BrowserContextKeyedAPIFactory* +TabsWindowsAPI::GetFactoryInstance() { + return g_tabs_windows_api_factory.Pointer(); +} + +void TabsWindowsAPI::OnListenerAdded(const EventListenerInfo& details) { + // Initialize the event routers. + tabs_event_router(); + EventRouter::Get(browser_context_)->UnregisterObserver(this); +} + +} // namespace cef +} // namespace extensions diff --git a/libcef/browser/extensions/api/tabs/tabs_windows_api.h b/libcef/browser/extensions/api/tabs/tabs_windows_api.h new file mode 100644 index 0000000000000000000000000000000000000000..acc721239e3a89b78d77af8c81882256515ca353 --- /dev/null +++ b/libcef/browser/extensions/api/tabs/tabs_windows_api.h @@ -0,0 +1,62 @@ +// Copyright 2012 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_WINDOWS_API_H_ +#define CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_WINDOWS_API_H_ + +#include + +#include "base/memory/raw_ptr.h" +#include "components/keyed_service/core/keyed_service.h" +#include "content/public/browser/web_contents.h" +#include "extensions/browser/browser_context_keyed_api_factory.h" +#include "extensions/browser/event_router.h" + +namespace extensions { +namespace cef { + +class TabsEventRouter; + +class TabsWindowsAPI : public BrowserContextKeyedAPI, + public EventRouter::Observer { + public: + explicit TabsWindowsAPI(content::BrowserContext* context); + ~TabsWindowsAPI() override; + + // Convenience method to get the TabsWindowsAPI for a profile. + static TabsWindowsAPI* Get(content::BrowserContext* context); + + TabsEventRouter* tabs_event_router(); + + // KeyedService implementation. + void Shutdown() override; + + // BrowserContextKeyedAPI implementation. + static BrowserContextKeyedAPIFactory* GetFactoryInstance(); + + // EventRouter::Observer implementation. + void OnListenerAdded(const extensions::EventListenerInfo& details) override; + + void TabUpdated(int tab_id, + content::WebContents* contents, + const std::vector& changed_property_names, + const std::string& url); + + private: + friend class BrowserContextKeyedAPIFactory; + + raw_ptr browser_context_; + + // BrowserContextKeyedAPI implementation. + static const char* service_name() { + return "TabsWindowsAPI"; + } + + std::unique_ptr tabs_event_router_; +}; + +} // namespace cef +} // namespace extensions + +#endif // CEF_LIBCEF_BROWSER_EXTENSIONS_API_TABS_TABS_WINDOWS_API_H_ diff --git a/libcef/browser/extensions/browser_extensions_util.cc b/libcef/browser/extensions/browser_extensions_util.cc index 9a780e22971179cacd5ea06ea4840f0a22555f4a..b495680bdea08768e35cb8775d238434c1952032 100644 --- a/libcef/browser/extensions/browser_extensions_util.cc +++ b/libcef/browser/extensions/browser_extensions_util.cc @@ -167,6 +167,37 @@ CefRefPtr GetBrowserForTabId( return nullptr; } +#if defined(OHOS_ARKWEB_EXTENSIONS) +/* + * Sometimes the extension function is called from background script, and it's + * windowless AlloyBrowser does not have a client or handler. + * Try to get an AlloyBrowserHostImpl with a non-null client, that means it has + * a nweb_handler can be used to interact with APP. + */ +CefRefPtr GetClientAvailableBrowser(int tab_id) { + for (const auto& browser_info : + CefBrowserInfoManager::GetInstance()->GetBrowserInfoList()) { + CefRefPtr current_browser = + static_cast(browser_info->browser().get()); + if (current_browser && + current_browser->GetTabId() == tab_id && tab_id >= 0) { + return current_browser; + } + } + + for (const auto& browser_info : + CefBrowserInfoManager::GetInstance()->GetBrowserInfoList()) { + CefRefPtr current_browser = + static_cast(browser_info->browser().get()); + if (current_browser && + current_browser->web_contents() && current_browser->client()) { + return current_browser; + } + } + return nullptr; +} +#endif + const Extension* GetExtensionForUrl(content::BrowserContext* browser_context, const GURL& url) { ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context); diff --git a/libcef/browser/extensions/browser_extensions_util.h b/libcef/browser/extensions/browser_extensions_util.h index b4adb7bafdd838565b90105f43e2cca30da5d3f5..12c3cf38446c353e2e4d6ad0a1be738977c3bc93 100644 --- a/libcef/browser/extensions/browser_extensions_util.h +++ b/libcef/browser/extensions/browser_extensions_util.h @@ -53,6 +53,16 @@ CefRefPtr GetOwnerBrowserForHost( content::RenderFrameHost* host, bool* is_guest_view); +#if defined(OHOS_ARKWEB_EXTENSIONS) +/* + * Sometimes the extension function is called from background script, and it's + * windowless AlloyBrowser does not have a client or handler. + * Try to get an AlloyBrowserHostImpl with a non-null client, that means it has + * a nweb_handler can be used to interact with APP. + */ +CefRefPtr GetClientAvailableBrowser(int tab_id); +#endif + // Returns the browser matching |tab_id| and |browser_context|. Returns false if // |tab_id| is < 0 or a matching browser cannot be found within // |browser_context|. Similar in concept to ExtensionTabUtil::GetTabById. diff --git a/libcef/browser/extensions/chrome_api_registration.cc b/libcef/browser/extensions/chrome_api_registration.cc index f3853f3e7439561847e2e7627293cc678b4814fb..ec8821cba2bba4d4290ce3853fc464fd2fee2389 100644 --- a/libcef/browser/extensions/chrome_api_registration.cc +++ b/libcef/browser/extensions/chrome_api_registration.cc @@ -66,6 +66,14 @@ const char* const kSupportedAPIs[] = { EXTENSION_FUNCTION_NAME(cefimpl::TabsGetZoomFunction), EXTENSION_FUNCTION_NAME(cefimpl::TabsSetZoomSettingsFunction), EXTENSION_FUNCTION_NAME(cefimpl::TabsGetZoomSettingsFunction), +#if defined(OHOS_ARKWEB_EXTENSIONS) + EXTENSION_FUNCTION_NAME(cefimpl::TabsReloadFunction), +#endif +#if defined(OHOS_ARKWEB_EXTENSIONS) + // chrome.extension.getURL()'s implementation is in the renderer. + "extension", + "extension.getURL", +#endif #if defined(OHOS_ARKWEB_EXTENSIONS) "developerPrivate", EXTENSION_FUNCTION_NAME(DeveloperPrivateGetExtensionsInfoFunction), @@ -153,6 +161,7 @@ void ChromeFunctionRegistry::RegisterAll(ExtensionFunctionRegistry* registry) { registry->RegisterFunction(); registry->RegisterFunction(); registry->RegisterFunction(); + registry->RegisterFunction(); #endif } diff --git a/libcef/browser/extensions/component_extension_resource_manager.cc b/libcef/browser/extensions/component_extension_resource_manager.cc index d8ec4f42128dd61d52cb33efa7e335b57496000f..627ec7e5f56c7a9e834ed35fda10d5ebd2e44a7d 100644 --- a/libcef/browser/extensions/component_extension_resource_manager.cc +++ b/libcef/browser/extensions/component_extension_resource_manager.cc @@ -32,7 +32,7 @@ CefComponentExtensionResourceManager::CefComponentExtensionResourceManager() { bool enable_printing = true; #if BUILDFLAG(IS_OHOS) - // The printing service is temporarily not supported on mobile device. + // The printing service is temporarily supported on pc device. enable_printing = (*base::CommandLine::ForCurrentProcess()).HasSwitch( switches::kEnablePrinting); #endif diff --git a/libcef/browser/extensions/extension_function_details.cc b/libcef/browser/extensions/extension_function_details.cc index efed281fb93dd80c9b49da51c4d377ac466e654b..60fc48a8e2e5b1cf2fcb107f5e7d3450ac838d4b 100644 --- a/libcef/browser/extensions/extension_function_details.cc +++ b/libcef/browser/extensions/extension_function_details.cc @@ -222,6 +222,17 @@ CefExtensionFunctionDetails::GetBrowserForTabIdFirstTime( CefRefPtr browser; +#if defined(OHOS_ARKWEB_EXTENSIONS) + // TODO: The mapping between tab_id and nweb_id should be supported. + // tab_id <-> nweb_id <-> browser_id <-> web_contents + browser = GetClientAvailableBrowser(tab_id); + if (browser) { + LOG(INFO) << "Found a client available browser for " << function_->name() + << " interact with tab()" << tab_id << ")"; + return browser; + } +#endif + if (tab_id >= 0) { // May be an invalid tabId or in the wrong BrowserContext. browser = GetBrowserForTabId(tab_id, function_->browser_context()); diff --git a/libcef/browser/extensions/extension_host_delegate.cc b/libcef/browser/extensions/extension_host_delegate.cc index 6720ea23ab238d71b579b847cd0c8ddb77fe7c70..529dae50a93c2609fc7ae8b2681de8daa70f040d 100644 --- a/libcef/browser/extensions/extension_host_delegate.cc +++ b/libcef/browser/extensions/extension_host_delegate.cc @@ -10,6 +10,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#if defined(OHOS_ARKWEB_EXTENSIONS) +#include "chrome/browser/extensions/extension_service.h" +#include "extensions/browser/extension_host.h" +#include "extensions/browser/extension_system.h" +#endif + namespace extensions { CefExtensionHostDelegate::CefExtensionHostDelegate( @@ -21,7 +27,15 @@ void CefExtensionHostDelegate::OnExtensionHostCreated( content::WebContents* web_contents) {} void CefExtensionHostDelegate::OnMainFrameCreatedForBackgroundPage( - ExtensionHost* host) {} + ExtensionHost* host) { +#if defined(OHOS_ARKWEB_EXTENSIONS) + // Start connect devtools + ExtensionService* service = + ExtensionSystem::Get(host->browser_context())->extension_service(); + if (service) + service->DidCreateMainFrameForBackgroundPage(host); +#endif +} content::JavaScriptDialogManager* CefExtensionHostDelegate::GetJavaScriptDialogManager() { diff --git a/libcef/browser/extensions/extension_system.cc b/libcef/browser/extensions/extension_system.cc index c57e4ecff73840f18a344327549ffe1f9d41904c..13c421190586e9cb1afe9ef657fbf19daf7e1427 100644 --- a/libcef/browser/extensions/extension_system.cc +++ b/libcef/browser/extensions/extension_system.cc @@ -54,6 +54,7 @@ #if defined(OHOS_ARKWEB_EXTENSIONS) #include "base/base_switches.h" #include "base/command_line.h" +#include "cef/libcef/common/app_manager.h" #include "chrome/browser/extensions/chrome_app_sorting.h" #include "chrome/browser/extensions/chrome_content_verifier_delegate.h" #include "chrome/browser/extensions/component_loader.h" @@ -201,6 +202,9 @@ CefExtensionSystem::CefExtensionSystem(BrowserContext* browser_context) renderer_helper_( extensions::RendererStartupHelperFactory::GetForBrowserContext( browser_context)), +#if defined(OHOS_ARKWEB_EXTENSIONS) + global_request_context_(nullptr), +#endif weak_ptr_factory_(this) { InitPrefs(); } @@ -217,7 +221,7 @@ void CefExtensionSystem::Init() { profile, base::CommandLine::ForCurrentProcess(), profile->GetPath().AppendASCII(extensions::kInstallDirectoryName), profile->GetPath().AppendASCII(extensions::kUnpackedInstallDirectoryName), - ExtensionPrefs::Get(profile), Blocklist::Get(profile), false, true, + ExtensionPrefs::Get(profile), Blocklist::Get(profile), true, true, &ready_); #endif // There's complexity here related to the ordering of message delivery. For @@ -780,6 +784,63 @@ void CefExtensionSystem::UnloadExtension(const std::string& extension_id, } #if defined(OHOS_ARKWEB_EXTENSIONS) +void CefExtensionSystem::SetGlobalRequestContext(CefRequestContext* context) { + if (!global_request_context_) { + global_request_context_ = context; + } +} + +// Originally, Cef only supported loading Extensions through cef' api interfaces +// and creating CefExtension. Now it supports loading extensions from internal +// enterprise policies and extension management interfaces. This type of loading +// is not loaded through Cef's LoadExtension interface, so CefExtension is not +// created, resulting in no background script running environment. +void CefExtensionSystem::NotifyExtensionLoadedFromInternal( + const Extension* extension) { + if (!extension || GetExtension(extension->id())) { + // Extension invalid or CefExtension already added. + return; + } + + CefRefPtr context = CefRequestContext::GetGlobalContext(); + if (!context) { + // CefRequestContext::GetGlobalContext will be null at startup during + // CefRequestContextImpl::CreateGlobalRequestContext + // -> CefRequestContextImpl::Initialize() + // -> AlloyMainDelegate::CreateNewBrowserContext() + // -> AlloyBrowserContext::Initialize() + // -> ExtensionSystem::Init() + // -> ExtensionService::Init() + // -> component_loader_->LoadAll()/ + // -> InstalledLoader(this).LoadAllExtensions() + // But the CefRequestContext is an essential member in + // CefBrowserCreateParams during + // CefExtensionsBrowserClient::CreateBackgroundExtensionHost(). + context = global_request_context_; + } + + CefRefPtr cef_extension = + new CefExtensionImpl( + extension, context ? context.get() : nullptr, nullptr); + extension_map_.insert(std::make_pair(extension->id(), cef_extension)); +} + +void CefExtensionSystem::NotifyExtensionUnLoadedFromInternal( + const Extension* extension) { + if (!extension || !GetExtension(extension->id())) { + // Extension invalid or CefExtension already removed. + return; + } + + ExtensionMap::iterator it = extension_map_.find(extension->id()); + if (it == extension_map_.end()) { + // No CEF representation so we've already unloaded it. + return; + } + + extension_map_.erase(it); +} + void CefExtensionSystem::MaybeSpinUpLazyContext(const Extension* extension, bool is_newly_added) { DCHECK(BackgroundInfo::HasLazyContext(extension)); diff --git a/libcef/browser/extensions/extension_system.h b/libcef/browser/extensions/extension_system.h index fc17052f9641a979379224fd39d9d5cd40dafc75..fd774a6c1c36e00d44c7d03161f10c0816f224e8 100644 --- a/libcef/browser/extensions/extension_system.h +++ b/libcef/browser/extensions/extension_system.h @@ -120,6 +120,10 @@ class CefExtensionSystem : public ExtensionSystem { bool initialized() const { return initialized_; } +#if defined(OHOS_ARKWEB_EXTENSIONS) + void SetGlobalRequestContext(CefRequestContext* context); +#endif + private: virtual void InitPrefs(); @@ -161,6 +165,10 @@ class CefExtensionSystem : public ExtensionSystem { #if defined(OHOS_ARKWEB_EXTENSIONS) void InitInstallGates(); void MaybeSpinUpLazyContext(const Extension* extension, bool is_newly_added); + void NotifyExtensionLoadedFromInternal( + const Extension* extension) override; + void NotifyExtensionUnLoadedFromInternal( + const Extension* extension) override; #endif content::BrowserContext* browser_context_; // Not owned. @@ -200,6 +208,8 @@ class CefExtensionSystem : public ExtensionSystem { // For verifying the contents of extensions read from disk. scoped_refptr content_verifier_; std::unique_ptr uninstall_ping_sender_; + + CefRefPtr global_request_context_; #endif // Must be the last member. diff --git a/libcef/browser/extensions/extensions_browser_client.cc b/libcef/browser/extensions/extensions_browser_client.cc index 00f270408c3fe69f97c298f00c670c2a86241299..487f72ca4a3e554f75bc071a4f5b66e5ede613e3 100644 --- a/libcef/browser/extensions/extensions_browser_client.cc +++ b/libcef/browser/extensions/extensions_browser_client.cc @@ -274,6 +274,7 @@ bool CefExtensionsBrowserClient::CreateBackgroundExtensionHost( cef_browser_context->GetExtension(extension->id()); DCHECK(cef_extension); if (!cef_extension) { + LOG(INFO) << "Cancel the background host creation :" << extension->id(); // Cancel the background host creation. return true; } @@ -283,6 +284,7 @@ bool CefExtensionsBrowserClient::CreateBackgroundExtensionHost( CefRefPtr request_context = cef_extension->GetLoaderContext(); if (!request_context) { + LOG(INFO) << "request_context empty for :" << extension->id(); // Cancel the background host creation. return true; } @@ -309,6 +311,7 @@ bool CefExtensionsBrowserClient::CreateBackgroundExtensionHost( AlloyBrowserHostImpl::Create(create_params); if (browser) { *host = browser->GetExtensionHost(); + LOG(INFO) << "Background extension host created for :" << extension->id(); DCHECK(*host); } return true; diff --git a/libcef/browser/first_meaningful_paint_details_impl.cc b/libcef/browser/first_meaningful_paint_details_impl.cc index 940700c485baf9617fc2863fdb59ade83ad20b54..cfcdb171337f6c271c61531d5051dbd4a11fd59c 100644 --- a/libcef/browser/first_meaningful_paint_details_impl.cc +++ b/libcef/browser/first_meaningful_paint_details_impl.cc @@ -16,4 +16,4 @@ int64_t CefFirstMeaningfulPaintDetailsImpl::GetNavigationStartTime() { int64_t CefFirstMeaningfulPaintDetailsImpl::GetFirstMeaningfulPaintTime() { return firstMeaningfulPaintTime_; -} +} \ No newline at end of file diff --git a/libcef/browser/first_meaningful_paint_details_impl.h b/libcef/browser/first_meaningful_paint_details_impl.h index b66902c6ad08dca7c6370d4d515830a3f3ee6aa3..4ff88f97b339432025926f4c1e0b713392aa2734 100644 --- a/libcef/browser/first_meaningful_paint_details_impl.h +++ b/libcef/browser/first_meaningful_paint_details_impl.h @@ -30,4 +30,4 @@ class CefFirstMeaningfulPaintDetailsImpl: public CefFirstMeaningfulPaintDetails IMPLEMENT_REFCOUNTING(CefFirstMeaningfulPaintDetailsImpl); }; -#endif // CEF_LIBCEF_BROWSER_FIRST_MEANINGFUL_PAINT_DETAILS_IMPL_H_ +#endif // CEF_LIBCEF_BROWSER_FIRST_MEANINGFUL_PAINT_DETAILS_IMPL_H_ \ No newline at end of file diff --git a/libcef/browser/frame_host_impl.cc b/libcef/browser/frame_host_impl.cc index e495eb054b284f94bc1bb28b3e92eacb1416054e..0461a98ad19ad6c18d1bb7839bb28e9342c2e869 100644 --- a/libcef/browser/frame_host_impl.cc +++ b/libcef/browser/frame_host_impl.cc @@ -22,6 +22,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "services/service_manager/public/cpp/interface_provider.h" +#include "base/strings/escape.h" #if BUILDFLAG(IS_OHOS) #include "content/public/browser/browsing_data_remover.h" @@ -32,6 +33,10 @@ #include "third_party/skia/include/core/SkImage.h" #endif // BUILDFLAG(IS_OHOS) +#ifdef OHOS_CLIPBOARD +#include "skia/ext/image_operations.h" +#endif + #ifdef OHOS_NETWORK_LOAD #include "base/strings/escape.h" #endif @@ -82,6 +87,48 @@ void ExecWebContentsCommand(CefFrameHostImpl* fh, fh->SendCommand(command); } +#ifdef OHOS_CLIPBOARD +const int kMaxContextImageNodeSizeIfDownScale = 1024; + +bool NeedsDownScale(const gfx::Size& original_image_size) { + if (original_image_size.width() <= kMaxContextImageNodeSizeIfDownScale && + original_image_size.height() <= kMaxContextImageNodeSizeIfDownScale) { + return false; + } + LOG(DEBUG) << "The origin image size width: " << original_image_size.width() + << ", height: " << original_image_size.height(); + return true; +} + +SkBitmap DownScale(const SkBitmap& image) { + if (image.isNull()) { + return SkBitmap(); + } + + gfx::Size image_size(image.width(), image.height()); + if (!NeedsDownScale(image_size)) { + return image; + } + + gfx::SizeF scaled_size = gfx::SizeF(image_size); + + if (scaled_size.width() > kMaxContextImageNodeSizeIfDownScale) { + scaled_size.Scale(kMaxContextImageNodeSizeIfDownScale / + scaled_size.width()); + } + + if (scaled_size.height() > kMaxContextImageNodeSizeIfDownScale) { + scaled_size.Scale(kMaxContextImageNodeSizeIfDownScale / + scaled_size.height()); + } + + return skia::ImageOperations::Resize(image, + skia::ImageOperations::RESIZE_GOOD, + static_cast(scaled_size.width()), + static_cast(scaled_size.height())); +} +#endif + #define EXEC_WEBCONTENTS_COMMAND(name) \ ExecWebContentsCommand(this, &CefFrameHostImpl::name, \ &content::WebContents::name, #name); @@ -380,11 +427,11 @@ void CefFrameHostImpl::LoadRequest(cef::mojom::RequestParamsPtr params) { void CefFrameHostImpl::LoadURLWithUserGesture(const CefString& url, bool user_gesture) { LoadURLWithExtras(url, content::Referrer(), kPageTransitionExplicit, std::string() #ifdef OHOS_POST_URL - , +, std::string(), std::vector() #endif - , +, user_gesture); } #endif @@ -394,12 +441,12 @@ void CefFrameHostImpl::LoadURLWithExtras(const std::string& url, ui::PageTransition transition, const std::string& extra_headers #ifdef OHOS_POST_URL - , +, const std::string& method, const std::vector& post_data #endif #ifdef OHOS_NETWORK_LOAD - , +, bool user_gesture #endif ) { @@ -818,7 +865,7 @@ void CefFrameHostImpl::UpdateLocale(const CefString& locale) { #endif // #ifdef OHOS_I18N void CefFrameHostImpl::OnGetImageForContextNode( - cef::mojom::GetImageForContextNodeParamsPtr params) { + cef::mojom::GetImageForContextNodeParamsPtr params, int command_id) { CefImageImpl* image_impl = new (std::nothrow) CefImageImpl(); if (image_impl != nullptr && params->image.width() > 0 && params->image.height() > 0) { @@ -837,11 +884,11 @@ void CefFrameHostImpl::OnGetImageForContextNode( handler = client->GetContextMenuHandler(); } if (handler) { - handler->OnGetImageForContextNode(GetBrowser(), image); + handler->OnGetImageForContextNode(GetBrowser(), image, command_id); } } -void CefFrameHostImpl::OnGetImageForContextNodeNull() { +void CefFrameHostImpl::OnGetImageForContextNodeNull(int command_id) { CefRefPtr image(new CefImageImpl()); CefRefPtr handler = nullptr; auto browser = GetBrowserHostBase(); @@ -853,12 +900,13 @@ void CefFrameHostImpl::OnGetImageForContextNodeNull() { handler = client->GetContextMenuHandler(); } if (handler) { - handler->OnGetImageForContextNode(GetBrowser(), image); + handler->OnGetImageForContextNode(GetBrowser(), image, command_id); } } void CefFrameHostImpl::OnGetImageFromCache( std::string url, + int command_id, uint32_t buffer_size, base::ReadOnlySharedMemoryRegion region) { auto browser = GetBrowserHostBase(); @@ -879,27 +927,34 @@ void CefFrameHostImpl::OnGetImageFromCache( if (!region.IsValid()) { LOG(ERROR) << "OnGetImageFromCache: Read-only shared memory region is invalid"; - handler->OnGetImageFromCache(image_impl); + handler->OnGetImageFromCache(image_impl, command_id); return; } base::ReadOnlySharedMemoryMapping mapping = region.MapAt(0, buffer_size); if (!mapping.IsValid()) { LOG(ERROR) << "OnGetImageFromCache: Read-only shared memory mapping is invalid"; - handler->OnGetImageFromCache(image_impl); + handler->OnGetImageFromCache(image_impl, command_id); return; } uint8_t* buffer = (uint8_t*)(mapping.memory()); + sk_sp sk_data = SkData::MakeWithoutCopy(buffer, buffer_size); if (sk_data) { sk_sp sk_image = SkImages::DeferredFromEncodedData(sk_data); if (sk_image) { SkBitmap bitmap; - sk_image->asLegacyBitmap(&bitmap); - image_impl->AddBitmap(1.0, bitmap); + if (sk_image->asLegacyBitmap(&bitmap)) { +#ifdef OHOS_CLIPBOARD + SkBitmap resize_image = DownScale(bitmap); + image_impl->AddBitmap(1.0, resize_image); +#else + image_impl->AddBitmap(1.0, bitmap); +#endif + } } } - handler->OnGetImageFromCache(image_impl); + handler->OnGetImageFromCache(image_impl, command_id); } #ifdef OHOS_NETWORK_LOAD @@ -976,11 +1031,12 @@ void CefFrameHostImpl::SetJsOnlineProperty(bool network_up) { } #endif -void CefFrameHostImpl::GetImageForContextNode() { +void CefFrameHostImpl::GetImageForContextNode(int command_id) { SendToRenderFrame(__FUNCTION__, - base::BindOnce([](const RenderFrameType& render_frame) { - render_frame->GetImageForContextNode(); - })); + base::BindOnce([](int command_id, const RenderFrameType& render_frame) { + render_frame->GetImageForContextNode(command_id); + }, + command_id)); } void CefFrameHostImpl::PutZoomingForTextFactor(float factor) { @@ -1138,22 +1194,27 @@ void CefFrameHostImpl::SetScrollable(bool enable) { void CefFrameHostImpl::GetHitData(int& type, CefString& extra_data) { std::string temp_extra_data; - SendToRenderFrame(__FUNCTION__, - base::BindOnce( - [](int32_t* out_type, std::string* out_extra_data, - const RenderFrameType& render_frame) { - render_frame->GetHitData(out_type, out_extra_data); - }, - &type, &temp_extra_data)); + if (is_temporary()) { + extra_data = temp_extra_data; + return; + } else if (!render_frame_host_) { + extra_data = temp_extra_data; + return; + } + + if (!render_frame_.is_bound()) { + extra_data = temp_extra_data; + return; + } + render_frame_->GetHitData(&type, &temp_extra_data); extra_data = temp_extra_data; } void CefFrameHostImpl::UpdateDrawRect() { - SendToRenderFrame(__FUNCTION__, - base::BindOnce( - [](const RenderFrameType& render_frame) { - render_frame->UpdateDrawRect(); - })); + SendToRenderFrame(__FUNCTION__, base::BindOnce( + [](const RenderFrameType& render_frame) { + render_frame->UpdateDrawRect(); + })); } #if defined(OHOS_GET_SCROLL_OFFSET) diff --git a/libcef/browser/frame_host_impl.h b/libcef/browser/frame_host_impl.h index 0f6361264874263bd6cdcf6155e59bf4976e9105..ff7ef48e4595bd08828a5eafe50cab8dbbb37e77 100644 --- a/libcef/browser/frame_host_impl.h +++ b/libcef/browser/frame_host_impl.h @@ -178,6 +178,7 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame { cef::mojom::BrowserFrame::ShouldOverrideUrlLoadingCallback callback) override; void OnGetImageFromCache(std::string url, + int command_id, uint32_t buffer_size, base::ReadOnlySharedMemoryRegion region); @@ -185,8 +186,8 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame { void UpdateLocale(const CefString& locale); #endif // #ifdef OHOS_I18N void OnGetImageForContextNode( - cef::mojom::GetImageForContextNodeParamsPtr params) override; - void OnGetImageForContextNodeNull() override; + cef::mojom::GetImageForContextNodeParamsPtr params, int command_id) override; + void OnGetImageForContextNodeNull(int command_id) override; void LoadHeaderUrl(const CefString& url, const CefString& additionalHttpHeaders) override; // Send the touch point to the rederer to get hitdata. @@ -198,7 +199,7 @@ class CefFrameHostImpl : public CefFrame, public cef::mojom::BrowserFrame { void SetJsOnlineProperty(bool network_up); #endif - void GetImageForContextNode(); + void GetImageForContextNode(int command_id); // Sets the zoom factor for text only. Used in layout modes other than // Text Autosizing. diff --git a/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.cc b/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.cc index 06905adcea58d1bed474a2a13474af0549219671..cffab9907e73bb733215beaba5d8126b903dcc95 100644 --- a/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.cc +++ b/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.cc @@ -80,6 +80,7 @@ OhGinJavascriptBridgeDispatcherHost::~OhGinJavascriptBridgeDispatcherHost() { javascript_sync_permission_map_.clear(); javascript_async_permission_map_.clear(); object_id_map_.clear(); + async_object_id_map_.clear(); } // Run on the UI thread. @@ -159,8 +160,7 @@ void OhGinJavascriptBridgeDispatcherHost::RenderFrameCreated( // sync_method_map_ has no async method infomation, so send an empty list. base::Value::List empty_list; render_frame_host->Send(new OhGinJavascriptBridgeMsg_AddNamedObject( - render_frame_host->GetRoutingID(), object_name, object_id, empty_list, - false)); + render_frame_host->GetRoutingID(), object_name, object_id, empty_list, false)); } } } @@ -385,6 +385,7 @@ void OhGinJavascriptBridgeDispatcherHost::AddNamedObjectForWebController( async_object_pair.first = object_name; async_object_pair.second = async_method_set; async_method_map_[object_id_] = async_object_pair; + async_object_id_map_[object_id_].insert(object_name); ParseJson(permission, object_id_, true); } @@ -438,6 +439,7 @@ void OhGinJavascriptBridgeDispatcherHost::AddNamedObjectForWebViewController( async_object_pair.first = object_name; async_object_pair.second = async_method_set; async_method_map_[object_id] = async_object_pair; + async_object_id_map_[object_id].insert(object_name); ParseJson(permission, object_id, true); } @@ -553,7 +555,7 @@ void OhGinJavascriptBridgeDispatcherHost::RemoveNamedObject( const std::vector& method_list) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (sync_method_map_.empty() && async_method_map_.empty()) { - LOG(ERROR) << "OhGinJavascriptBridgeDispatcherHost::RemoveNamedObject:Map " + LOG(DEBUG) << "OhGinJavascriptBridgeDispatcherHost::RemoveNamedObject:Map " "is empty!"; return; } @@ -562,21 +564,23 @@ void OhGinJavascriptBridgeDispatcherHost::RemoveNamedObject( } bool OhGinJavascriptBridgeDispatcherHost::RemoveNamedObjectInternal( - const std::string& object_name, - bool is_async) { + const std::string& object_name, bool is_async) { + LOG(DEBUG) << "OhGinJavascriptBridgeDispatcherHost::RemoveNamedObjectInternal " + << "target object name: " << object_name; + auto& method_map = is_async ? async_method_map_ : sync_method_map_; bool ret = false; - auto& map = is_async ? async_method_map_ : sync_method_map_; - if (map.empty()) { - return ret = false; + if (method_map.empty()) { + return ret; } + auto& id_map = is_async ? async_object_id_map_ : object_id_map_; std::unique_lock lock(share_mutex_); - for (auto& [object_id, object_name_set] : object_id_map_) { + for (auto& [object_id, object_name_set] : id_map) { for (const std::string& now_object_name : object_name_set) { if (now_object_name == object_name) { object_name_set.erase(object_name); if (object_name_set.size() == 0) { - object_id_map_.erase(object_id); - map.erase(object_id); + id_map.erase(object_id); + method_map.erase(object_id); } ret = true; @@ -594,6 +598,7 @@ bool OhGinJavascriptBridgeDispatcherHost::RemoveNamedObjectInternal( new OhGinJavascriptBridgeMsg_RemoveNamedObject( render_frame_host->GetRoutingID(), copied_name)); }); + return ret; } } } diff --git a/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.h b/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.h index 181e0a263017b1121ae6cdb18921c50139f4caf0..e82b73de0aa3ff21d7055aeebbb31a7c8f6ffee5 100644 --- a/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.h +++ b/libcef/browser/javascript/oh_gin_javascript_bridge_dispatcher_host.h @@ -196,8 +196,9 @@ class OhGinJavascriptBridgeDispatcherHost PermissionMap javascript_async_permission_map_; std::shared_mutex share_mutex_; int32_t object_id_ = MIN_NATIVE_OBJ_ID; - std::unordered_map> object_id_map_; + std::unordered_map> object_id_map_; + std::unordered_map> async_object_id_map_; CefRefPtr client_; bool install_filter_when_render_process_gone_ = false; }; diff --git a/libcef/browser/javascript_dialog_manager.cc b/libcef/browser/javascript_dialog_manager.cc index 2e318b4fac280417e8b1f461fd5ca77902ac0b39..97d60c34ab12a04785703fd45712354a0ab273db 100644 --- a/libcef/browser/javascript_dialog_manager.cc +++ b/libcef/browser/javascript_dialog_manager.cc @@ -16,12 +16,38 @@ #include "components/javascript_dialogs/tab_modal_dialog_manager.h" #if BUILDFLAG(IS_OHOS) +#include + +#include "base/base_switches.h" +#include "base/command_line.h" #include "components/strings/grit/components_strings.h" +#include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" #endif namespace { +#if BUILDFLAG(IS_OHOS) +constexpr int32_t API_TARGET_VERSION_12 = 12; +// Same as API_VERSION_MOD in js_ui_ability.cpp of ability_runtime +constexpr int32_t API_VERSION_MOD = 100; + +int32_t GetApiTargetVersion() { + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kOhosAppApiVersion)) { + LOG(ERROR) << "kOhosAppApiVersion not exist"; + return -1; + } + std::string apiVersion = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kOhosAppApiVersion); + if (apiVersion.empty()) { + return -1; + } + return std::stoi(apiVersion) % API_VERSION_MOD; +} +#endif + class CefJSDialogCallbackImpl : public CefJSDialogCallback { public: using CallbackType = content::JavaScriptDialogManager::DialogClosedCallback; @@ -175,8 +201,12 @@ void CefJavaScriptDialogManager::RunBeforeUnloadDialog( } #if BUILDFLAG(IS_OHOS) - const std::u16string& message_text = - l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE); + static int32_t api_target_version = GetApiTargetVersion(); + std::u16string message = u"Is it OK to leave/reload this page?"; + if (api_target_version >= API_TARGET_VERSION_12) { + message = l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE); + } + const std::u16string& message_text = message; #else const std::u16string& message_text = u"Is it OK to leave/reload this page?"; #endif diff --git a/libcef/browser/largest_contentful_paint_details_impl.cc b/libcef/browser/largest_contentful_paint_details_impl.cc index b371c315c2f494c3ffd2e251491c0732aceadb19..5191a1e3599c3dec1c0e96007e419dc7dee00523 100644 --- a/libcef/browser/largest_contentful_paint_details_impl.cc +++ b/libcef/browser/largest_contentful_paint_details_impl.cc @@ -40,4 +40,4 @@ int64_t CefLargestContentfulPaintDetailsImpl::GetLargestImageLoadEndTime() { double_t CefLargestContentfulPaintDetailsImpl::GetImageBPP() { return imageBPP_; -} +} \ No newline at end of file diff --git a/libcef/browser/largest_contentful_paint_details_impl.h b/libcef/browser/largest_contentful_paint_details_impl.h index 00d54874aad2b704e49507135e6f0af580541d39..7468c80b74e2b938ae756bc8983a2c1d27f75969 100644 --- a/libcef/browser/largest_contentful_paint_details_impl.h +++ b/libcef/browser/largest_contentful_paint_details_impl.h @@ -42,4 +42,4 @@ class CefLargestContentfulPaintDetailsImpl: public CefLargestContentfulPaintDeta IMPLEMENT_REFCOUNTING(CefLargestContentfulPaintDetailsImpl); }; -#endif // CEF_LIBCEF_BROWSER_LARGEST_CONTENTFUL_PAINT_DETAILS_IMPL_H_ +#endif // CEF_LIBCEF_BROWSER_LARGEST_CONTENTFUL_PAINT_DETAILS_IMPL_H_ \ No newline at end of file diff --git a/libcef/browser/native/browser_platform_delegate_native_aura.h b/libcef/browser/native/browser_platform_delegate_native_aura.h index 952c95e9218a21df1d94796a39049fa0987820f6..be3d05a7cf1f6d8977fe03bc7d136f9f44dad3fa 100644 --- a/libcef/browser/native/browser_platform_delegate_native_aura.h +++ b/libcef/browser/native/browser_platform_delegate_native_aura.h @@ -51,7 +51,7 @@ class CefBrowserPlatformDelegateNativeAura blink::WebMouseEvent TranslateWebMoveEvent(const CefMouseEvent& mouse_event, bool mouseLeave) const override; blink::WebGestureEvent TranslateTouchpadFlingEvent( - const CefMouseEvent& mouse_event) const override; + const CefMouseEvent& mouse_event) const override; blink::WebMouseWheelEvent TranslateWebWheelEvent( const CefMouseEvent& mouse_event, int deltaX, diff --git a/libcef/browser/net/ohos_applink_throttle.cc b/libcef/browser/net/ohos_applink_throttle.cc index 7e43659e28db35eab3a4dd30425dd991e6de662f..c9055d7e81eaf0c67fe4fadc1358c1d4cdb3f7a1 100644 --- a/libcef/browser/net/ohos_applink_throttle.cc +++ b/libcef/browser/net/ohos_applink_throttle.cc @@ -39,6 +39,11 @@ class CefOpenAppLinkCallbackImpl : public CefOpenAppLinkCallback { OhosAppLinkThrottle::OhosAppLinkThrottle(int frame_tree_node_id) : frame_tree_node_id_(frame_tree_node_id) {} +OhosAppLinkThrottle::OhosAppLinkThrottle( + int frame_tree_node_id, bool is_client_redirect) + : frame_tree_node_id_(frame_tree_node_id), + is_client_redirect_(is_client_redirect) {} + OhosAppLinkThrottle::~OhosAppLinkThrottle() {} void OhosAppLinkThrottle::WillStartRequest( @@ -87,7 +92,11 @@ void OhosAppLinkThrottle::ContinueLoad() { void OhosAppLinkThrottle::CancelLoad() { if (delegate_) { - delegate_->CancelWithError(net::ERR_ABORTED); + if (is_client_redirect_) { + delegate_->Resume(); + } else { + delegate_->CancelWithError(net::ERR_ABORTED); + } } } } // namespace throttle \ No newline at end of file diff --git a/libcef/browser/net/ohos_applink_throttle.h b/libcef/browser/net/ohos_applink_throttle.h index c7adcfc503284255e9164e8f543cd690544e45bb..4a5f692c8078826fe4d9c6f3eca7ee6047716421 100644 --- a/libcef/browser/net/ohos_applink_throttle.h +++ b/libcef/browser/net/ohos_applink_throttle.h @@ -16,6 +16,7 @@ namespace throttle { class OhosAppLinkThrottle : public blink::URLLoaderThrottle { public: explicit OhosAppLinkThrottle(int frame_tree_node_id); + OhosAppLinkThrottle(int frame_tree_node_id, bool is_client_redirect); OhosAppLinkThrottle(const OhosAppLinkThrottle&) = delete; OhosAppLinkThrottle& operator=(const OhosAppLinkThrottle&) = delete; ~OhosAppLinkThrottle() override; @@ -38,6 +39,7 @@ class OhosAppLinkThrottle : public blink::URLLoaderThrottle { private: int frame_tree_node_id_; + bool is_client_redirect_ = false; SEQUENCE_CHECKER(sequence_checker_); base::WeakPtrFactory weak_factory_{this}; diff --git a/libcef/browser/net/throttle_handler.cc b/libcef/browser/net/throttle_handler.cc index 62d838ec8992ddd9159335ff4f3f2ceb05391b6d..5ff6fc0658b8f50037b29769cfa8931d7b89a9fc 100644 --- a/libcef/browser/net/throttle_handler.cc +++ b/libcef/browser/net/throttle_handler.cc @@ -21,7 +21,6 @@ #if defined(OHOS_ARKWEB_EXTENSIONS) #include "extensions/common/constants.h" #endif - namespace throttle { namespace { diff --git a/libcef/browser/net_service/cookie_helper.cc b/libcef/browser/net_service/cookie_helper.cc index b0f75365359520f3d9c1bae2b5821234e8a21013..4881a98faa2e4d7a3ecedb077733d9ec98a028e0 100644 --- a/libcef/browser/net_service/cookie_helper.cc +++ b/libcef/browser/net_service/cookie_helper.cc @@ -17,6 +17,12 @@ #include "services/network/cookie_manager.h" #include "services/network/public/cpp/resource_request.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "base/ranges/algorithm.h" +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#include "components/content_settings/core/browser/host_content_settings_map.h" +#endif + namespace net_service { namespace cookie_helper { @@ -235,6 +241,43 @@ bool IsCookieableScheme( return url.SchemeIsHTTPOrHTTPS() || url.SchemeIsWSOrWSS(); } +#if defined(OHOS_EX_EXCEPTION_LIST) +bool CanSaveOrLoadCookies(const CefBrowserContext::Getter& browser_context_getter, + const network::ResourceRequest& request) { + auto cef_browser_context = GetBrowserContext(browser_context_getter); + auto browser_context = + cef_browser_context ? cef_browser_context->AsBrowserContext() : nullptr; + if (!browser_context) { + LOG(ERROR) << "Can not get browser_context."; + return true; + } + + HostContentSettingsMap* host_content_settings_map = + HostContentSettingsMapFactory::GetForProfile(browser_context); + if (!host_content_settings_map) { + LOG(ERROR) << "Can not get host_content_settings_map."; + return true; + } + + ContentSettingsForOneType cookie_settings; + host_content_settings_map-> + GetSettingsForOneType(ContentSettingsType::COOKIES, &cookie_settings); + + const auto& entry = base::ranges::find_if( + cookie_settings, [&](const ContentSettingPatternSource& entry) { + // The primary pattern is for the request URL; the secondary pattern + // is for the first-party URL (which is the top-frame origin [if + // available] or the site-for-cookies). + return !entry.IsExpired() && + entry.primary_pattern.Matches(request.url) && + entry.secondary_pattern.Matches(request.url); + }); + const ContentSettingPatternSource* match = + (entry == cookie_settings.end() ? nullptr : &*entry); + return !(match && match->GetContentSetting() == CONTENT_SETTING_BLOCK); +} +#endif + void LoadCookies(const CefBrowserContext::Getter& browser_context_getter, const network::ResourceRequest& request, const AllowCookieCallback& allow_cookie_callback, @@ -243,7 +286,11 @@ void LoadCookies(const CefBrowserContext::Getter& browser_context_getter, if ((request.load_flags & net::LOAD_DO_NOT_SEND_COOKIES) || request.credentials_mode == network::mojom::CredentialsMode::kOmit || - request.url.IsAboutBlank()) { + request.url.IsAboutBlank() +#if defined(OHOS_EX_EXCEPTION_LIST) + || !CanSaveOrLoadCookies(browser_context_getter, request) +#endif + ) { // Continue immediately without loading cookies. std::move(done_callback).Run(0, {}); return; @@ -297,6 +344,17 @@ void SaveCookies(const CefBrowserContext::Getter& browser_context_getter, continue; } +#if defined(OHOS_EX_EXCEPTION_LIST) + if (cookie && !CanSaveOrLoadCookies(browser_context_getter, request)) { + returned_status.AddExclusionReason( + net::CookieInclusionStatus::EXCLUDE_USER_PREFERENCES); + } + + if (!returned_status.IsInclude()) { + continue; + } +#endif + bool allow = false; allow_cookie_callback.Run(*cookie, &allow); if (allow) { diff --git a/libcef/browser/net_service/cookie_manager_impl.cc b/libcef/browser/net_service/cookie_manager_impl.cc index e8d4332a82dfb2d08076b97222d3a5366cdf1443..c80e87433fdf8019e6e11b666ac0d3f426efe0c7 100644 --- a/libcef/browser/net_service/cookie_manager_impl.cc +++ b/libcef/browser/net_service/cookie_manager_impl.cc @@ -207,7 +207,8 @@ bool CefCookieManagerImpl::VisitUrlCookies( const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { if (!visitor.get()) { return false; } @@ -226,28 +227,29 @@ bool CefCookieManagerImpl::VisitUrlCookies( if (!ValidContext()) { StoreOrTriggerInitCallback(base::BindOnce( base::IgnoreResult(&CefCookieManagerImpl::VisitUrlCookiesInternal), - this, gurl, includeHttpOnly, visitor, is_sync)); + this, gurl, includeHttpOnly, visitor, is_sync, is_from_ndk)); return true; } - return VisitUrlCookiesInternal(gurl, includeHttpOnly, visitor, is_sync); + return VisitUrlCookiesInternal(gurl, includeHttpOnly, visitor, is_sync, is_from_ndk); } bool CefCookieManagerImpl::SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) { + const CefString& str_cookie, + bool includeHttpOnly) { GURL gurl = GURL(url.ToString()); if (!ValidContext()) { StoreOrTriggerInitCallback(base::BindOnce( base::IgnoreResult(&CefCookieManagerImpl::SetCookieInternal), this, - gurl, cookie, callback, is_sync, str_cookie)); + gurl, cookie, callback, is_sync, str_cookie, includeHttpOnly)); return true; } - return SetCookieInternal(gurl, cookie, callback, is_sync, str_cookie); + return SetCookieInternal(gurl, cookie, callback, is_sync, str_cookie, includeHttpOnly); } bool CefCookieManagerImpl::DeleteCookies( @@ -329,13 +331,17 @@ bool CefCookieManagerImpl::VisitUrlCookiesInternal( const GURL& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { DCHECK(ValidContext()); DCHECK(visitor); DCHECK(url.is_valid()); #ifdef OHOS_COOKIE net::CookieOptions options = net::CookieOptions::MakeAllInclusive(); + if (is_from_ndk && !includeHttpOnly) { + options.set_exclude_httponly(); + } #else net::CookieOptions options; if (includeHttpOnly) { @@ -383,7 +389,7 @@ bool CefCookieManagerImpl::SetCookieInternal( const GURL& url, const CefCookie& cookie, CefRefPtr callback, - bool is_sync, const CefString& str_cookie) { + bool is_sync, const CefString& str_cookie, bool includeHttpOnly) { DCHECK(ValidContext()); DCHECK(url.is_valid()); @@ -426,7 +432,7 @@ bool CefCookieManagerImpl::SetCookieInternal( } net::CookieOptions options; - if (cookie.httponly) { + if (includeHttpOnly || cookie.httponly) { options.set_include_httponly(); } options.set_same_site_cookie_context( diff --git a/libcef/browser/net_service/cookie_manager_impl.h b/libcef/browser/net_service/cookie_manager_impl.h index 86b0dc8cbab6aafc095f77d21e58e85a556dc0b6..23194a954f2d7be656008e0542c0d63769363c5b 100644 --- a/libcef/browser/net_service/cookie_manager_impl.h +++ b/libcef/browser/net_service/cookie_manager_impl.h @@ -38,12 +38,14 @@ class CefCookieManagerImpl : public CefCookieManager { bool VisitUrlCookies(const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) override; + bool is_sync, + bool is_from_ndk) override; bool SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) override; + const CefString& str_cookie, + bool includeHttpOnly) override; bool DeleteCookies(const CefString& url, const CefString& cookie_name, #if BUILDFLAG(IS_OHOS) @@ -67,12 +69,13 @@ class CefCookieManagerImpl : public CefCookieManager { bool VisitAllCookiesInternal(CefRefPtr visitor, bool sync); bool VisitUrlCookiesInternal(const GURL& url, bool includeHttpOnly, - CefRefPtr visitor, bool sync); + CefRefPtr visitor, bool sync, bool is_from_ndk); bool SetCookieInternal(const GURL& url, const CefCookie& cookie, CefRefPtr callback, bool sync, - const CefString& str_cookie); + const CefString& str_cookie + bool includeHttpOnly); bool DeleteCookiesInternal(const GURL& url, const CefString& cookie_name, bool is_session, diff --git a/libcef/browser/net_service/cookie_manager_ohos_impl.cc b/libcef/browser/net_service/cookie_manager_ohos_impl.cc index 717b3c9f20ab806f2d1f8013d076a9be4aa60063..dc8b52e033dbb8fc583e85068af69e5d44083c51 100644 --- a/libcef/browser/net_service/cookie_manager_ohos_impl.cc +++ b/libcef/browser/net_service/cookie_manager_ohos_impl.cc @@ -37,6 +37,13 @@ #include "services/network/cookie_access_delegate_impl.h" #include "services/network/cookie_manager.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "base/command_line.h" +#include "content/public/common/content_switches.h" +#include "components/content_settings/core/browser/host_content_settings_map.h" +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#endif // defined(OHOS_EX_EXCEPTION_LIST) + using network::mojom::CookieManager; namespace { @@ -287,7 +294,7 @@ void CefCookieManagerImpl::Initialize( CefBrowserContext::Getter browser_context_getter, CefRefPtr callback) { CEF_REQUIRE_UIT(); - (void)browser_context_getter; + browser_context_getter_ = browser_context_getter; RunAsyncCompletionOnUIThread(callback); } @@ -297,6 +304,25 @@ bool CefCookieManagerImpl::IsAcceptCookieAllowed() { void CefCookieManagerImpl::PutAcceptCookieEnabled(bool accept) { net_service::NetHelpers::accept_cookies = accept; + +#if defined(OHOS_EX_EXCEPTION_LIST) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kForBrowser)) { + if (browser_context_getter_) { + auto cef_browser_context = browser_context_getter_.Run(); + if (cef_browser_context) { + HostContentSettingsMap* host_content_settings_map = + HostContentSettingsMapFactory::GetForProfile( + cef_browser_context->AsBrowserContext()); + if (host_content_settings_map) { + host_content_settings_map->SetDefaultContentSetting( + ContentSettingsType::COOKIES, + net_service::NetHelpers::IsAllowAcceptCookies() ? ContentSetting::CONTENT_SETTING_ALLOW + : ContentSetting::CONTENT_SETTING_BLOCK); + } + } + } + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) } bool CefCookieManagerImpl::IsThirdPartyCookieAllowed() { @@ -331,7 +357,8 @@ bool CefCookieManagerImpl::VisitUrlCookies( const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { if (!visitor.get()) { return false; } @@ -341,16 +368,17 @@ bool CefCookieManagerImpl::VisitUrlCookies( return false; } LOG(DEBUG) << "CefCookieManagerImpl::VisitUrlCookies is_sync: " << is_sync; - return VisitUrlCookiesInternal(gurl, includeHttpOnly, visitor, is_sync); + return VisitUrlCookiesInternal(gurl, includeHttpOnly, visitor, is_sync, is_from_ndk); } bool CefCookieManagerImpl::SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, - bool is_sync, const CefString& str_cookie) { + bool is_sync, const CefString& str_cookie, + bool includeHttpOnly) { GURL gurl = GURL(url.ToString()); LOG(DEBUG) << "CefCookieManagerImpl::SetCookie is_sync: " << is_sync; - return SetCookieInternal(gurl, cookie, callback, is_sync, str_cookie); + return SetCookieInternal(gurl, cookie, callback, is_sync, str_cookie, includeHttpOnly); } bool CefCookieManagerImpl::DeleteCookies( @@ -491,11 +519,15 @@ bool CefCookieManagerImpl::VisitUrlCookiesInternal( const GURL& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { DCHECK(visitor); DCHECK(url.is_valid()); net::CookieOptions options = net::CookieOptions::MakeAllInclusive(); + if (is_from_ndk && !includeHttpOnly) { + options.set_exclude_httponly(); + } LOG(DEBUG) << "CefCookieManagerImpl::VisitUrlCookiesInternal is_sync : " << is_sync; if (is_sync) { RunCookieTaskSync(base::BindOnce(&CefCookieManagerImpl::GetCookieListCookieTask, @@ -538,7 +570,8 @@ bool CefCookieManagerImpl::SetCookieInternal( const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) { + const CefString& str_cookie, + bool includeHttpOnly) { DCHECK(url.is_valid()); std::unique_ptr canonical_cookie(net::CanonicalCookie::Create( @@ -551,7 +584,7 @@ bool CefCookieManagerImpl::SetCookieInternal( } net::CookieOptions options; - if (cookie.httponly) { + if (includeHttpOnly || cookie.httponly) { options.set_include_httponly(); } options.set_same_site_cookie_context( diff --git a/libcef/browser/net_service/cookie_manager_ohos_impl.h b/libcef/browser/net_service/cookie_manager_ohos_impl.h index 00f66ccbae7f99b0137a64914fa120ed7bc4987c..91a3e16abd7c0099b481f817c449e5ce93511143 100644 --- a/libcef/browser/net_service/cookie_manager_ohos_impl.h +++ b/libcef/browser/net_service/cookie_manager_ohos_impl.h @@ -55,12 +55,14 @@ class CefCookieManagerImpl : public CefCookieManager { bool VisitUrlCookies(const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) override; + bool is_sync, + bool is_from_ndk) override; bool SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) override; + const CefString& str_cookie, + bool includeHttpOnly) override; bool DeleteCookies(const CefString& url, const CefString& cookie_name, bool is_session, @@ -121,12 +123,14 @@ class CefCookieManagerImpl : public CefCookieManager { bool VisitUrlCookiesInternal(const GURL& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync); + bool is_sync, + bool is_from_ndk); bool SetCookieInternal(const GURL& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie); + const CefString& str_cookie, + bool includeHttpOnly); bool DeleteCookiesInternal(const GURL& url, const CefString& cookie_name, bool is_session, @@ -172,6 +176,8 @@ class CefCookieManagerImpl : public CefCookieManager { mojo::Remote network_cookie_manager_; + CefBrowserContext::Getter browser_context_getter_; + IMPLEMENT_REFCOUNTING(CefCookieManagerImpl); }; diff --git a/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.cc b/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.cc index e3020530930ae21b8ffa4d6abe4437c6b1b448b6..1da4503bb61b5e8713ff249fa1e9e558778c1448 100644 --- a/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.cc +++ b/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.cc @@ -354,7 +354,8 @@ bool CefIncognitoCookieManagerImpl::VisitUrlCookies( const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { if (!visitor.get()) { return false; } @@ -364,15 +365,15 @@ bool CefIncognitoCookieManagerImpl::VisitUrlCookies( return false; } LOG(DEBUG) << "VisitUrlCookies is_sync: " << is_sync; - return VisitUrlCookiesInternal(gurl, includeHttpOnly, visitor, is_sync); + return VisitUrlCookiesInternal(gurl, includeHttpOnly, visitor, is_sync, is_from_ndk); } bool CefIncognitoCookieManagerImpl::SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, - bool is_sync, const CefString& str_cookie) { + bool is_sync, const CefString& str_cookie, bool includeHttpOnly) { GURL gurl = GURL(url.ToString()); LOG(DEBUG) << "SetCookie is_sync: " << is_sync; - return SetCookieInternal(gurl, cookie, callback, is_sync, str_cookie); + return SetCookieInternal(gurl, cookie, callback, is_sync, str_cookie, includeHttpOnly); } bool CefIncognitoCookieManagerImpl::DeleteCookies( @@ -523,11 +524,16 @@ bool CefIncognitoCookieManagerImpl::VisitUrlCookiesInternal( const GURL& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { DCHECK(visitor); DCHECK(url.is_valid()); net::CookieOptions options = net::CookieOptions::MakeAllInclusive(); + if (is_from_ndk && !includeHttpOnly) { + options.set_exclude_httponly(); + } + LOG(DEBUG) << "VisitUrlCookiesInternal is_sync : " << is_sync; if (is_sync) { RunCookieTaskSync(base::BindOnce( @@ -573,7 +579,8 @@ bool CefIncognitoCookieManagerImpl::SetCookieInternal( const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) { + const CefString& str_cookie, + bool includeHttpOnly) { DCHECK(url.is_valid()); std::unique_ptr canonical_cookie( @@ -589,7 +596,7 @@ bool CefIncognitoCookieManagerImpl::SetCookieInternal( } net::CookieOptions options; - if (cookie.httponly) { + if (includeHttpOnly || cookie.httponly) { options.set_include_httponly(); } options.set_same_site_cookie_context( diff --git a/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.h b/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.h index e2e457afb51a384d4089814e5a07052ab8f01b86..703bde3047f33d89cb8f34bbe250d096de9bec70 100644 --- a/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.h +++ b/libcef/browser/net_service/incognito_cookie_manager_ohos_impl.h @@ -55,12 +55,14 @@ class CefIncognitoCookieManagerImpl : public CefCookieManager { bool VisitUrlCookies(const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) override; + bool is_sync, + bool is_from_ndk = false) override; bool SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) override; + const CefString& str_cookie, + bool includeHttpOnly) override; bool DeleteCookies(const CefString& url, const CefString& cookie_name, bool is_session, @@ -121,12 +123,14 @@ class CefIncognitoCookieManagerImpl : public CefCookieManager { bool VisitUrlCookiesInternal(const GURL& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync); + bool is_sync, + bool is_from_ndk); bool SetCookieInternal(const GURL& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie); + const CefString& str_cookie, + bool includeHttpOnly); bool DeleteCookiesInternal(const GURL& url, const CefString& cookie_name, bool is_session, diff --git a/libcef/browser/net_service/login_delegate.cc b/libcef/browser/net_service/login_delegate.cc index e57316f0c7914f7dc3647ee56a9f0cb32a4586c3..4ff4cdbef4ce41e0bd23b654ed026c4296d08cf1 100644 --- a/libcef/browser/net_service/login_delegate.cc +++ b/libcef/browser/net_service/login_delegate.cc @@ -56,6 +56,7 @@ class AuthCallbackImpl : public CefAuthCallback { } void Continue(const CefString& username, const CefString& password) override { + LOG(INFO) << "HttpAuth user continue"; if (!task_runner_->RunsTasksInCurrentSequence()) { task_runner_->PostTask( FROM_HERE, base::BindOnce(&AuthCallbackImpl::Continue, this, username, @@ -87,9 +88,11 @@ class AuthCallbackImpl : public CefAuthCallback { constexpr int32_t MAX_PWD_LENGTH = 256; auto dataBase = CefDataBase::GetGlobalDataBase(); if (dataBase == nullptr) { + LOG(ERROR) << "IsHttpAuthInfoSaved dataBase is empty"; return false; } if (!dataBase->ExistHttpAuthCredentials()) { + LOG(WARNING) << "IsHttpAuthInfoSaved dataBase is existHttpAuth"; return false; } CefString username; @@ -98,6 +101,7 @@ class AuthCallbackImpl : public CefAuthCallback { MAX_PWD_LENGTH + 1); if (username.empty() || strlen(password) == 0) { memset(password, 0, MAX_PWD_LENGTH + 1); + LOG(WARNING) << "IsHttpAuthInfoSaved name or password is empty"; return false; } CefString passwordCef(password, strlen(password)); @@ -107,15 +111,18 @@ class AuthCallbackImpl : public CefAuthCallback { FROM_HERE, base::BindOnce(&AuthCallbackImpl::Continue, this, username, passwordCef)); passwordCef.MemsetToZero(); + LOG(INFO) << "IsHttpAuthInfoSaved continue"; return true; } if (delegate_) { delegate_->Continue(username, passwordCef); delegate_ = nullptr; passwordCef.MemsetToZero(); + LOG(INFO) << "IsHttpAuthInfoSaved login byself"; return true; } passwordCef.MemsetToZero(); + LOG(WARNING) << "IsHttpAuthInfoSaved is not found"; return false; } #endif @@ -204,10 +211,10 @@ LoginDelegate::LoginDelegate(const net::AuthChallengeInfo& auth_info, #if defined(OHOS_ARKWEB_EXTENSIONS) // |callback| needs to be executed asynchronously. - CEF_POST_TASK(CEF_UIT, base::BindOnce(&LoginDelegate::Start, - weak_ptr_factory_.GetWeakPtr(), browser, + CEF_POST_TASK(CEF_UIT, base::BindOnce(&LoginDelegate::Start, + weak_ptr_factory_.GetWeakPtr(), browser, auth_info, request_id, - is_request_for_main_frame, + is_request_for_main_frame, origin_url, response_headers)); #else // |callback| needs to be executed asynchronously. @@ -263,7 +270,7 @@ void LoginDelegate::ContinueBeforeCommit( } void LoginDelegate::StartInternal(CefRefPtr browser, - const net::AuthChallengeInfo& auth_info, + const net::AuthChallengeInfo& auth_info, const content::GlobalRequestID& request_id, const GURL& origin_url) { auto url_request_info = CefBrowserURLRequest::FromRequestID(request_id); diff --git a/libcef/browser/net_service/login_delegate.h b/libcef/browser/net_service/login_delegate.h index b51d87eb9244e3631d64a5b319a10830edbc95cb..1a7c78aa88baf7f26ca11304012aa18850cb0cb8 100644 --- a/libcef/browser/net_service/login_delegate.h +++ b/libcef/browser/net_service/login_delegate.h @@ -56,7 +56,7 @@ class LoginDelegate : public content::LoginDelegate { const GURL& origin_url, scoped_refptr response_headers); void StartInternal(CefRefPtr browser, - const net::AuthChallengeInfo& auth_info, + const net::AuthChallengeInfo& auth_info, const content::GlobalRequestID& request_id, const GURL& origin_url); void ContinueBeforeCommit( diff --git a/libcef/browser/net_service/net_helpers.cc b/libcef/browser/net_service/net_helpers.cc index d410be1b07f49b861fd67f6f2ec9cafe785a2206..aa7226858805ee3dcbbf2bac3d600f4a7b4c71ea 100644 --- a/libcef/browser/net_service/net_helpers.cc +++ b/libcef/browser/net_service/net_helpers.cc @@ -4,13 +4,17 @@ #include "libcef/browser/net_service/net_helpers.h" +#include "base/base_switches.h" +#include "base/command_line.h" #include "base/base_paths_ohos.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "include/base/cef_logging.h" #include "net/base/load_flags.h" #include "url/gurl.h" +#include "content/public/common/content_switches.h" #if defined(OHOS_HTTP_DNS) #include @@ -18,6 +22,8 @@ #include "net/dns/public/secure_dns_mode.h" #endif // defined(OHOS_HTTP_DNS) +#include "libcef/common/command_line_impl.h" + namespace net_service { namespace { @@ -34,7 +40,7 @@ int UpdateCacheLoadFlags(int load_flags, int cache_control_flags) { } // namespace static const std::string APP_READ_ONLY_PATH = - "/data/storage/el1/bundle/entry/resources/resfile"; + "/data/storage/el1/bundle/entry/resources/resfile/"; bool NetHelpers::allow_content_access = false; bool NetHelpers::allow_file_access = false; @@ -43,11 +49,15 @@ bool NetHelpers::accept_cookies = true; bool NetHelpers::third_party_cookies = false; int NetHelpers::cache_mode = 0; int NetHelpers::connection_timeout = 30; +constexpr int32_t APPLICATION_API_12 = 12; #if defined(OHOS_HTTP_DNS) int NetHelpers::doh_mode = -1; std::string NetHelpers::doh_config = ""; #endif // defined(OHOS_HTTP_DNS) +#if defined(OHOS_EX_NETWORK_CONNECTION) +int NetHelpers::network = -1; +#endif #if defined(OHOS_CUSTOM_DNS) std::map NetHelpers::custom_dns = {}; @@ -157,12 +167,54 @@ void NetHelpers::ClearHostIP() { } #endif // defined(OHOS_CUSTOM_DNS) +int32_t GetApplicationApiVersion() { + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kOhosAppApiVersion)) { + LOG(ERROR) << "kOhosAppApiVersion not exist"; + return -1; + } + std::string apiVersion = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kOhosAppApiVersion); + if (apiVersion.empty()) { + return -1; + } + return std::stoi(apiVersion); +} + bool IsSpecialFileUrl(const GURL& url) { if (!url.is_valid() || !url.SchemeIsFile() || !url.has_path()) { return false; } - if (base::StartsWith(url.path(), APP_READ_ONLY_PATH, + if (GetApplicationApiVersion() >= APPLICATION_API_12) { + if (base::StartsWith(url.path(), APP_READ_ONLY_PATH, + base::CompareCase::SENSITIVE)) { + LOG(INFO) << "Is special file url, the path is in: " << APP_READ_ONLY_PATH; + return true; + } + LOG(INFO) << "Is not special file url, the path is not in: " << APP_READ_ONLY_PATH; + return false; + } + + base::FilePath app_data_path; + if (!base::PathService::Get(base::DIR_OHOS_APP_DATA, &app_data_path)) { + return false; + } + base::FilePath app_bundle_path; + if (!base::PathService::Get(base::DIR_OHOS_APP_INSTALLATION, + &app_bundle_path)) { + return false; + } + LOG(INFO) << "app_data_path:" << app_data_path.value() + << ", app_bundle_path:" << app_bundle_path.value(); + + if (base::StartsWith(url.path(), app_data_path.value(), + base::CompareCase::SENSITIVE)) { + return true; + } + + if (base::StartsWith(url.path(), app_bundle_path.value(), base::CompareCase::SENSITIVE)) { return true; } @@ -174,10 +226,25 @@ bool IsInFileAccessList(const GURL& url, const std::vector& pass_di return false; } + auto url_path = + base::MakeAbsoluteFilePathNoResolveSymbolicLinks(base::FilePath(url.path())) + .value_or(base::FilePath()); + if (url_path.empty()) { + return false; + } for (auto& path: pass_dir) { - LOG(ERROR) << "IsInFileAccessList url path:" << url.path(); - LOG(ERROR) << "IsInFileAccessList pass path:" << path; - if (base::StartsWith(url.path(), path, base::CompareCase::SENSITIVE)) { + auto pass_path = + base::MakeAbsoluteFilePathNoResolveSymbolicLinks(base::FilePath(path)) + .value_or(base::FilePath()); + if (pass_path.empty()) { + return false; + } + if (!pass_path.IsParent(url_path)) { + if (pass_path == url_path) { + LOG(INFO) << "IsInFileAccessList equal"; + return true; + } + } else { return true; } } @@ -198,9 +265,8 @@ bool IsURLBlocked(const GURL& url if (url.SchemeIsFile() && !setting.file_access_dirs_list.empty()) { bool result = IsInFileAccessList(url, setting.file_access_dirs_list); - LOG(ERROR) << "IsInFileAccessList url result:" << result; if (!result) { - LOG(ERROR) << "Blocked by file access list"; + LOG(WARNING) << "Blocked by file access list"; } return !result; } diff --git a/libcef/browser/net_service/net_helpers.h b/libcef/browser/net_service/net_helpers.h index d58cfc1a3c4858f1d29ad49aaf547edb3bb193a6..e7e678b98a3acf93b11b101bcca3b1281af8e8d9 100644 --- a/libcef/browser/net_service/net_helpers.h +++ b/libcef/browser/net_service/net_helpers.h @@ -69,6 +69,9 @@ class NETHELPERS_EXPORT NetHelpers { static int doh_mode; static std::string doh_config; #endif // defined(OHOS_HTTP_DNS) +#if defined(OHOS_EX_NETWORK_CONNECTION) + static int network; +#endif }; bool IsSpecialFileUrl(const GURL& url); diff --git a/libcef/browser/net_service/proxy_url_loader_factory.cc b/libcef/browser/net_service/proxy_url_loader_factory.cc index 84faea6f09f1d1479b51431e978f7acdddd8d2e0..ff7c6706b03dd9642595be308a519cd75fb41b48 100644 --- a/libcef/browser/net_service/proxy_url_loader_factory.cc +++ b/libcef/browser/net_service/proxy_url_loader_factory.cc @@ -36,6 +36,10 @@ #include "libcef/browser/res_reporter.h" #include "libcef/common/request_impl.h" #include "net/base/load_flags.h" +#if defined(OHOS_EX_DOWNLOAD) +#include "content/public/browser/download_utils.h" +#include "third_party/blink/public/common/mime_util/mime_util.h" +#endif #endif namespace net_service { @@ -407,6 +411,10 @@ class InterceptedRequest : public network::mojom::URLLoader, StreamReaderURLLoader* stream_loader_ = nullptr; +#if defined(OHOS_EX_DOWNLOAD) + bool is_download_{ false }; +#endif + base::WeakPtrFactory weak_factory_; }; @@ -517,8 +525,17 @@ void InterceptedRequest::Restart() { } } +#if BUILDFLAG(IS_OHOS) + if (request_.method == "OPTIONS") { + current_request_uses_header_client_ = false; + } else { + current_request_uses_header_client_ = + factory_->url_loader_header_client_receiver_.is_bound(); + } +#else current_request_uses_header_client_ = factory_->url_loader_header_client_receiver_.is_bound(); +#endif if (request_.request_initiator && network::cors::ShouldCheckCors(request_.url, request_.request_initiator, @@ -664,6 +681,17 @@ void InterceptedRequest::OnReceiveResponse( current_body_ = std::move(body); current_cached_metadata_ = std::move(cached_metadata); +#if defined(OHOS_EX_DOWNLOAD) + bool must_download = + content::download_utils::MustDownload( + request_.url, current_response_->headers.get(), current_response_->mime_type); + bool known_mime_type = + blink::IsSupportedMimeType(current_response_->mime_type); + is_download_ = + !current_response_->intercepted_by_plugin && + (must_download || !known_mime_type); +#endif + #if BUILDFLAG(IS_OHOS) if (current_response_->headers && current_response_->headers->response_code() >= 400) { @@ -941,7 +969,9 @@ void InterceptedRequest::InterceptResponseReceived( if (response) { // Non-null response: make sure to use it as an override for the // normal network data. +#if BUILDFLAG(IS_OHOS) TRACE_EVENT1("net", "InterceptedRequest::InterceptResponseReceived", "url", request_.url.spec()); +#endif ContinueAfterInterceptWithOverride(std::move(response)); } else { // Request was not intercepted/overridden. Proceed with loading @@ -971,6 +1001,27 @@ void InterceptedRequest::ContinueAfterInterceptWithOverride( std::unique_ptr response) { // StreamReaderURLLoader will synthesize TrustedHeaderClient callbacks to // avoid having Set-Cookie headers stripped by the IPC layer. +#if BUILDFLAG(IS_OHOS) + if (request_.method == "OPTIONS") { + current_request_uses_header_client_ = false; + + stream_loader_ = new StreamReaderURLLoader( + id_, request_, proxied_client_receiver_.BindNewPipeAndPassRemote(), + mojo::NullRemote(), traffic_annotation_, + std::move(current_cached_metadata_), + std::make_unique(std::move(response), + weak_factory_.GetWeakPtr())); + } else { + current_request_uses_header_client_ = true; + + stream_loader_ = new StreamReaderURLLoader( + id_, request_, proxied_client_receiver_.BindNewPipeAndPassRemote(), + header_client_receiver_.BindNewPipeAndPassRemote(), traffic_annotation_, + std::move(current_cached_metadata_), + std::make_unique(std::move(response), + weak_factory_.GetWeakPtr())); + } +#else current_request_uses_header_client_ = true; stream_loader_ = new StreamReaderURLLoader( @@ -979,6 +1030,7 @@ void InterceptedRequest::ContinueAfterInterceptWithOverride( std::move(current_cached_metadata_), std::make_unique(std::move(response), weak_factory_.GetWeakPtr())); +#endif stream_loader_->Start(); } @@ -1240,19 +1292,21 @@ void InterceptedRequest::OnDestroy() { // We don't want any callbacks after this point. weak_factory_.InvalidateWeakPtrs(); +#ifdef OHOS_BUGFIX_CRASH + if (!factory_) { + LOG(ERROR) << "InterceptedRequest::OnDestroy factory_ is nullptr"; + return; + } + if (!factory_->request_handler_) { + LOG(ERROR) << "InterceptedRequest::OnDestroy factory_->request_handler_ is nullptr"; + return; + } +#endif + factory_->request_handler_->OnRequestComplete(id_, request_, status_); -#ifdef OHOS_NETWORK_LOAD - if (request_.method == "OPTIONS") { - delete this; - } else { - // Destroys |this|. - factory_->RemoveRequest(this); - } -#else // Destroys |this|. factory_->RemoveRequest(this); -#endif } void InterceptedRequest::OnProcessRequestHeaders( @@ -1328,12 +1382,14 @@ void InterceptedRequest::CallOnComplete( #if defined(OHOS_EX_DOWNLOAD) void InterceptedRequest::CancelRequest(int error_code) { - // network::URLLoaderCompletionStatus status(error_code); - // status.abort_due_to_cef_browser_destroyed = true; - // SendErrorStatusAndCompleteImmediately(status); // Donn't cancel network requests. Network requests should be canceled by the holder // instead of following the tab, such as serviceworker download, etc. Although the // tab is destroyed, the request still needs to be maintained. + if (!is_download_) { + network::URLLoaderCompletionStatus status(error_code); + status.abort_due_to_cef_browser_destroyed = true; + SendErrorStatusAndCompleteImmediately(status); + } } #endif // OHOS_EX_DOWNLOAD @@ -1506,15 +1562,15 @@ void ProxyURLLoaderFactory::CreateProxy( mojo::PendingReceiver proxied_receiver; mojo::PendingRemote target_factory_remote; - + if (factory_override) { // We are interested in factories "inside" of CORS, so use // |factory_override|. *factory_override = network::mojom::URLLoaderFactoryOverride::New(); - proxied_receiver = + proxied_receiver = (*factory_override) ->overriding_factory.InitWithNewPipeAndPassReceiver(); - (*factory_override)->overridden_factory_receiver = + (*factory_override)->overridden_factory_receiver = target_factory_remote.InitWithNewPipeAndPassReceiver(); (*factory_override)->skip_cors_enabled_scheme_check = true; } else { @@ -1648,14 +1704,7 @@ void ProxyURLLoaderFactory::CreateLoaderAndStart( InterceptedRequest* req = new InterceptedRequest( this, request_id, options, request, traffic_annotation, std::move(receiver), std::move(client), std::move(target_factory_clone)); -#ifdef OHOS_NETWORK_LOAD - // Donn't track options request, because the request id for options always 0. - if (request.method != "OPTIONS") { - requests_.insert(std::make_pair(request_id, base::WrapUnique(req))); - } -#else requests_.insert(std::make_pair(request_id, base::WrapUnique(req))); -#endif #if BUILDFLAG(IS_OHOS) req->Restart(false); #else diff --git a/libcef/browser/net_service/resource_request_handler_wrapper.cc b/libcef/browser/net_service/resource_request_handler_wrapper.cc index 193ae1e701bdcd3a7ce6c698a6ce3a9aee481826..9d0c8527d783082eddac7ade66a19d565cde4232 100644 --- a/libcef/browser/net_service/resource_request_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_request_handler_wrapper.cc @@ -103,6 +103,47 @@ class RequestCallbackWrapper : public CefCallback { IMPLEMENT_REFCOUNTING(RequestCallbackWrapper); }; +#ifdef OHOS_NETWORK_LOAD +class OhosInterceptCallbackWrapper : public CefInterceptCallback { + public: + using ResourceCallback = base::OnceCallback)>; + explicit OhosInterceptCallbackWrapper(ResourceCallback callback) + : callback_(std::move(callback)), + work_thread_task_runner_( + base::SequencedTaskRunner::GetCurrentDefault()) {} + + OhosInterceptCallbackWrapper(const OhosInterceptCallbackWrapper&) = delete; + OhosInterceptCallbackWrapper& operator=(const OhosInterceptCallbackWrapper&) = delete; + + ~OhosInterceptCallbackWrapper() override { + if (!callback_.is_null()) { + // Make sure it executes on the correct thread. + work_thread_task_runner_->PostTask( + FROM_HERE, base::BindOnce(std::move(callback_), nullptr)); + } + } + + void ContinueLoad(CefRefPtr resource_handler) override { + if (!work_thread_task_runner_->RunsTasksInCurrentSequence()) { + work_thread_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&OhosInterceptCallbackWrapper::ContinueLoad, this, resource_handler)); + return; + } + if (!callback_.is_null()) { + std::move(callback_).Run(resource_handler); + } + } + + private: + ResourceCallback callback_; + + scoped_refptr work_thread_task_runner_; + + IMPLEMENT_REFCOUNTING(OhosInterceptCallbackWrapper); +}; +#endif + #if OHOS_NETWORK_LOAD void OnRequestErrorInUiTask(CefRefPtr browser, CefRefPtr frame, @@ -147,7 +188,7 @@ void ReportITPResultInUiTask(CefRefPtr browser, return; } CefRefPtr load_handler = client->GetLoadHandler(); - if (load_handler) { + if (!load_handler) { LOG(ERROR) << "ReportITPResultInUiTask for load_handler is nullptr"; return; } @@ -677,9 +718,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { CEF_REQUIRE_IOT(); if (!cookie_helper::IsCookieableScheme(request->url, init_state_->cookieable_schemes_) -#if BUILDFLAG(IS_OHOS) - || !net_service::NetHelpers::IsThirdPartyCookieAllowed() -#endif ) { // The scheme does not support cookies. std::move(callback).Run(); @@ -724,26 +762,28 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { DCHECK(state->cookie_filter_); -#ifdef OHOS_ITP - bool itp_cookies_enabled = IsIntelligentTrackingPreventionEnabled(); - if (itp_cookies_enabled && request) { - bool third_party_cookie_access_policy = - ohos_anti_tracking::ThirdPartyCookieAccessPolicy::GetInstance() - ->AllowGetCookies(*request); - if (!third_party_cookie_access_policy) { - ReportITPResult(*request); - *allow = false; - return; - } - } -#endif // OHOS_ITP - CefCookie cef_cookie; if (net_service::MakeCefCookie(cookie, cef_cookie)) { *allow = state->cookie_filter_->CanSendCookie( init_state_->browser_, init_state_->frame_, state->pending_request_.get(), cef_cookie); } + +#ifdef OHOS_ITP + if (*allow == true) { + bool itp_cookies_enabled = IsIntelligentTrackingPreventionEnabled(); + if (itp_cookies_enabled && request) { + bool third_party_cookie_access_policy = + ohos_anti_tracking::ThirdPartyCookieAccessPolicy::GetInstance() + ->AllowGetCookies(*request, GetWebContentsLastCommittedURL()); + if (!third_party_cookie_access_policy) { + ReportITPResult(*request); + *allow = false; + return; + } + } + } +#endif } void ContinueWithLoadedCookies(int32_t request_id, @@ -911,6 +951,17 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { // The request will be handled by the NetworkService. Remove the // "Accept-Language" header here so that it can be re-added in // URLRequestHttpJob::AddExtraHeaders with correct ordering applied. +#if defined(OHOS_SCHEME_HANDLER) + // Get the chunked data pipe remote back. + if (state->pending_request_) { + CefRefPtr post_data_stream = state->pending_request_->GetUploadStream(); + if (post_data_stream && post_data_stream->IsChunked()) { + LOG(INFO) << "scheme_handler get the chunked stream back."; + static_cast(post_data_stream.get()) + ->GetChunkedDataPipeGetter(request->request_body.get()); + } + } +#endif } // Continue the request. @@ -920,7 +971,8 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { void GetOhosResourceHandlerInUiTask( int32_t request_id, network::ResourceRequest* request, - ShouldInterceptRequestResultCallback callback) { + ShouldInterceptRequestResultCallback callback, + std::string url) { CEF_REQUIRE_UIT(); RequestState* state = GetState(request_id); if (!state) { @@ -942,9 +994,11 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { // Try to get scheme handler from ets UI thread. if (!resource_handler && state->scheme_factory_) { // Does the scheme factory want to handle the request? - resource_handler = state->scheme_factory_->Create( + if (!url.starts_with("hwweb")) { + resource_handler = state->scheme_factory_->Create( init_state_->browser_, init_state_->frame_, request->url.scheme(), state->pending_request_.get()); + } } CEF_POST_TASK( @@ -955,10 +1009,70 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { resource_handler, std::move(callback))); } + void GetOhosResourceHandlerResultInIO(int32_t request_id, + network::ResourceRequest* request, + ShouldInterceptRequestResultCallback callback, + CefRefPtr resource_handler) { + CEF_REQUIRE_IOT(); + GetOhosResourceHandlerResult(request_id, request, resource_handler, std::move(callback)); + } + + void GetOhosResourceHandlerStillInIO( + int32_t request_id, + network::ResourceRequest* request, + ShouldInterceptRequestResultCallback callback) { + CEF_REQUIRE_IOT(); + RequestState* state = GetState(request_id); + if (!state || !request) { + std::move(callback).Run(nullptr); + return; + } + CefRefPtr callback_ptr = + new OhosInterceptCallbackWrapper(base::BindOnce( + &InterceptedRequestHandlerWrapper::GetOhosResourceHandlerResultInIO, + weak_ptr_factory_.GetWeakPtr(), + request_id, base::Unretained(request), std::move(callback))); + + if (state->handler_) { + // Does the client want to handle the request? + if (request) { + state->pending_request_->SetDestination(request->destination); + } + state->handler_->GetResourceHandlerByIO( + init_state_->browser_, init_state_->frame_, + state->pending_request_.get(), callback_ptr, state->scheme_factory_, + request->url.scheme()); + } else { + GetOhosResourceHandlerFromETS(state->scheme_factory_, state->pending_request_.get(), + request->url.scheme(), callback_ptr); + } + } + + void GetOhosResourceHandlerFromETS(CefRefPtr scheme_factory, + CefRefPtr request, + const CefString& scheme, + CefRefPtr callback) { + if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { + content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE, + base::BindOnce(&InterceptedRequestHandlerWrapper::GetOhosResourceHandlerFromETS, + weak_ptr_factory_.GetWeakPtr(), + scheme_factory, request, scheme, callback)); + return; + } + + CefRefPtr resource_handler = nullptr; + if (scheme_factory) { + // Does the scheme factory want to handle the request? + resource_handler = scheme_factory->Create( + init_state_->browser_, init_state_->frame_, scheme, request); + } + callback->ContinueLoad(resource_handler); + } + void GetOhosResourceHandler(int32_t request_id, network::ResourceRequest* request, ShouldInterceptRequestResultCallback callback) { - #ifdef OHOS_NETWORK_LOAD +#ifdef OHOS_NETWORK_LOAD RequestState* state = GetState(request_id); if (state && request) { // Add fetch meta data headers. @@ -977,22 +1091,23 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { } state->pending_request_->SetFrameUrl(frame_url); } + bool has_user_activation = false; + if (request->trusted_params) { + has_user_activation = request->trusted_params->has_user_activation; + } std::map headers = network::GetFetchMetadataHeaders( - request->url, request->mode, request->has_user_gesture, + request->url, request->mode, has_user_activation, request->destination, request->request_initiator); for (auto& entry : headers) { state->pending_request_->SetHeaderByName(entry.first, entry.second, false); } state->pending_request_->SetReadOnly(old_flag); } - #endif - CEF_POST_TASK( - CEF_UIT, - base::BindOnce( - &InterceptedRequestHandlerWrapper::GetOhosResourceHandlerInUiTask, - weak_ptr_factory_.GetWeakPtr(), request_id, request, - std::move(callback))); +#endif + + CEF_REQUIRE_IOT(); + GetOhosResourceHandlerStillInIO(request_id, request, std::move(callback)); } #endif @@ -1210,10 +1325,11 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { std::move(exec_callback).Run(); return; } - // Clear the headers first. we will get cookie for this redirect. - request->headers.Clear(); + // Clear the cookie first. we will get cookie for this redirect. + request->headers.RemoveHeader(net::HttpRequestHeaders::kCookie); // Get cookies for redirect url. request->url = new_url; + MaybeLoadCookies(request_id, state, request, std::move(exec_callback)); } #endif @@ -1283,9 +1399,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { if (!cookie_helper::IsCookieableScheme(request->url, init_state_->cookieable_schemes_) -#if BUILDFLAG(IS_OHOS) - || !net_service::NetHelpers::IsThirdPartyCookieAllowed() -#endif ) { // The scheme does not support cookies. std::move(callback).Run(); @@ -1676,6 +1789,13 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { CefString(request.url.host()), CefString(request.request_initiator->host()))); } + + GURL GetWebContentsLastCommittedURL() { + if (!init_state_ || !init_state_->browser_) { + return GURL(); + } + return init_state_->browser_->GetLastCommittedURL(); + } #endif scoped_refptr init_helper_; @@ -1811,7 +1931,7 @@ std::unique_ptr CreateInterceptedRequestHandler( browserPtr = CefBrowserHostBase::GetBrowserForHost(frame); #ifdef OHOS_NETWORK_LOAD bool is_guest_view = false; - if (browserPtr->browser_info()) { + if (browserPtr && browserPtr->browser_info()) { realFramePtr = browserPtr->browser_info()->GetFrameForHost(frame, &is_guest_view, true); } diff --git a/libcef/browser/net_service/restrict_cookie_manager.cc b/libcef/browser/net_service/restrict_cookie_manager.cc index 148fd87d211096aa402697733421d35d93f0782e..9eadd07ad5c49d76bc5a1a9686cc74c4835534fa 100644 --- a/libcef/browser/net_service/restrict_cookie_manager.cc +++ b/libcef/browser/net_service/restrict_cookie_manager.cc @@ -18,6 +18,11 @@ #include "net_helpers.h" #include "url/gurl.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "base/command_line.h" +#include "content/public/common/content_switches.h" +#endif + class ProxyingRestrictedCookieManagerListener : public network::mojom::CookieChangeListener { public: @@ -74,6 +79,21 @@ void ProxyingRestrictedCookieManager::GetAllForUrl( GetAllForUrlCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); +#if defined(OHOS_EX_EXCEPTION_LIST) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + if (site_for_cookies.IsFirstParty(url) || + AllowCookies(url, site_for_cookies)) { + underlying_restricted_cookie_manager_->GetAllForUrl( + url, site_for_cookies, top_frame_origin, has_storage_access, + std::move(options), std::move(callback)); + return; + } + std::move(callback).Run(std::vector()); + return; + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) + if (AllowCookies(url, site_for_cookies)) { underlying_restricted_cookie_manager_->GetAllForUrl( url, site_for_cookies, top_frame_origin, has_storage_access, @@ -93,6 +113,21 @@ void ProxyingRestrictedCookieManager::SetCanonicalCookie( SetCanonicalCookieCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); +#if defined(OHOS_EX_EXCEPTION_LIST) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + if (site_for_cookies.IsFirstParty(url) || + AllowCookies(url, site_for_cookies)) { + underlying_restricted_cookie_manager_->SetCanonicalCookie( + cookie, url, site_for_cookies, top_frame_origin, has_storage_access, + status, std::move(callback)); + return; + } + std::move(callback).Run(false); + return; + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) + if (AllowCookies(url, site_for_cookies)) { underlying_restricted_cookie_manager_->SetCanonicalCookie( cookie, url, site_for_cookies, top_frame_origin, has_storage_access, @@ -151,6 +186,22 @@ void ProxyingRestrictedCookieManager::SetCookieFromString( SetCookieFromStringCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); +#if defined(OHOS_EX_EXCEPTION_LIST) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + if (site_for_cookies.IsFirstParty(url) || + AllowCookies(url, site_for_cookies)) { + underlying_restricted_cookie_manager_->SetCookieFromString( + url, site_for_cookies, top_frame_origin, has_storage_access, cookie, + std::move(callback)); + return; + } + std::move(callback).Run(/*site_for_cookies_ok=*/true, + /*top_frame_origin_ok=*/true); + return; + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) + if (AllowCookies(url, site_for_cookies)) { underlying_restricted_cookie_manager_->SetCookieFromString( url, site_for_cookies, top_frame_origin, has_storage_access, cookie, @@ -169,6 +220,21 @@ void ProxyingRestrictedCookieManager::GetCookiesString( GetCookiesStringCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); +#if defined(OHOS_EX_EXCEPTION_LIST) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + if (site_for_cookies.IsFirstParty(url) || + AllowCookies(url, site_for_cookies)) { + underlying_restricted_cookie_manager_->GetCookiesString( + url, site_for_cookies, top_frame_origin, has_storage_access, + std::move(callback)); + return; + } + std::move(callback).Run(""); + return; + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) + if (AllowCookies(url, site_for_cookies)) { underlying_restricted_cookie_manager_->GetCookiesString( url, site_for_cookies, top_frame_origin, has_storage_access, diff --git a/libcef/browser/net_service/stream_reader_url_loader.cc b/libcef/browser/net_service/stream_reader_url_loader.cc index 6f3e00046f8e4c28f2be30d98a936e23321b05c4..630b7609dcfa4514acef38106daa6cb8f1d1c8ad 100644 --- a/libcef/browser/net_service/stream_reader_url_loader.cc +++ b/libcef/browser/net_service/stream_reader_url_loader.cc @@ -19,21 +19,21 @@ #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "content/public/browser/browser_thread.h" -// #if defined(OHOS_API_PER) #include "net/base/features.h" -// #endif #include "net/base/io_buffer.h" #include "net/http/http_status_code.h" #include "net/http/http_util.h" -// #if defined(OHOS_API_PER) #include "services/network/public/cpp/features.h" -// #endif #include "services/network/public/cpp/url_loader_completion_status.h" namespace net_service { namespace { +#if defined(OHOS_NETWORK_LOAD) +constexpr int32_t NET_STATUS_CODE_400 = 400; +#endif + using OnInputStreamOpenedCallback = base::OnceCallback, std::unique_ptr)>; @@ -648,12 +648,12 @@ void StreamReaderURLLoader::HeadersComplete(int orig_status_code, &content_length, &extra_headers); LOG(DEBUG) << "intercept StreamReaderURLLoader::HeadersComplete" - << " request_id=" << request_id_ - << " status_code=" << status_code - << " status_text=" << status_text - << " mime_type=" << mime_type - << " charset=" << charset - << " content_length=" << content_length; + << " request_id_=" << request_id_ + << " status_code=" << status_code + << " status_text=" << status_text + << " mime_type=" << mime_type + << " charset=" << charset + << " content_length=" << content_length; if (status_code < 0) { // Early exit if the handler reported an error. RequestComplete(status_code); @@ -687,7 +687,7 @@ void StreamReaderURLLoader::HeadersComplete(int orig_status_code, status_code, status_text, mime_type, charset, content_length, extra_headers, false /* allow_existing_header_override */); #if defined(OHOS_NETWORK_LOAD) - if (status_code >= 400) { + if (status_code >= NET_STATUS_CODE_400) { if (!mime_type.empty()) { headers->SetHeader(net::HttpRequestHeaders::kContentType, mime_type); } @@ -749,7 +749,8 @@ bool StreamReaderURLLoader::TryTransferDataWithSharedMemory() { size_t size = response_delegate_->GetResponseDataBuffer(memory); LOG(DEBUG) << "shared-memory+++ GetResponseDataBuffer buffer size=" << size; - base::ReadOnlySharedMemoryRegion read_only_region = base::WritableSharedMemoryRegion::ConvertToReadOnly(std::move(writable_region)); + base::ReadOnlySharedMemoryRegion read_only_region = + base::WritableSharedMemoryRegion::ConvertToReadOnly(std::move(writable_region)); if (!read_only_region.IsValid()) { LOG(ERROR) << "shared-memory: convert to read only err"; return false; @@ -826,10 +827,10 @@ void StreamReaderURLLoader::ContinueWithResponseHeaders( client_->OnReceiveResponse(std::move(pending_response), std::move(consumer_handle), std::move(cached_metadata_)); - + #if BUILDFLAG(IS_OHOS) LOG(DEBUG) << "intercept StreamReaderURLLoader::ContinueWithResponseHeaders request_id_=" << request_id_ - << ", request_.is_sync_mode=" << request_.is_sync_mode; + << ", request_.is_sync_mode=" << request_.is_sync_mode; if (!request_.is_sync_mode || !TryTransferDataWithSharedMemory()) { ReadMore(); } diff --git a/libcef/browser/ohos_safe_browsing/README.md b/libcef/browser/ohos_safe_browsing/README.md deleted file mode 100644 index 3d4e17205730a967192206a91b13c01510d0c539..0000000000000000000000000000000000000000 --- a/libcef/browser/ohos_safe_browsing/README.md +++ /dev/null @@ -1,2 +0,0 @@ -NOTICE: -Some files in this folder (there is a high probability that the file name contails OH) are compiled by OpenHarmony open-source authors based on the CEF open-source framework. Some processes refer to the CEF source code. \ No newline at end of file diff --git a/libcef/browser/osr/browser_platform_delegate_osr.cc b/libcef/browser/osr/browser_platform_delegate_osr.cc index aa8622ef35330b5ff673dc3b8bea4cbbc0e200b7..1c0de77d70c7abb2194a5352b1d8b1243d4ff39f 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr.cc +++ b/libcef/browser/osr/browser_platform_delegate_osr.cc @@ -1003,6 +1003,7 @@ CefRenderWidgetHostViewOSR* CefBrowserPlatformDelegateOsr::GetOSRHostView() if (!web_contents_) { return nullptr; } + content::RenderViewHost* host = web_contents_->GetRenderViewHost(); if (host) { return static_cast( @@ -1192,6 +1193,12 @@ void CefBrowserPlatformDelegateOsr::OnTextSelected(bool flag) { } } +void CefBrowserPlatformDelegateOsr::OnDestroyImageAnalyzerOverlay() { + if (CefRenderWidgetHostViewOSR* view = GetOSRHostView()) { + view->OnDestroyImageAnalyzerOverlay(); + } +} + float CefBrowserPlatformDelegateOsr::GetPageScaleFactor() { if (CefRenderWidgetHostViewOSR* view = GetOSRHostView()) { return view->GetPageScaleFactor(); diff --git a/libcef/browser/osr/browser_platform_delegate_osr.h b/libcef/browser/osr/browser_platform_delegate_osr.h index 5bdab9ebf5089787fb05289717904baa60443f99..0879125e2914eee361c2cf0c1b895b8ab0e72871 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr.h +++ b/libcef/browser/osr/browser_platform_delegate_osr.h @@ -186,6 +186,7 @@ class CefBrowserPlatformDelegateOsr const gfx::Point& touch_point, const gfx::Rect& screen_rect) override; void OnTextSelected(bool flag) override; + void OnDestroyImageAnalyzerOverlay() override; float GetPageScaleFactor() override; #endif diff --git a/libcef/browser/osr/browser_platform_delegate_osr_unittest.cc b/libcef/browser/osr/browser_platform_delegate_osr_unittest.cc new file mode 100644 index 0000000000000000000000000000000000000000..cc01b7985c605f58f6512266618c7338ac273a7e --- /dev/null +++ b/libcef/browser/osr/browser_platform_delegate_osr_unittest.cc @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define protected public +#include "cef/libcef/browser/osr/browser_platform_delegate_osr.h" +#include "gtest/gtest.h" + +namespace { +std::shared_ptr g_platform_delegate; +} + +class CefBrowserPlatformDelegateNativeMock + : public CefBrowserPlatformDelegateNative { + public: + content::NativeWebKeyboardEvent TranslateWebKeyEvent( + const CefKeyEvent& key_event) const override; + blink::WebMouseEvent TranslateWebClickEvent( + const CefMouseEvent& mouse_event, + CefBrowserHost::MouseButtonType type, + bool mouseUp, + int clickCount) const override; + blink::WebMouseEvent TranslateWebMoveEvent(const CefMouseEvent& mouse_event, + bool mouseLeave) const override; + blink::WebMouseWheelEvent TranslateWebWheelEvent( + const CefMouseEvent& mouse_event, + int deltaX, + int deltaY) const override; + blink::WebGestureEvent TranslateTouchpadFlingEvent( + const CefMouseEvent& mouse_event) const override; + CefBrowserPlatformDelegateNativeMock(const CefWindowInfo& window_info, + SkColor background_color) + : CefBrowserPlatformDelegateNative(window_info, background_color) {} + CefBrowserPlatformDelegateNativeMock() = delete; + ~CefBrowserPlatformDelegateNativeMock() {} +}; + +content::NativeWebKeyboardEvent +CefBrowserPlatformDelegateNativeMock::TranslateWebKeyEvent( + const CefKeyEvent& key_event) const { + gfx::NativeEvent native_event = nullptr; + content::NativeWebKeyboardEvent nativewebkeyboard(native_event); + return nativewebkeyboard; +} + +blink::WebMouseEvent +CefBrowserPlatformDelegateNativeMock::TranslateWebClickEvent( + const CefMouseEvent& mouse_event, + CefBrowserHost::MouseButtonType type, + bool mouseUp, + int clickCount) const { + return blink::WebMouseEvent(); +} + +blink::WebMouseEvent +CefBrowserPlatformDelegateNativeMock::TranslateWebMoveEvent( + const CefMouseEvent& mouse_event, + bool mouseLeave) const { + return blink::WebMouseEvent(); +} + +blink::WebMouseWheelEvent +CefBrowserPlatformDelegateNativeMock::TranslateWebWheelEvent( + const CefMouseEvent& mouse_event, + int deltaX, + int deltaY) const { + return blink::WebMouseWheelEvent(); +} + +blink::WebGestureEvent +CefBrowserPlatformDelegateNativeMock::TranslateTouchpadFlingEvent( + const CefMouseEvent& mouse_event) const { + return blink::WebGestureEvent(); +} + +class CefBrowserPlatformDelegateOsrTest : public testing::Test { + public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); +}; +void CefBrowserPlatformDelegateOsrTest::SetUpTestCase(void) {} + +void CefBrowserPlatformDelegateOsrTest::TearDownTestCase(void) {} + +void CefBrowserPlatformDelegateOsrTest::SetUp(void) { + CefWindowInfo window_info; + auto native_delegate = + std::make_unique(window_info, 0); + g_platform_delegate = std::make_shared( + std::move(native_delegate), true, true); +} + +void CefBrowserPlatformDelegateOsrTest::TearDown(void) { + g_platform_delegate = nullptr; +} + +#if defined(OHOS_INPUT_EVENTS) +TEST_F(CefBrowserPlatformDelegateOsrTest, OnNativeEmbedLifecycleChange) { + ASSERT_NE(g_platform_delegate, nullptr); + CefRenderHandler::CefNativeEmbedData data_info; + data_info.status = CREATE; + data_info.surfaceId = ""; + data_info.embedId = ""; + data_info.info.id = ""; + data_info.info.x = 0; + data_info.info.y = 0; + data_info.info.width = 0; + data_info.info.height = 0; + data_info.info.type = ""; + data_info.info.src = ""; + data_info.info.url = ""; + data_info.info.tag = ""; + data_info.info.params = {{"key1", "value1"}, {"key2", "value2"}}; + g_platform_delegate->OnNativeEmbedLifecycleChange(data_info); +} +#endif + +#if defined(OHOS_COMPOSITE_RENDER) +TEST_F(CefBrowserPlatformDelegateOsrTest, SetDrawRect) { + ASSERT_NE(g_platform_delegate, nullptr); + int x = 0; + int y = 0; + int width = 0; + int height = 0; + g_platform_delegate->SetDrawRect(x, y, width, height); +} +#endif + +#if defined(OHOS_SOFTWARE_COMPOSITOR) +TEST_F(CefBrowserPlatformDelegateOsrTest, WebPageSnapshot) { + ASSERT_NE(g_platform_delegate, nullptr); + const char* id = "test_id"; + int width = 1024; + int height = 768; + g_platform_delegate->WebPageSnapshot( + id, width, height, + base::BindOnce([](const char* str, bool is, void* ptr, int a, int b) {})); +} +#endif + +TEST_F(CefBrowserPlatformDelegateOsrTest, SendKeyEvent) { + ASSERT_NE(g_platform_delegate, nullptr); + CefKeyEvent event; + g_platform_delegate->SendKeyEvent(event); +} + +#if defined(OHOS_INPUT_EVENTS) +TEST_F(CefBrowserPlatformDelegateOsrTest, ScrollFocusedEditableNodeIntoView) { + ASSERT_NE(g_platform_delegate, nullptr); + g_platform_delegate->ScrollFocusedEditableNodeIntoView(); +} + +TEST_F(CefBrowserPlatformDelegateOsrTest, SetVirtualKeyBoardArg) { + ASSERT_NE(g_platform_delegate, nullptr); + int32_t width = 1; + int32_t height = 2; + double keyboard = 10; + g_platform_delegate->SetVirtualKeyBoardArg(width, height, keyboard); +} +#endif \ No newline at end of file diff --git a/libcef/browser/osr/motion_event_osr_unittest.cc b/libcef/browser/osr/motion_event_osr_unittest.cc new file mode 100644 index 0000000000000000000000000000000000000000..f1fea79f1496165b9a66fadf922bb29d5ac9d72b --- /dev/null +++ b/libcef/browser/osr/motion_event_osr_unittest.cc @@ -0,0 +1,32 @@ +// Copyright (c) 2024 The Chromium Embedded Framework Authors. +// Portions copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "motion_event_osr.h" +#include +#include "cef/include/internal/cef_types.h" +#include "cef/include/internal/cef_types_wrappers.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace cef { +class MockCefMotionEventOSR : public CefMotionEventOSR {}; + +class CefMotionEventOSRTest : public ::testing::Test { + public: + MockCefMotionEventOSR motionEventOSR; +}; + +TEST_F(CefMotionEventOSRTest, TestOnTouch) { + CefTouchEvent touchEvent; + touchEvent.id = 1; + touchEvent.type = CEF_TET_MOVED; + touchEvent.x = 100; + touchEvent.y = 200; + touchEvent.modifiers = 0; + + bool result = motionEventOSR.OnTouch(touchEvent); + + EXPECT_FALSE(result); +} +} // namespace cef diff --git a/libcef/browser/osr/render_widget_host_view_osr.cc b/libcef/browser/osr/render_widget_host_view_osr.cc index 4e2099fe875bc028d0cfdbb27ab1445bef6545b6..a91fcecfa0ffd330eea92a048b4b57d67c48296d 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.cc +++ b/libcef/browser/osr/render_widget_host_view_osr.cc @@ -54,7 +54,6 @@ #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/size_conversions.h" #include "ui/touch_selection/touch_selection_controller.h" -#include "ohos_nweb/src/nweb_resize_helper.h" #ifdef OHOS_EX_TOPCONTROLS #include "content/browser/renderer_host/render_view_host_delegate_view.h" @@ -89,14 +88,11 @@ namespace { // The maximum number of damage rects to cache for outstanding frame requests // (for OnAcceleratedPaint). const size_t kMaxDamageRects = 10; -const int SOC_PERF_WEB_DRAG_RESIZE_ID = 10073; const float kDefaultScaleFactor = 1.0; #if BUILDFLAG(IS_OHOS) #if defined(OHOS_PERFORMANCE_JITTER) const size_t kMaxGestureQueueSize = 10; - -const size_t KTouchEventCachedThreaShold = 1; const int SOC_PERF_WEB_GESTURE_ID = 10012; const int TOUCH_DOWN_DELAY_TIME = 200; const int TOUCH_UP_DURATION_TIME = 100; @@ -406,7 +402,6 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR( compositor->SetAcceleratedWidget(browser_impl_->GetAcceleratedWidget()); CefRenderWidgetHostViewOSR::AddCompositor( browser_impl_->GetAcceleratedWidget(), compositor); - UpdateDrawMode(); } #endif // IS_OHOS #endif @@ -790,6 +785,9 @@ void CefRenderWidgetHostViewOSR::SendTouchEventList(const std::vectordelegate()->GetInputEventRouter()->RouteTouchEvent( - this, &touch_event, latency_info); - } else { - render_widget_host_->ForwardTouchEventWithLatencyInfo(touch_event, - latency_info); - } -} -#endif - void CefRenderWidgetHostViewOSR::EvictFrameBackBuffers(bool invisible) { TRACE_EVENT1("base", "CefRenderWidgetHostViewOSR::EvictFrameBackBuffers", "invisible", invisible); @@ -1356,14 +1347,6 @@ void CefRenderWidgetHostViewOSR::SetFitContentMode(int mode) { is_fit_content_ = mode; } -void CefRenderWidgetHostViewOSR::UpdateDrawMode() { - int mode = browser_impl_->GetDrawMode(); - if (auto compositor = CefRenderWidgetHostViewOSR::GetCompositor( - browser_impl_->GetAcceleratedWidget())) { - compositor->SetDrawMode(mode); - } -} - bool CefRenderWidgetHostViewOSR::GetPendingSizeStatus() { return false; } @@ -1643,6 +1626,9 @@ bool CefRenderWidgetHostViewOSR::WebPageSnapshot( height = (std::abs(height) * pageSize.height()) / 100; } + pageSize.Scale(page_scale_factor_); + pageOffsize.Scale(page_scale_factor_); + software_compositor_->DemandDrawSwAsync(id, width, height, pageSize, pageOffsize, std::move(callback)); return true; @@ -1670,7 +1656,7 @@ void CefRenderWidgetHostViewOSR::OnRenderFrameMetadataChangedBeforeActivation( if (for_browser_) { // Set parameters for adaptive handle orientation. gfx::SizeF viewport_size(metadata.scrollable_viewport_size); - viewport_size.Scale(metadata.page_scale_factor); + viewport_size.Scale(page_scale_factor_); gfx::RectF viewport_rect(0.0f, metadata.top_controls_height * metadata.top_controls_shown_ratio / @@ -1691,6 +1677,12 @@ void CefRenderWidgetHostViewOSR::MouseSelectMenuShow(bool show) { selection_controller_client_->MouseSelectMenuShow(show); } } + +void CefRenderWidgetHostViewOSR::ChangeVisibilityOfQuickMenu() { + if (selection_controller_client_) { + selection_controller_client_->ChangeVisibilityOfQuickMenu(); + } +} #endif void CefRenderWidgetHostViewOSR::OnRenderFrameMetadataChangedAfterActivation( @@ -1796,15 +1788,6 @@ void CefRenderWidgetHostViewOSR::OnRenderFrameMetadataChangedAfterActivation( metadata.selection.end != selection_end_) { selection_start_ = metadata.selection.start; selection_end_ = metadata.selection.end; -#ifdef OHOS_CLIPBOARD - // When all is selected, the right handle coordinates are in front of the left handle. - if (metadata.selection.start.edge_end().y() > metadata.selection.end.edge_end().y()) { - selection_end_.SetEdgeEnd(gfx::PointF(metadata.clipped_selection_bounds.x() + - metadata.clipped_selection_bounds.width(), - metadata.clipped_selection_bounds.y() + - metadata.clipped_selection_bounds.height())); - } -#endif selection_controller_client_->UpdateClientSelectionBounds(selection_start_, selection_end_); } @@ -2258,7 +2241,6 @@ void CefRenderWidgetHostViewOSR::SendMouseWheelEvent( if (render_widget_host_ && render_widget_host_->GetView()) { blink::WebMouseWheelEvent mouse_wheel_event(event); - #if defined(OHOS_INPUT_EVENTS) bool shouldRoute = ShouldRouteEvents(); mouse_wheel_phase_handler_.SendWheelEndForTouchpadScrollingIfNeeded(shouldRoute); @@ -2269,7 +2251,6 @@ void CefRenderWidgetHostViewOSR::SendMouseWheelEvent( mouse_wheel_phase_handler_.AddPhaseIfNeededAndScheduleEndEvent( mouse_wheel_event, false); #endif - if (ShouldRouteEvents()) { render_widget_host_->delegate() ->GetInputEventRouter() @@ -2283,6 +2264,19 @@ void CefRenderWidgetHostViewOSR::SendMouseWheelEvent( } } +#if defined(OHOS_PERFORMANCE_JITTER) +void CefRenderWidgetHostViewOSR::SendTouchGestureEvent(blink::WebTouchEvent& touch_event) { + ui::LatencyInfo latency_info = CreateLatencyInfo(touch_event); + if (ShouldRouteEvents()) { + render_widget_host_->delegate()->GetInputEventRouter()->RouteTouchEvent( + this, &touch_event, latency_info); + } else { + render_widget_host_->ForwardTouchEventWithLatencyInfo(touch_event, + latency_info); + } +} +#endif + void CefRenderWidgetHostViewOSR::SendTouchEvent(const CefTouchEvent& event) { TRACE_EVENT0("cef", "CefRenderWidgetHostViewOSR::SendTouchEvent"); @@ -2328,6 +2322,9 @@ void CefRenderWidgetHostViewOSR::SendTouchEvent(const CefTouchEvent& event) { // Update the touch event first. #ifdef OHOS_CLIPBOARD pointer_state_.SetFromOverlay(event.from_overlay); + if (event.from_overlay) { + TriggerVsync(); + } #endif // #ifdef OHOS_CLIPBOARD if (!pointer_state_.OnTouch(event)) { return; @@ -2346,11 +2343,7 @@ void CefRenderWidgetHostViewOSR::SendTouchEvent(const CefTouchEvent& event) { gesture_provider_.OnTouchEvent(pointer_state_); blink::WebTouchEvent touch_event = ui::CreateWebTouchEventFromMotionEvent( - pointer_state_, result.moved_beyond_slop_region, false -#if BUILDFLAG(IS_OHOS) - , is_fit_content_ -#endif - ); + pointer_state_, result.moved_beyond_slop_region, false); pointer_state_.CleanupRemovedTouchPoints(event); @@ -2430,7 +2423,6 @@ void CefRenderWidgetHostViewOSR::OnTouchDown() { base::BindOnce(&CefRenderWidgetHostViewOSR::StopBoosting, weak_ptr_factory_.GetWeakPtr()), TOUCH_UP_DURATION_TIME); isBoosting_ = false; - // maintaince 120fps for 3s if (auto* host = content::GpuProcessHost::Get()) { if (auto* host_impl = host->gpu_host()) { host_impl->SetHasTouchPoint(false); @@ -2442,6 +2434,8 @@ void CefRenderWidgetHostViewOSR::OnTouchDown() { OHOS::NWeb::OhosAdapterHelper::GetInstance() .CreateSocPerfClientAdapter() ->ApplySocPerfConfigByIdEx(SOC_PERF_WEB_GESTURE_ID, true); + OHOS::NWeb::ResSchedClientAdapter::ReportScene( + OHOS::NWeb::ResSchedStatusAdapter::WEB_SCENE_ENTER, OHOS::NWeb::ResSchedSceneAdapter::SLIDE); if (!isBoosting_) { if (auto* host = content::GpuProcessHost::Get()) { if (auto* host_impl = host->gpu_host()) { @@ -2451,8 +2445,8 @@ void CefRenderWidgetHostViewOSR::OnTouchDown() { } isBoosting_ = true; CEF_POST_DELAYED_TASK(CEF_UIT, - base::BindOnce(&CefRenderWidgetHostViewOSR::OnTouchDown, - weak_ptr_factory_.GetWeakPtr()), TOUCH_DOWN_DELAY_TIME); + base::BindOnce(&CefRenderWidgetHostViewOSR::OnTouchDown, + weak_ptr_factory_.GetWeakPtr()), TOUCH_DOWN_DELAY_TIME); } #endif @@ -2542,11 +2536,6 @@ void CefRenderWidgetHostViewOSR::OnUpdateTextInputStateCalled( } #if defined(OHOS_INPUT_EVENTS) - if (pointer_state_.GetAction() == ui::MotionEvent::Action::DOWN && - is_editable_node_) { - LOG(INFO) << "The keyboard status is not updated when pressed"; - return; - } CefRefPtr handler = browser_impl_->GetClient()->GetRenderHandler(); @@ -2661,12 +2650,6 @@ void CefRenderWidgetHostViewOSR::OnVsync() { gesture_event_queue_.clear(); } - if (web_touch_event_queue_.size() > KTouchEventCachedThreaShold) { - blink::WebTouchEvent touchEvent = web_touch_event_queue_.front(); - SendTouchGestureEvent(touchEvent); - web_touch_event_queue_.pop_front(); - } - if (!gesture_event_queue_.empty()) { SendGestureEvent(std::move(gesture_event_queue_.front())); gesture_event_queue_.pop_front(); @@ -2681,7 +2664,7 @@ void CefRenderWidgetHostViewOSR::OnVsyncReceived() { << web_touch_event_queue_.size(); } - while (!web_touch_event_queue_.empty()) { + if (!web_touch_event_queue_.empty()) { blink::WebTouchEvent touchEvent = web_touch_event_queue_.front(); SendTouchGestureEvent(touchEvent); web_touch_event_queue_.pop_front(); @@ -2732,6 +2715,9 @@ void CefRenderWidgetHostViewOSR::SendGestureEvent( selection_controller_->HandleLongPressEvent( web_event.TimeStamp(), web_event.PositionInWidget()); break; + case blink::WebInputEvent::Type::kGestureScrollBegin: + selection_controller_->OnScrollBeginEvent(); + break; default: break; } @@ -3023,12 +3009,9 @@ bool CefRenderWidgetHostViewOSR::ResizeRootLayer(bool isKeyboard, bool& visible_ bool CefRenderWidgetHostViewOSR::ResizeRootLayer() { #endif if (!hold_resize_) { + bool reseize = SetRootLayerSize(false /* force */, &visible_changed); // The resize hold is not currently active. -#if defined(OHOS_INPUT_EVENTS) - if (SetRootLayerSize(false /* force */, &visible_changed)) { -#else - if (SetRootLayerSize(false /* force */)) { -#endif + if (reseize) { // The size has changed. Avoid resizing again until ReleaseResizeHold() is // called. hold_resize_ = true; @@ -3057,12 +3040,12 @@ void CefRenderWidgetHostViewOSR::ReleaseResizeHold() { isKeyboardResized_ = false; CEF_POST_TASK(CEF_UIT, base::BindOnce(&CefRenderWidgetHostViewOSR::WasKeyboardResized, - weak_ptr_factory_.GetWeakPtr())); + weak_ptr_factory_.GetWeakPtr())); } else { #endif CEF_POST_TASK(CEF_UIT, base::BindOnce(&CefRenderWidgetHostViewOSR::WasResized, - weak_ptr_factory_.GetWeakPtr())); + weak_ptr_factory_.GetWeakPtr())); #if defined(OHOS_COMPOSITE_RENDER) } #endif @@ -3072,13 +3055,6 @@ void CefRenderWidgetHostViewOSR::ReleaseResizeHold() { browser_impl_->client()->GetRenderHandler(); CHECK(handler); } - bool isDragResized = OHOS::NWeb::NWebResizeHelper::GetInstance().IsDragResizeStart(); - if (isDragResized) { - OHOS::NWeb::OhosAdapterHelper::GetInstance() - .CreateSocPerfClientAdapter() - ->ApplySocPerfConfigByIdEx(SOC_PERF_WEB_DRAG_RESIZE_ID, false); - OHOS::NWeb::NWebResizeHelper::GetInstance().SetDragResizeStart(false); - } } void CefRenderWidgetHostViewOSR::CancelWidget() { @@ -3243,8 +3219,8 @@ std::vector CefRenderWidgetHostViewOSR::GetWordSelection(const std::stri if (browser_impl_.get()) { CefRefPtr handler = browser_impl_->client()->GetRenderHandler(); - CHECK(handler); - handler->GetWordSelection(browser_impl_.get(), text, offset, temp); + CHECK(handler); + handler->GetWordSelection(browser_impl_.get(), text, offset, temp); } std::vector select = { temp.x, temp.y }; return select; @@ -3537,7 +3513,7 @@ void CefRenderWidgetHostViewOSR::FilterScrollEventImpl( #ifdef OHOS_EX_TOPCONTROLS int CefRenderWidgetHostViewOSR::GetTopControlsOffset() const { - return for_browser_ ? top_controls_offset_ : 0; + return (for_browser_ ? top_controls_offset_ : 0); } int CefRenderWidgetHostViewOSR::GetShrinkViewportHeight() { @@ -3614,9 +3590,10 @@ void CefRenderWidgetHostViewOSR::SetVirtualKeyBoardArg(int32_t width, int32_t he void CefRenderWidgetHostViewOSR::DidNativeEmbedEvent(const blink::mojom::NativeEmbedTouchEventPtr& touchEvent) { if (touchEvent->type == blink::mojom::NativeTouchType::UP) { gesture_provider_.SetNativeEmbedEnabled(false); - } else { + }else{ gesture_provider_.SetNativeEmbedEnabled(true); } + if (browser_impl_.get()) { CefRefPtr handler = browser_impl_->client()->GetRenderHandler(); @@ -3642,13 +3619,13 @@ void CefRenderWidgetHostViewOSR::OnNativeEmbedLifecycleChange(const CefRenderHan } } -void CefRenderWidgetHostViewOSR::OnNativeEmbedVisibilityChange(const std::string& embed_id, bool visibility) { +void CefRenderWidgetHostViewOSR::OnNativeEmbedVisibilityChange(const std::string& embed_id, bool visibility){ if (browser_impl_.get()) { CefRefPtr handler = browser_impl_->client()->GetRenderHandler(); CHECK(handler); + handler->OnNativeEmbedVisibilityChange(embed_id, visibility); - } } @@ -3660,6 +3637,11 @@ void CefRenderWidgetHostViewOSR::SetGestureEventResult(bool result) { gesture_provider_.SetNativeEmbedEnabled(false); } render_widget_host_->input_router()->SetGestureEventResult(result); + CefRefPtr handler = + browser_impl_->client()->GetRenderHandler(); + if (handler) { + handler->SetGestureEventResult(result); + } } void CefRenderWidgetHostViewOSR::SetScrollable(bool enable) { @@ -3730,6 +3712,12 @@ void CefRenderWidgetHostViewOSR::OnTextSelected(bool flag) { } } +void CefRenderWidgetHostViewOSR::OnDestroyImageAnalyzerOverlay() { + if (render_widget_host_) { + render_widget_host_->OnDestroyImageAnalyzerOverlay(); + } +} + float CefRenderWidgetHostViewOSR::GetPageScaleFactor() { return page_scale_factor_; } diff --git a/libcef/browser/osr/render_widget_host_view_osr.h b/libcef/browser/osr/render_widget_host_view_osr.h index 984f064a6b5d37bbd34f388bdf18dc64a1e4fb85..0b95a055bb5369a309766c5e8d123789477e77f4 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.h +++ b/libcef/browser/osr/render_widget_host_view_osr.h @@ -142,9 +142,9 @@ class CefRenderWidgetHostViewOSR void EvictFrameBackBuffers(bool invisible) override; void UpdateVSyncFrequency(); void ResetVSyncFrequency(); + void UpdateDrawRect(const gfx::Rect &rect); void NotifyForNextTouchEvent(bool need_wait_for_touch_move = true); void TriggerVsync(); - void UpdateDrawRect(const gfx::Rect &rect); #endif #ifdef OHOS_EX_TOPCONTROLS gfx::Rect GetPhysicalViewBounds(); @@ -154,6 +154,7 @@ class CefRenderWidgetHostViewOSR #endif #if defined(OHOS_CLIPBOARD) void MouseSelectMenuShow(bool show); + void ChangeVisibilityOfQuickMenu(); #endif void EnsureSurfaceSynchronizedForWebTest() override; @@ -212,7 +213,6 @@ class CefRenderWidgetHostViewOSR #if BUILDFLAG(IS_OHOS) void SendInternalBeginFrame() override; ui::Compositor* GetCompositor() override; - void UpdateDrawMode(); #endif #if !BUILDFLAG(IS_MAC) @@ -362,10 +362,10 @@ class CefRenderWidgetHostViewOSR void SendTouchpadFlingEvent(blink::WebGestureEvent event); void SendMouseWheelEvent(const blink::WebMouseWheelEvent& event); void SendTouchEvent(const CefTouchEvent& event); + bool ShouldRouteEvents() const; #ifdef OHOS_CLIPBOARD void ResetGestureDetection(bool is_lost_focus); #endif - bool ShouldRouteEvents() const; void SetFocus(bool focus); void UpdateFrameRate(); @@ -436,8 +436,8 @@ class CefRenderWidgetHostViewOSR #if BUILDFLAG(IS_OHOS) bool IsMouseLocked() override; - void SetDoubleTapSupportEnabled(bool enabled); - void SetMultiTouchZoomSupportEnabled(bool enabled); + void SetDoubleTapSupportEnabled(bool enabled) override; + void SetMultiTouchZoomSupportEnabled(bool enabled) override; static void AddCompositor(gfx::AcceleratedWidget widget, ui::Compositor* compositor); @@ -467,6 +467,7 @@ class CefRenderWidgetHostViewOSR #ifdef OHOS_AI void OnTextSelected(bool flag); + void OnDestroyImageAnalyzerOverlay(); float GetPageScaleFactor(); #endif diff --git a/libcef/browser/osr/touch_selection_controller_client_osr.cc b/libcef/browser/osr/touch_selection_controller_client_osr.cc index d669e09f8d077775798a0e67e77de8ffdda6b077..061047873e50a392c9d20b2371ad5faaa06bb47b 100644 --- a/libcef/browser/osr/touch_selection_controller_client_osr.cc +++ b/libcef/browser/osr/touch_selection_controller_client_osr.cc @@ -32,7 +32,12 @@ namespace { // Delay before showing the quick menu, in milliseconds. +#ifdef OHOS_DRAG_DROP +constexpr int kQuickMenuDelayInMs = 0; +#else constexpr int kQuickMenuDelayInMs = 100; +#endif + #ifdef OHOS_CLIPBOARD constexpr int kSelectHandleMoveDelayMixInMs = 400; constexpr cef_quick_menu_edit_state_flags_t kMenuCommands[] = { @@ -351,7 +356,7 @@ bool CefTouchSelectionControllerClientOSR::IsQuickMenuAvailable() const { is_enabled); } -void CefTouchSelectionControllerClientOSR::CloseQuickMenu() { +void CefTouchSelectionControllerClientOSR::TemporarilyCloseQuickMenu() { if (!quick_menu_running_) { return; } @@ -373,7 +378,10 @@ void CefTouchSelectionControllerClientOSR::CloseQuickMenu() { browser->web_contents()->SetShowingContextMenu(false); } #endif // #ifdef OHOS_CLIPBOARD +} +void CefTouchSelectionControllerClientOSR::CloseQuickMenu() { + TemporarilyCloseQuickMenu(); #if defined(OHOS_EX_FREE_COPY) if (base::CommandLine::ForCurrentProcess() && base::CommandLine::ForCurrentProcess()->HasSwitch( @@ -485,22 +493,22 @@ void CefTouchSelectionControllerClientOSR::MouseSelectMenuShow(bool show) { } } } - LOG(INFO) << "Mouse Quit Menu Flags Is = " << quickmenuflags; + LOG(INFO) << "Mouse Quick Menu Flags Is = " << quickmenuflags; CefRefPtr callbackImpl( - new CefRunQuickMenuCallbackImpl(base::BindOnce( - &CefTouchSelectionControllerClientOSR::ExecuteCommandMouse, - weak_ptr_factory_.GetWeakPtr()))); + new CefRunQuickMenuCallbackImpl(base::BindOnce( + &CefTouchSelectionControllerClientOSR::ExecuteCommandMouse, + weak_ptr_factory_.GetWeakPtr()))); ui::TouchSelectionController* controller = GetTouchSelectionController(); bool isLongPressSelectionActive = false; if (controller) { isLongPressSelectionActive = controller->IsLongPressDragSelectionActive(); } if (!handler->RunQuickMenu( - browser, browser->GetFocusedFrame(), {0, 0}, {0, 0}, - {clipped_selection_bounds_.x(), clipped_selection_bounds_.y(), - clipped_selection_bounds_.width(), clipped_selection_bounds_.height()}, - static_cast(quickmenuflags), - callbackImpl, true, isLongPressSelectionActive)) { + browser, browser->GetFocusedFrame(), {0, 0}, {0, 0}, + {clipped_selection_bounds_.x(), clipped_selection_bounds_.y(), + clipped_selection_bounds_.width(), clipped_selection_bounds_.height()}, + static_cast(quickmenuflags), + callbackImpl, true, isLongPressSelectionActive)) { callbackImpl->Disconnect(); auto render = browser->client()->GetRenderHandler(); if (render) { @@ -514,6 +522,21 @@ void CefTouchSelectionControllerClientOSR::MouseSelectMenuShow(bool show) { browser->web_contents()->SetShowingContextMenu(true); } } + +void CefTouchSelectionControllerClientOSR::ChangeVisibilityOfQuickMenu() { + if (!rwhv_) { + return; + } + auto browser = rwhv_->browser_impl(); + if (!browser || !browser->client()) { + return; + } + auto handler = browser->client()->GetContextMenuHandler(); + if (!handler) { + return; + } + handler->ChangeVisibilityOfQuickMenu(); +} #endif void CefTouchSelectionControllerClientOSR::ShowQuickMenu() { @@ -603,7 +626,11 @@ void CefTouchSelectionControllerClientOSR::UpdateQuickMenu() { // Hide the quick menu if there is any. This should happen even if the menu // should be shown again, in order to update its location or content. if (quick_menu_running_) { +#ifdef OHOS_CLIPBOARD + TemporarilyCloseQuickMenu(); +#else CloseQuickMenu(); +#endif } else { quick_menu_timer_.Stop(); } @@ -730,7 +757,6 @@ void CefTouchSelectionControllerClientOSR::OnSelectionEvent( quick_menu_requested_ = true; NotifyTouchSelectionChanged(false); UpdateQuickMenu(); - rwhv_->ResetGestureDetection(false); break; case ui::INSERTION_HANDLE_SHOWN: if (rwhv_->browser_impl()) { @@ -741,7 +767,6 @@ void CefTouchSelectionControllerClientOSR::OnSelectionEvent( if (quick_menu_requested_) { ShowQuickMenu(); } - rwhv_->ResetGestureDetection(false); break; case ui::SELECTION_HANDLES_CLEARED: case ui::INSERTION_HANDLE_CLEARED: @@ -957,7 +982,7 @@ void CefTouchSelectionControllerClientOSR::ExecuteCommand(int command_id, #ifndef OHOS_CLIPBOARD if (command_id == kInvalidCommandId) { - LOG(ERROR) << "Quick menu Command id is invaild"; + LOG(ERROR) << "Quick menu command id is invaild"; return; } #endif // #ifndef OHOS_CLIPBOARD @@ -987,7 +1012,7 @@ void CefTouchSelectionControllerClientOSR::ExecuteCommand(int command_id, #ifdef OHOS_CLIPBOARD absl::optional value; - LOG(INFO) << "Quick menu Command id = " << command_id; + LOG(INFO) << "Quick menu command id = " << command_id; #endif // #ifdef OHOS_CLIPBOARD switch (command_id) { case QM_EDITFLAG_CAN_CUT: diff --git a/libcef/browser/osr/touch_selection_controller_client_osr.h b/libcef/browser/osr/touch_selection_controller_client_osr.h index 541e5c52bff0be1731cad98f2966f383f97d101c..3c96574d6f1d66470b7c92084f86fe9c259934a6 100644 --- a/libcef/browser/osr/touch_selection_controller_client_osr.h +++ b/libcef/browser/osr/touch_selection_controller_client_osr.h @@ -100,6 +100,7 @@ class CefTouchSelectionControllerClientOSR #if defined(OHOS_CLIPBOARD) void MouseSelectMenuShow(bool show); + void ChangeVisibilityOfQuickMenu(); #endif private: class EnvEventObserver; @@ -113,6 +114,7 @@ class CefTouchSelectionControllerClientOSR void CloseQuickMenu(); void ShowQuickMenu(); void UpdateQuickMenu(); + void TemporarilyCloseQuickMenu(); #ifdef OHOS_DRAG_DROP void SetSelectAllClicked(int command_id); #endif diff --git a/libcef/browser/osr/web_contents_view_osr.cc b/libcef/browser/osr/web_contents_view_osr.cc index 4d8280693636555e7f1b3cef46244e95c4e0086c..6eb706b2311202afe955e2bae570963f8d3a293a 100644 --- a/libcef/browser/osr/web_contents_view_osr.cc +++ b/libcef/browser/osr/web_contents_view_osr.cc @@ -196,6 +196,13 @@ void CefWebContentsViewOSR::MouseSelectMenuShow(bool show) { rwhv->MouseSelectMenuShow(show); } } + +void CefWebContentsViewOSR::ChangeVisibilityOfQuickMenu() { + auto* rwhv = GetView(); + if (rwhv) { + rwhv->ChangeVisibilityOfQuickMenu(); + } +} #endif void CefWebContentsViewOSR::StartDragging( @@ -328,18 +335,6 @@ void CefWebContentsViewOSR::UpdateBrowserControlsHeight(int height, } #endif // OHOS_EX_TOPCONTROLS -#ifdef OHOS_DISPLAY_CUTOUT -void CefWebContentsViewOSR::OnSafeInsetsChange(const gfx::Insets& safe_insets) { - if (web_contents_) { - content::WebContentsImpl* web_contents_impl = - static_cast(web_contents_); - if (web_contents_impl) { - web_contents_impl->SetDisplayCutoutSafeArea(safe_insets); - } - } -} -#endif - #ifdef OHOS_AI void CefWebContentsViewOSR::CreateOverlay(const gfx::ImageSkia& image, const gfx::Rect& image_rect, @@ -351,3 +346,15 @@ void CefWebContentsViewOSR::CreateOverlay(const gfx::ImageSkia& image, } } #endif + +#ifdef OHOS_DISPLAY_CUTOUT +void CefWebContentsViewOSR::OnSafeInsetsChange(const gfx::Insets& safe_insets) { + if (web_contents_) { + content::WebContentsImpl* web_contents_impl = + static_cast(web_contents_); + if (web_contents_impl) { + web_contents_impl->SetDisplayCutoutSafeArea(safe_insets); + } + } +} +#endif diff --git a/libcef/browser/osr/web_contents_view_osr.h b/libcef/browser/osr/web_contents_view_osr.h index 21037d0c55302c018d2f14861bb57af3b7190a2d..c984ffd43e96d3838ecab8ba970d1a79d0408ab6 100644 --- a/libcef/browser/osr/web_contents_view_osr.h +++ b/libcef/browser/osr/web_contents_view_osr.h @@ -72,6 +72,7 @@ class CefWebContentsViewOSR : public content::WebContentsView, const content::ContextMenuParams& params) override; #if defined(OHOS_CLIPBOARD) void MouseSelectMenuShow(bool show) override; + void ChangeVisibilityOfQuickMenu() override; #endif void StartDragging(const content::DropData& drop_data, blink::DragOperationsMask allowed_ops, diff --git a/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.cc b/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.cc index f62d6bc946aa4e8916cc98f90ec3e0e2637e331b..0eaa4ca43cb1be294e8cdc426109d8d450173931 100644 --- a/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.cc +++ b/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.cc @@ -70,11 +70,11 @@ OhPageLoadMetricsObserver::FlushMetricsOnAppEnterBackground( const page_load_metrics::mojom::PageLoadTiming& timing) { #if defined(REPORT_SYS_EVENT) ReportBufferedMetrics(timing); + ReportLargestContentfulPaint(timing); #endif // We continue observing after being backgrounded, in case we are foregrounded // again without being killed. In those cases we may still report non-buffered // metrics such as FCP after being re-foregrounded. - ReportLargestContentfulPaint(timing); return CONTINUE_OBSERVING; } @@ -82,8 +82,8 @@ OhPageLoadMetricsObserver::ObservePolicy OhPageLoadMetricsObserver::OnHidden( const page_load_metrics::mojom::PageLoadTiming& timing) { #if defined(REPORT_SYS_EVENT) ReportBufferedMetrics(timing); -#endif ReportLargestContentfulPaint(timing); +#endif return CONTINUE_OBSERVING; } @@ -91,8 +91,8 @@ void OhPageLoadMetricsObserver::OnComplete( const page_load_metrics::mojom::PageLoadTiming& timing) { #if defined(REPORT_SYS_EVENT) ReportBufferedMetrics(timing); -#endif ReportLargestContentfulPaint(timing); +#endif } int64_t OhPageLoadMetricsObserver::GetNavigationStartTime() { @@ -108,6 +108,37 @@ int64_t OhPageLoadMetricsObserver::GetNavigationStartTime() { return navigation_start_time; } +#ifdef OHOS_BFCACHE +void OhPageLoadMetricsObserver::OnRestoreFromBackForwardCache( + const page_load_metrics::mojom::PageLoadTiming& timing, + content::NavigationHandle* navigation_handle) { + back_forward_cache_navigation_ids_.push_back( + navigation_handle->GetNavigationId()); +} + +page_load_metrics::PageLoadMetricsObserver::ObservePolicy +OhPageLoadMetricsObserver::OnEnterBackForwardCache( + const page_load_metrics::mojom::PageLoadTiming& timing) { + return CONTINUE_OBSERVING; +} + +void OhPageLoadMetricsObserver:: + OnFirstContentfulPaintAfterBackForwardCacheRestoreInPage( + const page_load_metrics::mojom::BackForwardCacheTiming& timing, + size_t index) { + if (index >= back_forward_cache_navigation_ids_.size()) + return; + + int64_t first_contentful_paint_ms = + timing.first_paint_after_back_forward_cache_restore.InMilliseconds(); +#if defined(REPORT_SYS_EVENT) + web_performance_timing_.first_contentful_paint = first_contentful_paint_ms; +#endif + int64_t navigation_start_time = GetNavigationStartTime(); + ReportFirstContentfulPaint(navigation_start_time, first_contentful_paint_ms); +} +#endif + void OhPageLoadMetricsObserver::OnFirstContentfulPaintInPage( const page_load_metrics::mojom::PageLoadTiming& timing) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); diff --git a/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.h b/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.h index 20171f7d96e5ef60b48d28ef0d1d73b8a91cc8a3..6c953253e3cc9d72c0a50a39cbd9e5f6800a738d 100644 --- a/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.h +++ b/libcef/browser/page_load_metrics/oh_page_load_metrics_observer.h @@ -32,6 +32,11 @@ class OhPageLoadMetricsObserver ObservePolicy OnStart(content::NavigationHandle* navigation_handle, const GURL& currently_committed_url, bool started_in_foreground) override; +#ifdef OHOS_BFCACHE + page_load_metrics::PageLoadMetricsObserver::ObservePolicy + OnEnterBackForwardCache( + const page_load_metrics::mojom::PageLoadTiming& timing) override; +#endif ObservePolicy OnFencedFramesStart( content::NavigationHandle* navigation_handle, const GURL& currently_committed_url) override; @@ -51,6 +56,9 @@ class OhPageLoadMetricsObserver const page_load_metrics::mojom::PageLoadTiming& timing) override; void OnFirstMeaningfulPaintInMainFrameDocument( const page_load_metrics::mojom::PageLoadTiming& timing) override; +#if OHOS_BFCACHE + void OnFirstContentfulPaintAfterBackForwardCacheRestoreInPage(const page_load_metrics::mojom::BackForwardCacheTiming& timing, size_t index) override; +#endif #if defined(REPORT_SYS_EVENT) ObservePolicy OnRedirect( @@ -65,6 +73,11 @@ class OhPageLoadMetricsObserver void OnFirstPaintInPage( const page_load_metrics::mojom::PageLoadTiming& timing) override; static void OnNavigationStart(); +#ifdef OHOS_BFCACHE + void OnRestoreFromBackForwardCache( + const page_load_metrics::mojom::PageLoadTiming& timing, + content::NavigationHandle* navigation_handle) override; +#endif #endif protected: OhPageLoadMetricsObserver( @@ -97,6 +110,12 @@ class OhPageLoadMetricsObserver OhWebPerformanceTiming web_performance_timing_; static int64_t navigation_start_timestamp_; #endif + +#ifdef OHOS_BFCACHE + // IDs for the navigations when the page is restored from the back-forward + // cache. + std::vector back_forward_cache_navigation_ids_; +#endif }; #endif // CEF_LIBCEF_BROWSER_PAGE_LOAD_METRICS_OH_PAGE_LOAD_METRICS_OBSERVER_H_ diff --git a/libcef/browser/password/oh_password_manager_client.cc b/libcef/browser/password/oh_password_manager_client.cc index d129165dbfb4b01c52f2cb5d554791ddbe5651db..a367cf384f2b7eadcf04aad6888edd5709377172 100644 --- a/libcef/browser/password/oh_password_manager_client.cc +++ b/libcef/browser/password/oh_password_manager_client.cc @@ -113,6 +113,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" +#include "crypto/sha2.h" #include "extensions/buildflags/buildflags.h" #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" @@ -153,6 +154,8 @@ typedef autofill::SavePasswordProgressLogger Logger; namespace { #if defined(OHOS_PASSWORD_AUTOFILL) +const std::string SOURCE = "source"; +const std::string SOURCE_LOGIN = "login"; const std::string EVENT = "event"; const std::string EVENT_SAVE = "save"; const std::string EVENT_FILL = "fill"; @@ -172,6 +175,8 @@ const std::string KEY_IS_OTHER_ACCOUNT = "isOtherAccount"; const std::string KEY_USERNAME = "username"; const std::string KEY_PASSWORD = "password"; + +const std::string HASH_SALT = "OHOS@PASSWORD@AUTOFILL"; #endif } // namespace @@ -281,11 +286,10 @@ bool OhPasswordManagerClient::PromptUserToSaveOrUpdatePassword( return false; } - auto autofill_id = - form_to_save->GetPendingCredentials().password_element_renderer_id; - if (auto_filled_forms_.find(autofill_id) != auto_filled_forms_.end()) { + // If the information used when the user logs in is current site filled in and + // not modified, then do not prompt the user to save. + if (IsLoginInfoConsistentWithFilled(form_to_save->GetPendingCredentials())) { LOG(INFO) << "auto filled password, not save on login"; - auto_filled_forms_.erase(autofill_id); return false; } @@ -299,7 +303,11 @@ bool OhPasswordManagerClient::PromptUserToSaveOrUpdatePassword( PasswordFormToJsonForSave(form_to_save->GetPendingCredentials()); if (json_str.has_value()) { LOG(INFO) << "call autofill for save from system."; - autofill_client->OnAutofillEvent(json_str.value()); + bool result = autofill_client->OnAutofillEvent(json_str.value()); + if (!result) { + LOG(ERROR) << "failed to call autofill for save"; + return false; + } } #endif return false; @@ -720,6 +728,8 @@ OhPasswordManagerClient::GetURLLoaderFactory() { } #if defined(OHOS_PASSWORD_AUTOFILL) +using autofill::mojom::OhosPasswordFormAutofillState; + absl::optional OhPasswordManagerClient::PasswordFormToJsonForRequest( const std::string& event, @@ -748,6 +758,7 @@ OhPasswordManagerClient::PasswordFormToJsonForRequest( base::Value::List view_data_list; view_data_list.Append(base::Value::Dict().Set(EVENT, event)); + view_data_list.Append(base::Value::Dict().Set(SOURCE, SOURCE_LOGIN)); view_data_list.Append(base::Value::Dict().Set(KEY_PAGE_URL, page_url.spec())); if (imf_info) { view_data_list.Append( @@ -787,6 +798,7 @@ absl::optional OhPasswordManagerClient::PasswordFormToJsonForSave( const password_manager::PasswordForm& form) { base::Value::List view_data_list; view_data_list.Append(base::Value::Dict().Set(EVENT, EVENT_SAVE)); + view_data_list.Append(base::Value::Dict().Set(SOURCE, SOURCE_LOGIN)); view_data_list.Append(base::Value::Dict().Set( KEY_PAGE_URL, url::Origin::Create(form.url).GetURL().spec())); @@ -806,11 +818,16 @@ absl::optional OhPasswordManagerClient::PasswordFormToJsonForSave( void OhPasswordManagerClient::ProcessAutofillCancel( const std::string& fillContent) { - LOG(INFO) << "autofill process fill cancel"; - if (is_keyboard_supressed_) { - SetShouldSuppressKeyboard(false); + // If it is on the PC platform, or if the request is not sent by me, I will + // not handle the fill cancle event. + if (!is_keyboard_supressed_) { + LOG(INFO) << "don't need to handle the fill cancle event"; + return; } + LOG(INFO) << "autofill handle fill cancel event"; + SetShouldSuppressKeyboard(false); + if (!web_contents()) { LOG(ERROR) << "web_contents is nullptr"; return; @@ -864,12 +881,40 @@ void OhPasswordManagerClient::AutoFillWithIMFEvent(bool is_username, auto json_str = PasswordFormToJsonForRequest(EVENT_FILL, form_to_request_url_, username, password, &imf_info); if (json_str.has_value()) { - LOG(INFO) << "call autofill for save from IMF"; + LOG(INFO) << "call autofill for request from IMF"; + bool result = autofill_client->OnAutofillEvent(json_str.value()); + if (!result) { + LOG(ERROR) << "failed to call autofill for request"; + return; + } SetShouldSuppressKeyboard(true); - autofill_client->OnAutofillEvent(json_str.value()); } } +void OhPasswordManagerClient::FillData(const std::string& page_url, + const std::string& username, + const std::string& password, + bool is_other_account) { + if (is_keyboard_supressed_) { + SetShouldSuppressKeyboard(false); + } + auto username_id = last_request_fill_username_.field_renderer_id; + auto password_id = last_request_fill_password_.field_renderer_id; + auto digest = is_other_account + ? std::string() + : crypto::SHA256HashString(username + HASH_SALT + password); + if (username_id) { + auto_filled_forms_username_[*username_id] = digest; + } + if (password_id) { + auto_filled_forms_passsword_[*password_id] = digest; + } + + std::wstring_convert, char16_t> convert; + FillAccountSuggestion(GURL(page_url), convert.from_bytes(username), + convert.from_bytes(password)); +} + void OhPasswordManagerClient::SetShouldSuppressKeyboard(bool suppress) { if (!web_contents()) { LOG(ERROR) << "web_contents is nullptr"; @@ -886,43 +931,59 @@ void OhPasswordManagerClient::SetShouldSuppressKeyboard(bool suppress) { LOG(ERROR) << "autofill_driver is nullptr"; return; } - LOG(INFO) << "SetShouldSuppressKeyboard=" << (suppress ? "true" : "false"); + LOG(INFO) << "set the keyboard suppressd=" << (suppress ? "true" : "false"); autofill_driver->SetShouldSuppressKeyboardCallback(suppress); is_keyboard_supressed_ = suppress; } +bool OhPasswordManagerClient::IsLoginInfoConsistentWithFilled( + const password_manager::PasswordForm& info) { + auto username_id = info.username_element_renderer_id; + auto password_id = info.password_element_renderer_id; + AutofilledMap::iterator it; + AutofilledMap* auto_filled_forms = nullptr; + LOG(INFO) << "login autosave, username renderer_id:" << username_id + << ", password renderer_id:" << password_id; + if (password_id) { + auto_filled_forms = &auto_filled_forms_passsword_; + it = auto_filled_forms->find(*password_id); + } else if (username_id) { + auto_filled_forms = &auto_filled_forms_username_; + it = auto_filled_forms->find(*username_id); + } + + if (auto_filled_forms && it != auto_filled_forms->end() && + !it->second.empty()) { + std::wstring_convert, char16_t> convert; + std::string login_digest = crypto::SHA256HashString( + convert.to_bytes(info.username_value) + HASH_SALT + + convert.to_bytes(info.password_value)); + if (it->second == login_digest) { + auto_filled_forms->erase(it); + return true; + } + } + return false; +} + void OhPasswordManagerClient::UpdateLastRequestFilledItems( const autofill::InputFillRequestData& username_data, - const autofill::InputFillRequestData& password_data, - autofill::FormRendererId form_id) { + const autofill::InputFillRequestData& password_data) { last_request_fill_username_ = username_data; last_request_fill_password_ = password_data; - last_filled_form_id_ = form_id; - if (last_request_fill_username_.is_focused) { - last_fill_focus_renderer_id_ = - last_request_fill_username_.field_renderer_id; - } else if (last_request_fill_password_.is_focused) { - last_fill_focus_renderer_id_ = - last_request_fill_password_.field_renderer_id; - } } void OhPasswordManagerClient::FillAccountSuggestion( const GURL& page_url, const std::u16string& username, const std::u16string& password) { - if (is_keyboard_supressed_) { - SetShouldSuppressKeyboard(false); - } password_manager::ContentPasswordManagerDriver* driver = driver_factory_->GetDriverForFrame(web_contents()->GetFocusedFrame()); if (!driver) { return; } - if (!last_request_fill_password_.field_renderer_id.is_null()) { - auto_filled_forms_.insert(last_request_fill_password_.field_renderer_id); - } + LOG(INFO) << "[Autofill] Try to fill account suggestion."; driver->FillAccountSuggestion(page_url, username, password); } @@ -933,7 +994,8 @@ void OhPasswordManagerClient::OnRequestAutofill( const autofill::mojom::OhosPasswordFormAutofillState state, const autofill::InputFillRequestData& username_data, const autofill::InputFillRequestData& password_data) { - LOG(INFO) << "On request autofill, state=" << static_cast(state) + LOG(INFO) << "[Autofill] On request autofill" + << ", state="<< static_cast(state) << ", username.bounds=" << username_data.bounds.ToString() << ", username.is_focus=" << username_data.is_focused << ", username.type=" << username_data.type @@ -951,22 +1013,26 @@ void OhPasswordManagerClient::OnRequestAutofill( LOG(ERROR) << "autofill_client is nullptr"; return; } - if (state == autofill::mojom::OhosPasswordFormAutofillState::kTextChanged) { - auto_filled_forms_.erase(password_data.field_renderer_id); - } form_to_request_url_ = page_url; + last_fill_form_id_ = form_id; + last_fill_focus_renderer_id_ = username_data.is_focused + ? username_data.field_renderer_id + : password_data.field_renderer_id; if (!base::ohos::IsPcDevice()) { - if (state == - autofill::mojom::OhosPasswordFormAutofillState::kNotRequested) { + if (state == OhosPasswordFormAutofillState::kNotRequested) { auto json_str = PasswordFormToJsonForRequest( EVENT_FILL, page_url, username_data, password_data); if (json_str.has_value()) { - SetShouldSuppressKeyboard(true); LOG(INFO) << "call autofill for request from system, form_id=" << form_id; - autofill_client->OnAutofillEvent(json_str.value()); - UpdateLastRequestFilledItems(username_data, password_data, form_id); + bool result = autofill_client->OnAutofillEvent(json_str.value()); + if (!result) { + LOG(ERROR) << "failed to call autofill for request"; + return; + } + SetShouldSuppressKeyboard(true); + UpdateLastRequestFilledItems(username_data, password_data); } } } else { @@ -974,22 +1040,24 @@ void OhPasswordManagerClient::OnRequestAutofill( // trigger a filling request when it is clicked for the first time. After // the PC mode is fully supported, it requests filling every time it is // clicked. - if (state == - autofill::mojom::OhosPasswordFormAutofillState::kHasBeenRequested) { + if (state == OhosPasswordFormAutofillState::kHasBeenRequested) { return; } - auto event = - state == autofill::mojom::OhosPasswordFormAutofillState::kTextChanged - ? EVENT_UPDATE - : EVENT_FILL; + auto event = (state == OhosPasswordFormAutofillState::kTextChanged) + ? EVENT_UPDATE + : EVENT_FILL; auto json_str = PasswordFormToJsonForRequest(event, page_url, username_data, password_data); if (json_str.has_value()) { LOG(INFO) << "call autofill for request from system, state=" << static_cast(state); - autofill_client->OnAutofillEvent(json_str.value()); - UpdateLastRequestFilledItems(username_data, password_data, form_id); + bool result = autofill_client->OnAutofillEvent(json_str.value()); + if (!result) { + LOG(ERROR) << "failed to call autofill for request"; + return; + } + UpdateLastRequestFilledItems(username_data, password_data); } } } diff --git a/libcef/browser/password/oh_password_manager_client.h b/libcef/browser/password/oh_password_manager_client.h index c7f5fe13d833b91b8d2b4b9b4e8210d6366d9e36..1411da87761e334ad0fefd588eac3f38fc2207d2 100644 --- a/libcef/browser/password/oh_password_manager_client.h +++ b/libcef/browser/password/oh_password_manager_client.h @@ -170,16 +170,6 @@ class OhPasswordManagerClient bool is_new_password = false; }; - absl::optional PasswordFormToJsonForRequest( - const std::string& event, - const GURL& page_url, - const autofill::InputFillRequestData& username_data, - const autofill::InputFillRequestData& password_data, - AutofillIMFInfo* imf_info = nullptr); - - absl::optional PasswordFormToJsonForSave( - const password_manager::PasswordForm& form); - void ProcessAutofillCancel(const std::string& fillContent); void AutoFillWithIMFEvent(bool is_username, @@ -187,15 +177,13 @@ class OhPasswordManagerClient bool is_new_password, const std::string& content); - void SetShouldSuppressKeyboard(bool suppress); - - void UpdateLastRequestFilledItems( - const autofill::InputFillRequestData& username_data, - const autofill::InputFillRequestData& password_data, - autofill::FormRendererId form_id); + void FillData(const std::string& page_url, + const std::string& username, + const std::string& password, + bool is_other_account); bool IsUsernamePasswordForm(autofill::FormRendererId form_id) { - return form_id == last_filled_form_id_; + return form_id == last_fill_form_id_; } bool IsUsernamePasswordField(autofill::FieldRendererId field_id) { @@ -333,6 +321,27 @@ class OhPasswordManagerClient content::RenderFrameHost* frame_host, const gfx::RectF& bounds_in_frame_coordinates); +#if defined(OHOS_PASSWORD_AUTOFILL) + absl::optional PasswordFormToJsonForRequest( + const std::string& event, + const GURL& page_url, + const autofill::InputFillRequestData& username_data, + const autofill::InputFillRequestData& password_data, + AutofillIMFInfo* imf_info = nullptr); + + absl::optional PasswordFormToJsonForSave( + const password_manager::PasswordForm& form); + + void SetShouldSuppressKeyboard(bool suppress); + + bool IsLoginInfoConsistentWithFilled( + const password_manager::PasswordForm& info); + + void UpdateLastRequestFilledItems( + const autofill::InputFillRequestData& username_data, + const autofill::InputFillRequestData& password_data); +#endif + content::BrowserContext* const context_; password_manager::PasswordManager password_manager_; @@ -373,12 +382,15 @@ class OhPasswordManagerClient bool was_on_paste_called_ = false; #if defined(OHOS_PASSWORD_AUTOFILL) + using AutofilledMap = std::unordered_map; + GURL form_to_request_url_; - autofill::FormRendererId last_filled_form_id_; + autofill::FormRendererId last_fill_form_id_; autofill::FieldRendererId last_fill_focus_renderer_id_; - std::set auto_filled_forms_; + AutofilledMap auto_filled_forms_username_; + AutofilledMap auto_filled_forms_passsword_; autofill::InputFillRequestData last_request_fill_username_; autofill::InputFillRequestData last_request_fill_password_; diff --git a/libcef/browser/permission/alloy_access_request.h b/libcef/browser/permission/alloy_access_request.h index 9836a407ac681a4980838236d67958be77db2e7f..09f5fbea0dfe20d8809fa2c1c29625a89063195e 100755 --- a/libcef/browser/permission/alloy_access_request.h +++ b/libcef/browser/permission/alloy_access_request.h @@ -31,6 +31,7 @@ class AlloyAccessRequest : public CefAccessRequest { PROTECTED_MEDIA_ID = 1 << 3, MIDI_SYSEX = 1 << 4, CLIPBOARD_READ_WRITE = 1 << 5, + CLIPBOARD_SANITIZED_WRITE = 1 << 6, SENSORS = 1 << 7, }; diff --git a/libcef/browser/permission/alloy_permission_manager.cc b/libcef/browser/permission/alloy_permission_manager.cc index df77ece3559260ab3d0e41ebc2b82ee4d0fd00d6..00942253501a5cb04e1ad8fdc02f480bab627517 100644 --- a/libcef/browser/permission/alloy_permission_manager.cc +++ b/libcef/browser/permission/alloy_permission_manager.cc @@ -237,12 +237,13 @@ void AlloyPermissionManager::RequestPermissionByType( weak_ptr_factory_.GetWeakPtr(), request_id, permission_type)); break; case PermissionType::CLIPBOARD_READ_WRITE: - if(GetApplicationApiVersion() <= APPLICATION_API_10){ + if (GetApplicationApiVersion() <= APPLICATION_API_10){ LOG(INFO) << "application version <= 10"; pending_request_raw->SetPermissionStatus(permission_type, - PermissionStatus::GRANTED); + PermissionStatus::GRANTED); break; } + LOG(INFO) << "application version > 10, ask clipboard readwrite permission."; browser->AskClipboardReadWritePermission( pending_request_raw->requesting_origin_.spec(), base::BindRepeating( @@ -261,7 +262,19 @@ void AlloyPermissionManager::RequestPermissionByType( break; #endif // defined(OHOS_SENSOR) case PermissionType::AUDIO_CAPTURE: + browser->AskAudioCapturePermission( + pending_request_raw->requesting_origin_.spec(), + base::BindRepeating( + &AlloyPermissionManager::OnRequestResponseCallBack, + weak_ptr_factory_.GetWeakPtr(), request_id, permission_type)); + break; case PermissionType::VIDEO_CAPTURE: + browser->AskVideoCapturePermission( + pending_request_raw->requesting_origin_.spec(), + base::BindRepeating( + &AlloyPermissionManager::OnRequestResponseCallBack, + weak_ptr_factory_.GetWeakPtr(), request_id, permission_type)); + break; case PermissionType::NOTIFICATIONS: case PermissionType::DURABLE_STORAGE: case PermissionType::BACKGROUND_SYNC: @@ -285,7 +298,23 @@ void AlloyPermissionManager::RequestPermissionByType( pending_request_raw->SetPermissionStatus(permission_type, PermissionStatus::DENIED); break; +#ifdef OHOS_EX_PERMISSION case PermissionType::CLIPBOARD_SANITIZED_WRITE: + if ((*base::CommandLine::ForCurrentProcess()).HasSwitch( + switches::kForBrowser)) { + browser->AskClipboardSanitizedWritePermission( + pending_request_raw->requesting_origin_.spec(), + base::BindRepeating( + &AlloyPermissionManager::OnRequestResponseCallBack, + weak_ptr_factory_.GetWeakPtr(), request_id, permission_type)); + } else { + pending_request_raw->SetPermissionStatus(permission_type, + PermissionStatus::GRANTED); + } + break; +#else + case PermissionType::CLIPBOARD_SANITIZED_WRITE: +#endif case PermissionType::WAKE_LOCK_SCREEN: pending_request_raw->SetPermissionStatus(permission_type, PermissionStatus::GRANTED); @@ -298,6 +327,8 @@ void AlloyPermissionManager::OnRequestResponseCallBack( int request_id, PermissionType permission, bool allowed) { + LOG(INFO) << "OnRequestResponseCallBack permission:" << (int)permission + << ", allowed:" << allowed; // All delegate functions should be cancelled when the manager runs // destructor. Therefore |manager| should be always valid here. DCHECK(manager); @@ -507,6 +538,23 @@ void AlloyPermissionManager::AbortPermissionRequestByType( if (browser) browser->AbortAskClipboardReadWritePermission(requesting_origin.spec()); break; + case PermissionType::CLIPBOARD_SANITIZED_WRITE: + if ((*base::CommandLine::ForCurrentProcess()).HasSwitch( + switches::kForBrowser) && browser) { + browser->AbortAskClipboardSanitizedWritePermission( + requesting_origin.spec()); + } else { + NOTREACHED() << "Invalid PermissionType."; + } + break; + case PermissionType::AUDIO_CAPTURE: + if (browser) + browser->AbortAskAudioCapturePermission(requesting_origin.spec()); + break; + case PermissionType::VIDEO_CAPTURE: + if (browser) + browser->AbortAskVideoCapturePermission(requesting_origin.spec()); + break; case PermissionType::SENSORS: #if defined(OHOS_SENSOR) if (browser) @@ -515,11 +563,8 @@ void AlloyPermissionManager::AbortPermissionRequestByType( #endif // defined(OHOS_SENSOR) case PermissionType::NOTIFICATIONS: case PermissionType::DURABLE_STORAGE: - case PermissionType::AUDIO_CAPTURE: - case PermissionType::VIDEO_CAPTURE: case PermissionType::BACKGROUND_SYNC: case PermissionType::ACCESSIBILITY_EVENTS: - case PermissionType::CLIPBOARD_SANITIZED_WRITE: case PermissionType::PAYMENT_HANDLER: case PermissionType::BACKGROUND_FETCH: case PermissionType::IDLE_DETECTION: diff --git a/libcef/browser/prefs/browser_prefs.cc b/libcef/browser/prefs/browser_prefs.cc index f7c468ea45a6dc21be5619bc65dcbee753823c66..42dfd403a7b18116e5c22d27426aaeeb1e81da0e 100644 --- a/libcef/browser/prefs/browser_prefs.cc +++ b/libcef/browser/prefs/browser_prefs.cc @@ -98,9 +98,19 @@ #include "chrome/browser/extensions/preinstalled_apps.h" #include "chrome/browser/ui/webui/extensions/extensions_ui.h" #include "extensions/browser/permissions_manager.h" +#include "extensions/browser/pref_names.h" #endif -#include "libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h" +#if defined(OHOS_NWEB_EX) +#include "chrome/common/pref_names.h" +#include "content/public/common/content_switches.h" +#endif + +#include "libcef/browser/safe_browsing/sb_prefs.h" + +#ifdef OHOS_EX_UA +#include "ohos_nweb_ex/overrides/cef/libcef/browser/alloy/alloy_browser_ua_config.h" +#endif #ifdef OHOS_ARKWEB_ADBLOCK #include "components/subresource_filter/content/browser/ruleset_version.h" @@ -215,6 +225,23 @@ std::unique_ptr CreatePrefService(Profile* profile, profile ? kUserPrefsFileName : kLocalPrefsFileName); PrefNameSet persistent_prefs; persistent_prefs.insert(predictor::kVisitedUrls); +#if defined(OHOS_ARKWEB_EXTENSIONS) + RegisterExtensionPersistentPrefs(persistent_prefs); +#endif + RegisterSubresourceFilterPersistentPrefs(persistent_prefs); + +#if defined(OHOS_NWEB_EX) + if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kForBrowser)) { + persistent_prefs.insert(prefs::kPartitionDefaultZoomLevel); + persistent_prefs.insert(prefs::kPartitionPerHostZoomLevels); +#ifdef OHOS_EX_UA + persistent_prefs.insert(nweb_ex::kUACloudConfigInfo); +#endif // OHOS_EX_UA + } +#endif +#ifdef OHOS_CLOUD_CONTROL + RegisterCloudControlPersistentPrefs(persistent_prefs); +#endif factory.set_user_prefs(base::MakeRefCounted( base::MakeRefCounted(), base::MakeRefCounted(pref_path), @@ -293,6 +320,10 @@ std::unique_ptr CreatePrefService(Profile* profile, SSLConfigServiceManager::RegisterPrefs(registry.get()); update_client::RegisterPrefs(registry.get()); +#if defined(OHOS_EX_EXCEPTION_LIST) + HostContentSettingsMap::RegisterProfilePrefs(registry.get()); +#endif + if (!profile) { component_updater::RegisterComponentUpdateServicePrefs(registry.get()); domain_reliability::RegisterPrefs(registry.get()); @@ -345,7 +376,16 @@ std::unique_ptr CreatePrefService(Profile* profile, #endif #if BUILDFLAG(IS_OHOS) ohos_safe_browsing::RegisterProfilePrefs(registry.get()); - #endif +#endif +#ifdef OHOS_EX_UA + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + nweb_ex::AlloyBrowserUAConfig::RegisterProfilePrefs(registry.get()); + } +#endif +#ifdef OHOS_CLOUD_CONTROL + RegisterCloudControlProfilePrefs(registry.get()); +#endif HostContentSettingsMap::RegisterProfilePrefs(registry.get()); language::LanguagePrefs::RegisterProfilePrefs(registry.get()); media_router::RegisterProfilePrefs(registry.get()); @@ -399,6 +439,11 @@ std::unique_ptr CreatePrefService(Profile* profile, // Based on browser_prefs::RegisterProfilePrefs. registry->RegisterBooleanPref(prefs::kAccessibilityPdfOcrAlwaysActive, false); +#if defined(OHOS_EDM_POLICY) + // Currently OriginAgentCluster is not enabled by default on OHOS. + registry->RegisterBooleanPref(prefs::kOriginAgentClusterDefaultEnabled, + false); +#endif // Spell checking preferences. // Modify defaults from SpellcheckServiceFactory::RegisterProfilePrefs. @@ -464,6 +509,71 @@ std::string GetAcceptLanguageList(CefBrowserContext* browser_context, return std::string(); } +#if defined(OHOS_ARKWEB_EXTENSIONS) +void RegisterExtensionPersistentPrefs(PrefNameSet& pref_name_set) { + // See extensions::ExtensionPrefs::RegisterProfilePrefs + pref_name_set.insert(extensions::pref_names::kExtensions); + pref_name_set.insert(extensions::pref_names::kPinnedExtensions); + pref_name_set.insert(extensions::pref_names::kDeletedComponentExtensions); + pref_name_set.insert(extensions::pref_names::kExtensionsBlocklistUpdate); + pref_name_set.insert(extensions::pref_names::kInstallAllowList); + pref_name_set.insert(extensions::pref_names::kInstallDenyList); + pref_name_set.insert(extensions::pref_names::kInstallForceList); + pref_name_set.insert(extensions::pref_names::kAllowedTypes); + pref_name_set.insert(extensions::pref_names::kManifestV2Availability); + pref_name_set.insert(extensions::pref_names::kStorageGarbageCollect); + pref_name_set.insert(extensions::pref_names::kAllowedInstallSites); + pref_name_set.insert(extensions::pref_names::kLastChromeVersion); + pref_name_set.insert(extensions::pref_names::kInstallSignature); + pref_name_set.insert(extensions::pref_names::kExternalUninstalls); + pref_name_set.insert(extensions::pref_names::kExtendedBackgroundLifetimeForPortConnectionsToUrls); + pref_name_set.insert(extensions::pref_names::kChromeAppsWebViewPermissiveBehaviorAllowed); + pref_name_set.insert(extensions::pref_names::kNativeMessagingBlocklist); + pref_name_set.insert(extensions::pref_names::kNativeMessagingAllowlist); + pref_name_set.insert(extensions::pref_names::kNativeMessagingUserLevelHosts); + pref_name_set.insert(extensions::kCorruptedDisableCount.name); + pref_name_set.insert(extensions::pref_names::kAppFullscreenAllowed); + pref_name_set.insert(extensions::pref_names::kBlockExternalExtensions); + pref_name_set.insert(extensions::pref_names::kExtensionUnpublishedAvailability); + + // See extensions::ExtensionsUI::RegisterProfilePrefs + pref_name_set.insert(prefs::kExtensionsUIDeveloperMode); + + // See DevToolsWindow::RegisterProfilePrefs + pref_name_set.insert(prefs::kDevToolsEditedFiles); + pref_name_set.insert(prefs::kDevToolsFileSystemPaths); + pref_name_set.insert(prefs::kDevToolsAdbKey); + pref_name_set.insert(prefs::kDevToolsDiscoverUsbDevicesEnabled); + pref_name_set.insert(prefs::kDevToolsPortForwardingEnabled); + pref_name_set.insert(prefs::kDevToolsPortForwardingDefaultSet); + pref_name_set.insert(prefs::kDevToolsPortForwardingConfig); + pref_name_set.insert(prefs::kDevToolsDiscoverTCPTargetsEnabled); + pref_name_set.insert(prefs::kDevToolsTCPDiscoveryConfig); + pref_name_set.insert(prefs::kDevToolsPreferences); + pref_name_set.insert(prefs::kDevToolsSyncPreferences); + pref_name_set.insert(prefs::kDevToolsSyncedPreferencesSyncEnabled); + pref_name_set.insert(prefs::kDevToolsSyncedPreferencesSyncDisabled); + + // See extensions::CommandService::RegisterProfilePrefs + pref_name_set.insert(prefs::kExtensionCommands); + + // See extensions::PermissionsManager::RegisterProfilePrefs + pref_name_set.insert(extensions::kUserPermissions.name); + + // See ExtensionWebUI::RegisterProfilePrefs + pref_name_set.insert(ExtensionWebUI::kExtensionURLOverrides); + + // See preinstalled_apps::RegisterProfilePrefs + pref_name_set.insert(prefs::kPreinstalledAppsInstallState); +} +#endif + +#if defined(OHOS_CLOUD_CONTROL) && !defined(OHOS_NWEB_EX) + void RegisterCloudControlProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {} + + void RegisterCloudControlPersistentPrefs(PrefNameSet& pref_name_set) {} +#endif + #ifdef OHOS_ARKWEB_ADBLOCK void RegisterSubresourceFilterPersistentPrefs(PrefNameSet& pref_name_set) { pref_name_set.insert( diff --git a/libcef/browser/prefs/browser_prefs.h b/libcef/browser/prefs/browser_prefs.h index 1985f9afebf3095e2aee4e197edbc21c08abc690..465f51e8113752683206785fc7915fed22b3b201 100644 --- a/libcef/browser/prefs/browser_prefs.h +++ b/libcef/browser/prefs/browser_prefs.h @@ -11,6 +11,13 @@ #include +#if defined(OHOS_ARKWEB_EXTENSIONS) +#include "components/prefs/pref_name_set.h" +#endif +#ifdef OHOS_CLOUD_CONTROL +#include "components/pref_registry/pref_registry_syncable.h" +#endif + namespace base { class FilePath; } @@ -30,6 +37,20 @@ extern const char kUserPrefsFileName[]; void RegisterLocalStatePrefs(PrefRegistrySimple* registry); void RegisterProfilePrefs(PrefRegistrySimple* registry); +#if defined(OHOS_ARKWEB_EXTENSIONS) +void RegisterExtensionPersistentPrefs(PrefNameSet& pref_name_set); +#endif + +#ifdef OHOS_ARKWEB_ADBLOCK +void RegisterSubresourceFilterPersistentPrefs(PrefNameSet& pref_name_set); +#endif + +#ifdef OHOS_CLOUD_CONTROL +void RegisterCloudControlProfilePrefs(user_prefs::PrefRegistrySyncable* registry); + +void RegisterCloudControlPersistentPrefs(PrefNameSet& pref_name_set); +#endif + // Create the PrefService used to manage pref registration and storage. // |profile| will be nullptr for the system-level PrefService. Used with the // Alloy runtime only. diff --git a/libcef/browser/prefs/renderer_prefs.cc b/libcef/browser/prefs/renderer_prefs.cc index 5adfb848a4a6f594ceab99006d9060c1f5cf6ab3..5d3b9d46b619ae1e2665f3f00d52096a9f4a4cc0 100755 --- a/libcef/browser/prefs/renderer_prefs.cc +++ b/libcef/browser/prefs/renderer_prefs.cc @@ -44,10 +44,19 @@ #include "ui/native_theme/native_theme.h" #if BUILDFLAG(IS_OHOS) +#include "base/ohos/sys_info_utils.h" #include "content/public/browser/render_widget_host.h" #include "libcef/browser/osr/render_widget_host_view_osr.h" #endif +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/content_settings/core/common/content_settings.h" +#include "components/content_settings/core/common/content_settings_types.h" +#include "content/public/common/content_switches.h" +#endif + namespace renderer_prefs { namespace { @@ -262,12 +271,11 @@ void SetCefSpecialPrefs(content::RenderViewHost* rvh, if (rwhvb && rwhvb->IsRenderWidgetHostViewChildFrame()) { return; } - CefRenderWidgetHostViewOSR* view = - static_cast(rwhvb); - if (view) { - view->SetDoubleTapSupportEnabled( + + if (rwhvb) { + rwhvb->SetDoubleTapSupportEnabled( browser->settings().supports_double_tap_zoom); - view->SetMultiTouchZoomSupportEnabled( + rwhvb->SetMultiTouchZoomSupportEnabled( browser->settings().supports_multi_touch_zoom); } } @@ -311,6 +319,27 @@ void SetDefaultPrefs(blink::web_pref::WebPreferences& web) { command_line->HasSwitch(switches::kImageShrinkStandaloneToFit); web.text_areas_are_resizable = !command_line->HasSwitch(switches::kDisableTextAreaResize); + +#if BUILDFLAG(IS_OHOS) + // These OHOS default prefs defined in web_preferences.cc is only used for + // none PC device, PC device has different prefs as below. + if (base::ohos::IsPcDevice()) { + web.viewport_meta_enabled = false; + web.auto_zoom_focused_editable_to_legible_scale = false; + web.shrinks_viewport_contents_to_fit = false; + web.viewport_style = blink::mojom::ViewportStyle::kDefault; + web.always_show_context_menu_on_touch = true; + web.smooth_scroll_for_find_enabled = false; + web.main_frame_resizes_are_orientation_changes = false; + + web.double_tap_to_zoom_enabled = false; + + web.text_autosizing_enabled = false; + + web.default_minimum_page_scale_factor = 1.f; + web.default_maximum_page_scale_factor = 4.f; + } +#endif } // Helper macro for setting a WebPreferences variable based on the value of a @@ -422,6 +451,7 @@ void SetCefPrefs(const CefBrowserSettings& cef, web.embed_tag_type = CefString(&cef.embed_tag_type); web.draw_mode = cef.draw_mode; SET_STATE(cef.text_autosizing_enabled, web.text_autosizing_enabled); + web.force_zero_layout_height = cef.force_zero_layout_height; #if defined(OHOS_DARKMODE) if (cef.dark_prefer_color_scheme_enabled == STATE_ENABLED) { web.preferred_color_scheme = blink::mojom::PreferredColorScheme::kDark; @@ -447,10 +477,6 @@ void SetCefPrefs(const CefBrowserSettings& cef, #endif // OHOS_SCROLLBAR #ifdef OHOS_EX_FREE_COPY web.contextmenu_customization_enabled = cef.contextmenu_customization_enabled; -#endif -#ifdef OHOS_EX_BLANK_TARGET_POPUP_INTERCEPT - web.blank_target_popup_intercept_enabled = - cef.blank_target_popup_intercept_enabled; #endif if (cef.viewport_meta_enabled.has_value()) web.viewport_meta_enabled = cef.viewport_meta_enabled.value(); @@ -467,18 +493,22 @@ void SetCefPrefs(const CefBrowserSettings& cef, web.custom_video_player_enable = cef.custom_video_player_enable; web.custom_video_player_overlay = cef.custom_video_player_overlay; #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_MULTI_WINDOW) + web.supports_multiple_windows = cef.supports_multiple_windows; +#endif // OHOS_MULTI_WINDOW #if defined(OHOS_SOFTWARE_COMPOSITOR) web.record_whole_document = cef.record_whole_document; #endif -#if defined(OHOS_MULTI_WINDOW) - web.supports_multiple_windows = cef.supports_multiple_windows; -#endif // OHOS_MULTI_WINDOW - #ifdef OHOS_NETWORK_LOAD SET_STATE(cef.universal_access_from_file_urls, web.allow_universal_access_from_file_urls); #endif + +#ifdef OHOS_MEDIA_NETWORK_TRAFFIC_PROMPT + web.enable_media_network_traffic_prompt = + cef.enable_media_network_traffic_prompt; +#endif // OHOS_MEDIA_NETWORK_TRAFFIC_PROMPT } void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -570,6 +600,28 @@ void PopulateWebPreferences(content::RenderViewHost* rvh, SetCefSpecialPrefs(rvh, browser, web); #endif +#if defined(OHOS_EX_EXCEPTION_LIST) + const base::CommandLine* command_line = + base::CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kForBrowser)) { + bool javascript_enabled = web.javascript_enabled; + + // Update content setting default value + ContentSetting setting = + javascript_enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK; + if (!web_contents) + return; + HostContentSettingsMap* host_content_settings_map = + HostContentSettingsMapFactory::GetForProfile( + web_contents->GetBrowserContext()); + host_content_settings_map->SetDefaultContentSetting( + ContentSettingsType::JAVASCRIPT, setting); + DVLOG(0) + << "ExceptionList Update default content setting for JavaScript: " + << int(setting); + } +#endif // defined(OHOS_EX_EXCEPTION_LIST) + web.picture_in_picture_enabled = browser->IsPictureInPictureSupported(); // Set the background color for the WebView. diff --git a/libcef/browser/printing/ohos_print_manager.cc b/libcef/browser/printing/ohos_print_manager.cc index 1cfdc8bf71544305b9d386b304e25e3f93350e2c..d895b18a0244d178b0e6503ecf47b40fff73cb61 100755 --- a/libcef/browser/printing/ohos_print_manager.cc +++ b/libcef/browser/printing/ohos_print_manager.cc @@ -30,8 +30,8 @@ #include "base/numerics/safe_conversions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" -#include "chrome/browser/printing/print_view_manager_common.h" #include "chrome/browser/pdf/pdf_frame_util.h" +#include "chrome/browser/printing/print_view_manager_common.h" #include "chrome/common/chrome_switches.h" #include "components/printing/browser/print_manager_utils.h" #include "components/printing/common/print.mojom.h" @@ -50,6 +50,7 @@ constexpr int PRINT_JOB_CREATE_FILE_COMPLETED_SUCCESS = 0; constexpr int PRINT_JOB_CREATE_FILE_COMPLETED_FAILED = 1; constexpr int PRINT_JOB_SPOOLER_CLOSED_FOR_CANCELED = 5; + constexpr int LIMITED_PRINT_RANGE = 5; constexpr int LIMITED_PRINT_DURATION = 10000; const std::string PROTOCOL_PATH = "://"; @@ -201,13 +202,13 @@ void OhosPrintManager::BindPrintManagerHost( // static content::RenderFrameHost* OhosPrintManager::GetRenderFrameHostToUse( - content::WebContents* contents) { + content::WebContents* contents) { + // Pick the plugin frame if `contents` is a PDF viewer guest. content::RenderFrameHost* full_page_plugin = GetFullPagePlugin(contents); content::RenderFrameHost* pdf_rfh = pdf_frame_util::FindPdfChildFrame( full_page_plugin ? full_page_plugin : contents->GetPrimaryMainFrame()); - if (pdf_rfh) { + if (pdf_rfh) return pdf_rfh; - } return printing::GetFrameToPrint(contents); } @@ -261,13 +262,13 @@ void OhosPrintManager::DidDispatchPrintEvent(bool isBefore) { weak_ptr_web_contents_, isBefore)); } -void OhosPrintManager::DidDispatchPrintEventImpl(base::WeakPtr webcontents, - bool isBefore) { - if (!webcontents) { - LOG(ERROR) << "DidDispatchPrintEventImpl webcontents is nullptr."; +void OhosPrintManager::DidDispatchPrintEventImpl(base::WeakPtr web_contents, + bool isBefore) { + if (!web_contents) { + LOG(ERROR) << "DidDispatchPrintEventImpl webContents is nullptr."; return; } - auto* rfh = webcontents->GetPrimaryMainFrame(); + auto* rfh = web_contents->GetPrimaryMainFrame(); if (!rfh || !rfh->IsRenderFrameLive()) { LOG(ERROR) << "rfh is nullptr."; return; @@ -290,13 +291,13 @@ void OhosPrintManager::PrintPage(bool isApplication) { weak_ptr_web_contents_, isApplication)); } -void OhosPrintManager::PrintPageImpl(base::WeakPtr webcontents, +void OhosPrintManager::PrintPageImpl(base::WeakPtr web_contents, bool isApplication) { - if (!webcontents) { - LOG(ERROR) << "PrintPageImpl webcontents is nullptr."; + if (!web_contents) { + LOG(ERROR) << "PrintPageImpl webContents is nullptr."; return; } - auto* rfh = webcontents->GetPrimaryMainFrame(); + auto* rfh = web_contents->GetPrimaryMainFrame(); if (!rfh || !rfh->IsRenderFrameLive()) { LOG(ERROR) << "rfh is nullptr."; if (printAttrsMap_.find(print_job_id_) != printAttrsMap_.end()) { @@ -317,8 +318,9 @@ void OhosPrintManager::PrintPageImpl(base::WeakPtr webcont GetPrintRenderFrame(pdf_rfh_)->ApplicationPrintRequestedPages(); return; } + if (isApplication) { - auto* app_rfh = GetRenderFrameHostToUse(webcontents.get()); + auto* app_rfh = GetRenderFrameHostToUse(web_contents.get()); if (app_rfh) { GetPrintRenderFrame(app_rfh)->ApplicationPrintRequestedPages(); } @@ -357,6 +359,7 @@ void OhosPrintManager::UpdateParam( DCHECK(callback); settings_ = std::move(settings); fd_ = file_descriptor; + set_pdf_writing_done_callback(std::move(callback)); // Set a valid dummy cookie value. set_cookie(1); @@ -424,7 +427,6 @@ void OhosPrintManager::DidPrintDocument( } DCHECK(pdf_writing_done_callback()); - task_runner_->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&SaveDataToFd, fd_, number_pages(), data), base::BindOnce(&OhosPrintManager::OnDidPrintDocumentWritingDone, @@ -533,9 +535,7 @@ void OhosPrintManager::RunPrintRequestedCallbackImpl(const std::string& jobId) { is_pdf_print_ = false; return; } - if (printRequestedCallback_) { - std::move(printRequestedCallback_).Run(); - } + std::move(printRequestedCallback_).Run(); } void OhosPrintManager::PrintPdfRequested() { @@ -609,7 +609,6 @@ void OhosPrintManager::SetPrintStatus(bool is_print_now, uint32_t state) { is_print_now_ = true; is_print_disable_ = true; } - is_print_now_ = is_print_now; } void OhosPrintManager::CreateWebPrintDocumentAdapter( @@ -617,11 +616,10 @@ void OhosPrintManager::CreateWebPrintDocumentAdapter( void** webPrintDocumentAdapter) { if (is_print_now_) { LOG(ERROR) << "Application printing in progress."; - *webPrintDocumentAdapter = nullptr; return; } - is_print_now_ = true; cancel_ = false; + is_print_now_ = true; *webPrintDocumentAdapter = static_cast(new ApplicationPrintDocumentAdapterImpl(this)); } diff --git a/libcef/browser/printing/ohos_print_manager.h b/libcef/browser/printing/ohos_print_manager.h index 2819ffbf9d762c7678fcbc15425a88e578dd2e72..f25c092d628a799bed454d21244da8df87ef5412 100755 --- a/libcef/browser/printing/ohos_print_manager.h +++ b/libcef/browser/printing/ohos_print_manager.h @@ -51,10 +51,8 @@ class OhosPrintManager : public printing::PrintManager, mojo::PendingAssociatedReceiver receiver, content::RenderFrameHost* rfh); - static content::RenderFrameHost* GetRenderFrameHostToUse( content::WebContents* contents); - // printing::PrintManager: void PdfWritingDone(int page_count) override; @@ -66,18 +64,20 @@ class OhosPrintManager : public printing::PrintManager, PdfWritingDoneCallback callback); bool PrintNow(); void PrintPage(bool isApplication); - void PrintPageImpl(base::WeakPtr webcontents, + void PrintPageImpl(base::WeakPtr web_contents, bool isApplication); void DidDispatchPrintEvent(bool isBefore); - void DidDispatchPrintEventImpl(base::WeakPtr webcontents, + void DidDispatchPrintEventImpl(base::WeakPtr web_contents, bool isBefore); void SetPrintAttrs(const PrintAttrs printAttrs); void RunPrintRequestedCallback(const std::string& jobId); void RunPrintRequestedCallbackImpl(const std::string& jobId); void SetToken(void* token); - void SetPrintStatus(bool is_print_now, uint32_t status); + void SetPrintStatus(bool is_print_now, uint32_t state); void CreateWebPrintDocumentAdapter(const CefString& jobName, void** webPrintDocumentAdapter); + void SetPrintBackground(bool enable); + bool GetPrintBackground(); void CheckForCancel(int32_t preview_ui_id, int32_t request_id, CheckForCancelCallback callback) override; @@ -90,8 +90,6 @@ class OhosPrintManager : public printing::PrintManager, void ShowScriptedPrintPreview(bool source_is_modifiable) override; void UpdatePrintSettings(base::Value::Dict job_settings, UpdatePrintSettingsCallback callback) override; - void SetPrintBackground(bool enable); - bool GetPrintBackground(); private: friend class content::WebContentsUserData; diff --git a/libcef/browser/report_manager.cc b/libcef/browser/report_manager.cc index a529fadc2ef6a55150fe024f31e95ee2408f5f34..a3ba6c3e5111a250c0d21f5fb3422628200ef53e 100644 --- a/libcef/browser/report_manager.cc +++ b/libcef/browser/report_manager.cc @@ -25,7 +25,6 @@ void CefReportManager::ExposeInterfacesToRenderer( service_manager::BinderRegistry* registry, blink::AssociatedInterfaceRegistry*associated_registry, content::RenderProcessHost* host) { - registry->AddInterface(base::BindRepeating( [](int render_process_id, mojo::PendingReceiver receiver) { @@ -37,7 +36,9 @@ void CefReportManager::ExposeInterfacesToRenderer( } void CefReportManager::ReportKeyThread(int status, int process_id, int thread_id, int role) { - LOG(DEBUG) << "ReportKeyThread process_id:" << process_id << ", thread_id:" << thread_id << ", render_process_id:" << render_process_id_; + LOG(DEBUG) << "ReportKeyThread process_id:" << process_id + << ", thread_id:" << thread_id + << ", render_process_id:" << render_process_id_; OHOS::NWeb::ResSchedClientAdapter::ReportKeyThread( static_cast(status), diff --git a/libcef/browser/request_context_impl.cc b/libcef/browser/request_context_impl.cc index f7950ff1582bc0398632380ac3b50bc35383a8fb..32ba7184c2d04f5592541f0e10fe1129453c4f95 100644 --- a/libcef/browser/request_context_impl.cc +++ b/libcef/browser/request_context_impl.cc @@ -633,7 +633,13 @@ CefRequestContextImpl::GetOrCreateRequestContext(const Config& config) { CefRequestContextImpl::CefRequestContextImpl( const CefRequestContextImpl::Config& config) - : config_(config) {} + : config_(config) { +#if defined(OHOS_ARKWEB_EXTENSIONS) + if (config.is_global && !config_.settings.global_request_context) { + config_.settings.global_request_context = this; + } +#endif + } void CefRequestContextImpl::Initialize() { CEF_REQUIRE_UIT(); @@ -673,7 +679,7 @@ void CefRequestContextImpl::Initialize() { if (config_.incognito_mode) { browser_context_ = CefAppManager::Get()->CreateNewIncognitoBrowserContext( - config_.settings, std::move(initialized_cb)); + config_.settings, std::move(initialized_cb)); } else { browser_context_ = CefAppManager::Get()->CreateNewBrowserContext( config_.settings, std::move(initialized_cb)); diff --git a/libcef/browser/request_context_impl.h b/libcef/browser/request_context_impl.h index 30c081b0c863bed51709e821281ca4d65b895c8b..67f31ba24ce951c648e4f3ed2a435ae6c4b51cb1 100644 --- a/libcef/browser/request_context_impl.h +++ b/libcef/browser/request_context_impl.h @@ -60,7 +60,7 @@ class CefRequestContextImpl : public CefRequestContext { ); #if defined(OHOS_INCOGNITO_MODE) -bool IsOffTheRecord() { return config_.incognito_mode; } + bool IsOffTheRecord() { return config_.incognito_mode; } #endif // Verify that the browser context can be directly accessed (e.g. on the UI diff --git a/libcef/browser/res_reporter.cc b/libcef/browser/res_reporter.cc index 6d6b377e3f53df9ccd309ecc8ad2bbe151fea968..46f45814f486c3c6f5cf3e8ca5e875aaec68b418 100644 --- a/libcef/browser/res_reporter.cc +++ b/libcef/browser/res_reporter.cc @@ -32,7 +32,7 @@ void ResReporter::Init() { int ret = LoadLibrary(); if (!ret) { - LOG(WARNING) << "ResReporter:[Init] dlopen libframe_ui_intf.so failed!"; + LOG(DEBUG) << "ResReporter:[Init] dlopen libframe_ui_intf.so failed!"; return; } LOG(INFO) << "ResReporter::[Init] dlopen libframe_ui_intf.so success!"; @@ -47,7 +47,7 @@ bool ResReporter::LoadLibrary() if (!resSchedSoLoaded_) { resSchedHandle_ = dlopen(FRAME_AWARE_SO_PATH.c_str(), RTLD_LAZY); if (resSchedHandle_ == nullptr) { - LOG(WARNING) << "ResReporter:[LoadLibrary]dlopen libframe_ui_intf.so failed!"; + LOG(DEBUG) << "ResReporter:[LoadLibrary]dlopen libframe_ui_intf.so failed!"; return false; } resSchedSoLoaded_ = true; @@ -59,7 +59,7 @@ bool ResReporter::LoadLibrary() void ResReporter::CloseLibrary() { if (dlclose(resSchedHandle_) != 0) { - LOG(WARNING) << "ResReporter:[CloseLibrary]dlclose libframe_ui_intf.so failed!"; + LOG(DEBUG) << "ResReporter:[CloseLibrary]dlclose libframe_ui_intf.so failed!"; return; } resSchedHandle_ = nullptr; @@ -70,13 +70,13 @@ void ResReporter::CloseLibrary() void *ResReporter::LoadSymbol(const char *symName) { if (!resSchedSoLoaded_) { - LOG(WARNING) << "ResReporter:[LoadSymbol]libframe_ui_intf.so not loaded."; + LOG(DEBUG) << "ResReporter:[LoadSymbol]libframe_ui_intf.so not loaded."; return nullptr; } void *funcSym = dlsym(resSchedHandle_, symName); if (funcSym == nullptr) { - LOG(WARNING) << "ResReporter:[LoadSymbol]Get symbol failed: " << symName; + LOG(DEBUG) << "ResReporter:[LoadSymbol]Get symbol failed: " << symName; return nullptr; } return funcSym; @@ -93,7 +93,7 @@ void ResReporter::AddRtg(std::vector tids) if (resAddRtgFunc_ != nullptr) { return resAddRtgFunc_(tids); } else { - LOG(WARNING) << "ResReporter:[AddRtg]load WebviewAddRtg function failed!"; + LOG(DEBUG) << "ResReporter:[AddRtg]load WebviewAddRtg function failed!"; return; } } @@ -109,7 +109,7 @@ void ResReporter::FetchBegin() if (resFetchBeginFunc_ != nullptr) { return resFetchBeginFunc_(); } else { - LOG(WARNING) << "ResReporter:[FetchBegin]load WebResFetchBegin function failed!"; + LOG(DEBUG) << "ResReporter:[FetchBegin]load WebResFetchBegin function failed!"; return; } } @@ -125,7 +125,7 @@ void ResReporter::FetchEnd() if (resFetchEndFunc_ != nullptr) { return resFetchEndFunc_(); } else { - LOG(WARNING) << "ResReporter:[FetchEnd]load WebResFetchEnd function failed!"; + LOG(DEBUG) << "ResReporter:[FetchEnd]load WebResFetchEnd function failed!"; return; } } \ No newline at end of file diff --git a/libcef/browser/ohos_safe_browsing/ohos_safe_browsing_response.h b/libcef/browser/safe_browsing/safe_browsing_response.h similarity index 87% rename from libcef/browser/ohos_safe_browsing/ohos_safe_browsing_response.h rename to libcef/browser/safe_browsing/safe_browsing_response.h index 0088410d8a0b2538e444b88b3150c8f89d141b71..101199047a95983c76e8090d820c2be42b8e1125 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_safe_browsing_response.h +++ b/libcef/browser/safe_browsing/safe_browsing_response.h @@ -1,20 +1,9 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SAFE_BROWSING_RESPONSE_H_ -#define CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SAFE_BROWSING_RESPONSE_H_ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SAFE_BROWSING_RESPONSE_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SAFE_BROWSING_RESPONSE_H_ #include @@ -176,7 +165,7 @@ static bool ParseCustomValueVector(const base::Value* value, } } } - + return true; } @@ -221,11 +210,11 @@ struct SafeBrowsingResponse { &ParseCustomValueResult); converter ->RegisterCustomValueField>( - "hasCheckResult", &SafeBrowsingResponse::hash_check_result, + "hashCheckResult", &SafeBrowsingResponse::hash_check_result, &ParseCustomValueVector); } }; } // namespace ohos_safe_browsing -#endif // CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SAFE_BROWSING_RESPONSE_H_ +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SAFE_BROWSING_RESPONSE_H_ diff --git a/libcef/browser/safe_browsing/safe_browsing_tab_helper.cc b/libcef/browser/safe_browsing/safe_browsing_tab_helper.cc new file mode 100644 index 0000000000000000000000000000000000000000..5a89723bffd27e7f7389d52f5cbb6fd2de09aa27 --- /dev/null +++ b/libcef/browser/safe_browsing/safe_browsing_tab_helper.cc @@ -0,0 +1,399 @@ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "libcef/browser/safe_browsing/safe_browsing_tab_helper.h" + +#include "base/base_switches.h" +#include "base/command_line.h" +#include "base/json/json_reader.h" +#include "base/json/json_string_value_serializer.h" +#include "base/json/json_writer.h" +#include "components/user_prefs/user_prefs.h" +#include "content/browser/renderer_host/navigation_request.h" +#include "content/public/browser/browser_context.h" +#include "content/public/browser/navigation_handle.h" +#include "crypto/sha2.h" +#include "libcef/browser/browser_context.h" +#include "libcef/browser/net_service/url_loader_factory_getter.h" +#include "libcef/browser/safe_browsing/safe_browsing_response.h" +#include "libcef/browser/safe_browsing/sb_threat_type.h" +#include "services/network/public/cpp/resource_request.h" +#include "services/network/public/cpp/shared_url_loader_factory.h" +#include "services/network/public/cpp/simple_url_loader.h" +#include "services/network/public/mojom/url_response_head.mojom.h" +#include "url/gurl.h" + +#include "libcef/browser/alloy/alloy_browser_host_impl.h" +#include "libcef/browser/safe_browsing/sb_prefs.h" +#include "net/base/net_errors.h" +#include "net/base/registry_controlled_domains/registry_controlled_domain.h" +#include "net/http/http_status_code.h" + +namespace ohos_safe_browsing { + +namespace { +constexpr size_t kHashPrefixLength = 6; // bytes +constexpr char kPackageName[] = "packageName"; +constexpr char kUrl[] = "url"; +constexpr char kDomain[] = "domain"; +constexpr char kUrlHashPrefix[] = "urlHashPrefix"; +constexpr char kTpCheckSwitch[] = "tpCheckSwitch"; +constexpr char kContentTypeJSON[] = "application/json"; +constexpr char kXHwGrsAttrGroupHeader[] = "X-HW-GRS-ATTR-GROUP"; +constexpr char kSerLocation[] = "ser-location=CN"; + +#if defined(CLOUD_ENV) +const char kSafeSearchApiUrl[] = + CLOUD_ENDPOINT "/security/v1/oh/securityurls" CLOUD_GRAYSCALE_QUERY; +#else +const char kSafeSearchApiUrl[] = + "https://browsercfg-drcn.cloud.dbankcloud.cn/security/v1/oh/securityurls"; +#endif // defined(CLOUD_ENV) +const char kReplaceStr[] = "***"; + +constexpr net::NetworkTrafficAnnotationTag kSafeBrowsingTrafficAnnotationTag = + net::DefineNetworkTrafficAnnotation("ohos-safe-browsing", R"( + semantics { + sender: "ohos-safe-browsing check" + description: + "" + trigger: + "" + data: "" + destination: OTHER + } + policy { + cookies_allowed: YES + setting: + "" + policy_exception_justification: + "" + })"); + +content::BrowserContext* GetBrowserContext() { + std::vector browser_context_all = + CefBrowserContext::GetAll(); + if (browser_context_all.size() > 0) { + return browser_context_all[0]->AsBrowserContext(); + } + return nullptr; +} + +std::string GetFullHash(const GURL& gurl) { + std::string url = gurl.spec(); + if (base::StartsWith(url, "https://")) { + url = url.substr(8); + } else if (base::StartsWith(url, "http://")) { + url = url.substr(7); + } + if (base::EndsWith(url, "/")) { + url = url.substr(0, url.rfind("/")); + } + + std::string full_hash = crypto::SHA256HashString(url); + return base::ToLowerASCII(base::HexEncode(full_hash.data(), full_hash.size())); +} + +std::string GenerateHashPrefix(const GURL& gurl) { + return base::ToLowerASCII(GetFullHash(gurl).substr(0, kHashPrefixLength)); +} + +OHSBThreatType TransformMappingType(std::string mapping_type) { + if (mapping_type == "THREAT_ILLEGAL") { + return OHSBThreatType::THREAT_ILLEGAL; + } + if (mapping_type == "THREAT_FRAUD") { + return OHSBThreatType::THREAT_FRAUD; + } + if (mapping_type == "THREAT_RISK") { + return OHSBThreatType::THREAT_RISK; + } + if (mapping_type == "THREAT_WARNING") { + return OHSBThreatType::THREAT_WARNING; + } + return OHSBThreatType::THREAT_DEFAULT; +} + +GURL StripAuth(const GURL& gurl) { + GURL::Replacements rep; + rep.ClearUsername(); + rep.ClearPassword(); + return gurl.ReplaceComponents(rep); +} + +std::string ConvertUrlQuery(const std::string& url) { + if (url.length() == 0) { + return url; + } + url::Parsed parsed; + url::ParseStandardURL(url.data(), url.length(), &parsed); + std::string converted; + url::Component& part = parsed.query; + + if (parsed.path.is_valid()) { + converted.append(url, 0, parsed.path.end()); + } else { + return url; + } + if (!part.is_valid()) { + return converted; + } + converted.append("?"); + + int i = 0; + int appendStart = part.begin; + bool replaceFlag = false; + for (i = part.begin; i < part.end(); i++) { + if ('=' == url[i]) { + converted.append(url, appendStart, i - appendStart + 1); + appendStart = part.end(); + replaceFlag = true; + continue; + } + + if ('&' == url[i]) { + if (replaceFlag) { + converted.append(kReplaceStr); + replaceFlag = false; + } + appendStart = i; + } + } + + if (replaceFlag) { + converted.append(kReplaceStr); + } else if (appendStart < part.end()) { + converted.append(url, appendStart, part.end() - appendStart + 1); + } + return converted; +} + +} // namespace + +struct SafeBrowsingTabHelper::SBCheck { + SBCheck(const GURL& url, + std::unique_ptr simple_url_loader); + ~SBCheck(); + + GURL url; + std::unique_ptr simple_url_loader; + base::TimeTicks start_time; +}; + +SafeBrowsingTabHelper::SBCheck::SBCheck( + const GURL& url, + std::unique_ptr simple_url_loader) + : url(url), + simple_url_loader(std::move(simple_url_loader)), + start_time(base::TimeTicks::Now()) {} + +SafeBrowsingTabHelper::SBCheck::~SBCheck() = default; + +SafeBrowsingTabHelper::SafeBrowsingTabHelper(content::WebContents* web_contents, + bool incognito_mode, + CefBrowserHostBase* browser) + : content::WebContentsObserver(web_contents), + content::WebContentsUserData(*web_contents) { + content::BrowserContext* browser_context = GetBrowserContext(); + if (!browser_context) { + return; + } + + if (!browser) { + return; + } + PrefService* pref_service = user_prefs::UserPrefs::Get(browser_context); + if (!pref_service) { + return; + } + + sb_client_.reset(new SbClient(web_contents, pref_service, incognito_mode)); + browser_ = browser; +} + +SafeBrowsingTabHelper::~SafeBrowsingTabHelper() = default; + +void SafeBrowsingTabHelper::DidRedirectNavigation( + content::NavigationHandle* navigation_handle) { + if (!navigation_handle->IsInMainFrame()) { + return; + } + + if (navigation_handle->GetNetErrorCode() == net::ERR_BLOCKED_BY_CLIENT) { + return; + } + + if (content::NavigationRequest::From(navigation_handle) + ->is_synchronous_renderer_commit()) { + LOG(INFO) << "DidRedirectNavigation is_synchronous_renderer_commit"; + return; + } + + if (!navigation_handle->GetURL().SchemeIsHTTPOrHTTPS()) { + return; + } + + QuerySafeBrowsingResults(navigation_handle); +} + +void SafeBrowsingTabHelper::DidStartNavigation( + content::NavigationHandle* navigation_handle) { + if (!navigation_handle->IsInMainFrame()) { + return; + } + + if (navigation_handle->GetNetErrorCode() == net::ERR_BLOCKED_BY_CLIENT) { + return; + } + + if (content::NavigationRequest::From(navigation_handle) + ->is_synchronous_renderer_commit()) { + LOG(INFO) << "is_synchronous_renderer_commit"; + return; + } + + if (!navigation_handle->GetURL().SchemeIsHTTPOrHTTPS()) { + return; + } + + QuerySafeBrowsingResults(navigation_handle); +} + +void SafeBrowsingTabHelper::QuerySafeBrowsingResults( + content::NavigationHandle* navigation_handle) { + + scoped_refptr loader_factory_getter; + loader_factory_getter = + net_service::URLLoaderFactoryGetter::Create(nullptr, GetBrowserContext()); + if (!loader_factory_getter) { + LOG(ERROR) << "SafeBrowsing loader factory getter is null"; + return; + } + + bool is_safe_browsing_enabled = browser_->IsSafeBrowsingEnabled(); + + std::string package_name = "default"; + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(switches::kBundleName)) { + package_name = base::CommandLine::ForCurrentProcess()-> + GetSwitchValueASCII(switches::kBundleName); + } + std::string url_hash_prefix = GenerateHashPrefix(navigation_handle->GetURL()); + int tp_check_switch = is_safe_browsing_enabled ? 1 : 0; + base::Value::Dict request_data; + request_data.Set(kPackageName, package_name); + if (is_safe_browsing_enabled) { + request_data.Set(kUrl, ConvertUrlQuery(StripAuth(navigation_handle->GetURL()).spec())); + } + request_data.Set(kDomain, (navigation_handle->GetURL().scheme() + "://" + navigation_handle->GetURL().host())); + request_data.Set(kUrlHashPrefix, url_hash_prefix); + request_data.Set(kTpCheckSwitch, tp_check_switch); + std::string request_string; + base::JSONWriter::Write(request_data, &request_string); + auto resource_request = std::make_unique(); + resource_request->url = GURL(kSafeSearchApiUrl); + resource_request->method = "POST"; + resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit; + resource_request->headers.SetHeader(kXHwGrsAttrGroupHeader, kSerLocation); + std::unique_ptr simple_url_loader = + network::SimpleURLLoader::Create(std::move(resource_request), + kSafeBrowsingTrafficAnnotationTag); + simple_url_loader->SetAllowHttpErrorResults(true); + simple_url_loader->AttachStringForUpload(request_string, kContentTypeJSON); + std::string converted_url = is_safe_browsing_enabled + ? ConvertUrlQuery(navigation_handle->GetURL().spec()) + : navigation_handle->GetURL().spec(); + + checks_running_.push_front(std::make_unique( + navigation_handle->GetURL(), std::move(simple_url_loader))); + auto it = checks_running_.begin(); + + scoped_refptr url_loader_factory = + loader_factory_getter->GetURLLoaderFactory(); + network::SimpleURLLoader* loader = it->get()->simple_url_loader.get(); + loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie( + url_loader_factory.get(), + base::BindOnce(&SafeBrowsingTabHelper::OnSimpleLoaderComplete, + base::Unretained(this), it, navigation_handle->GetURL(), converted_url)); +} + +void SafeBrowsingTabHelper::OnSimpleLoaderComplete( + SBCheckList::iterator it, + const GURL& url, + std::string converted_url, + std::unique_ptr response_body) { + std::unique_ptr check = std::move(*it); + checks_running_.erase(it); + + int response_code = -1; // Invalid response code. + int net_error = check->simple_url_loader->NetError(); + + if (check->simple_url_loader->ResponseInfo() && + check->simple_url_loader->ResponseInfo()->headers) { + response_code = + check->simple_url_loader->ResponseInfo()->headers->response_code(); + } + if (!response_body || response_body->empty() || *response_body == "{}") { + LOG(INFO) << "OnSimpleLoaderComplete response_body null response_code:" + << response_code << ", net_error:" << net_error; + return; + } + absl::optional parsed_json = + base::JSONReader::Read(*response_body); + if (!parsed_json || !parsed_json->is_dict()) { + LOG(ERROR) << "JSONReader failed reading safe browsing response body : " + << *response_body; + return; + } + SafeBrowsingResponse response; + base::JSONValueConverter converter; + converter.Convert(*parsed_json, &response); + + std::string check_result_url = response.url_check_result.url; + int policy = response.url_check_result.policy; + int hw_code = response.url_check_result.vendor_info.hw_code; + std::string mapping_type = response.url_check_result.mapping_type; + if (hw_code >= 0 && (policy >= OHSBPolicyType::POLICY_NO_PROMPT || policy <= OHSBPolicyType::POLICY_HALF_POPUP)) { + LOG(INFO) << "SafeBrowsing hit url check result policy: " << policy; + if (base::StartsWith(converted_url, check_result_url)) { + sb_client_->SetEvilUrlPolicyAndHwCode( + url, policy, TransformMappingType(mapping_type), hw_code, GURL("")); + return; + } + } + + for (auto& check_result : response.hash_check_result) { + for (auto& hash_result : check_result.hash_result_list) { + if (hash_result.url_hash == GetFullHash(url)) { + std::string hash_mapping_type = check_result.mapping_type; + int hash_policy = hash_result.policy; + int hash_hw_code = std::stoi(hash_result.hw_code); + LOG(INFO) << "SafeBrowsing hit hash check policy " << hash_policy << " url_hw_code " << hash_hw_code; + if (hash_hw_code < 0 || + hash_policy < OHSBPolicyType::POLICY_NO_PROMPT || + hash_policy > OHSBPolicyType::POLICY_HALF_POPUP) { + return; + } + sb_client_->SetEvilUrlPolicyAndHwCode( + url, hash_policy, TransformMappingType(hash_mapping_type), + hash_hw_code, GURL("")); + + return; + } + } + } +} + +void SafeBrowsingTabHelper::DidFinishNavigation( + content::NavigationHandle* navigation_handle) {} + +void SafeBrowsingTabHelper::NavigationStopped() {} + +void SafeBrowsingTabHelper::OnConnectionChanged( + network::mojom::ConnectionType type) {} + +WEB_CONTENTS_USER_DATA_KEY_IMPL(SafeBrowsingTabHelper); + +} // namespace ohos_safe_browsing diff --git a/libcef/browser/safe_browsing/safe_browsing_tab_helper.h b/libcef/browser/safe_browsing/safe_browsing_tab_helper.h new file mode 100644 index 0000000000000000000000000000000000000000..0bf0a7868650b30e9321959b22295c480e201255 --- /dev/null +++ b/libcef/browser/safe_browsing/safe_browsing_tab_helper.h @@ -0,0 +1,77 @@ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_HELPER_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_HELPER_H_ + +#include "content/public/browser/web_contents_observer.h" +#include "content/public/browser/web_contents_user_data.h" +#include "libcef/browser/browser_host_base.h" +#include "libcef/browser/safe_browsing/sb_client.h" +#include "net/traffic_annotation/network_traffic_annotation.h" +#include "services/data_decoder/public/cpp/data_decoder.h" +#include "services/network/public/cpp/network_connection_tracker.h" +#include "services/network/public/cpp/simple_url_loader.h" + +namespace content { +class NavigationHandle; +class WebContents; +} // namespace content + +namespace ohos_safe_browsing { + +using SBCheckCallback = base::OnceCallback; + +class SafeBrowsingTabHelper + : public content::WebContentsObserver, + public content::WebContentsUserData, + public network::NetworkConnectionTracker::NetworkConnectionObserver { + public: + SafeBrowsingTabHelper(const SafeBrowsingTabHelper&) = delete; + SafeBrowsingTabHelper& operator=(const SafeBrowsingTabHelper&) = delete; + ~SafeBrowsingTabHelper() override; + + // content::WebContentsObserver: + void DidStartNavigation( + content::NavigationHandle* navigation_handle) override; + void DidRedirectNavigation( + content::NavigationHandle* navigation_handle) override; + void DidFinishNavigation( + content::NavigationHandle* navigation_handle) override; + void NavigationStopped() override; + + // network::NetworkConnectionTracker::NetworkConnectionObserver: + void OnConnectionChanged(network::mojom::ConnectionType type) override; + + private: + struct SBCheck; + using SBCheckList = std::list>; + + friend class content::WebContentsUserData; + + explicit SafeBrowsingTabHelper(content::WebContents* web_contents, + bool incognito_mode, + CefBrowserHostBase* browser); + + void OnSimpleLoaderComplete(SBCheckList::iterator it, + const GURL& url, + std::string converted_url, + std::unique_ptr response_body); + + void QuerySafeBrowsingResults( + content::NavigationHandle* navigation_handle); + + raw_ptr connection_tracker_; + SBCheckList checks_running_; + std::unique_ptr sb_client_; + CefBrowserHostBase* browser_{nullptr}; + + base::WeakPtrFactory weak_ptr_factory_{this}; + + WEB_CONTENTS_USER_DATA_KEY_DECL(); +}; + +} // namespace ohos_safe_browsing + +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_HELPER_H_ diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_block_page.cc b/libcef/browser/safe_browsing/sb_block_page.cc similarity index 76% rename from libcef/browser/ohos_safe_browsing/ohos_sb_block_page.cc rename to libcef/browser/safe_browsing/sb_block_page.cc index 3a4edd79e2eea6d0d5d9b7055773da2df660b62d..2556bb8c12f152aa55a4e6194effc14e9c9639f5 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_block_page.cc +++ b/libcef/browser/safe_browsing/sb_block_page.cc @@ -1,19 +1,8 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h" +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "libcef/browser/safe_browsing/sb_block_page.h" #include "base/i18n/rtl.h" #include "base/strings/string_number_conversions.h" @@ -27,7 +16,7 @@ namespace ohos_safe_browsing { -OhosSbBlockPage::OhosSbBlockPage( +SbBlockPage::SbBlockPage( content::WebContents* web_contents, const GURL& request_url, int policy, @@ -39,9 +28,9 @@ OhosSbBlockPage::OhosSbBlockPage( block_type_(block_type), policy_(policy) {} -OhosSbBlockPage::~OhosSbBlockPage() = default; +SbBlockPage::~SbBlockPage() = default; -std::string OhosSbBlockPage::GetHTMLContents() { +std::string SbBlockPage::GetHTMLContents() { base::Value::Dict load_time_data; PopulateInterstitialStrings(load_time_data); webui::SetLoadTimeDataDefaults(controller()->GetApplicationLocale(), @@ -54,7 +43,7 @@ std::string OhosSbBlockPage::GetHTMLContents() { return webui::GetI18nTemplateHtml(html, load_time_data); } -void OhosSbBlockPage::CommandReceived(const std::string& command) { +void SbBlockPage::CommandReceived(const std::string& command) { if (command == "\"pageLoadComplete\"") { // content::WaitForRenderFrameReady sends this message when the page // load completes. Ignore it. @@ -68,7 +57,7 @@ void OhosSbBlockPage::CommandReceived(const std::string& command) { static_cast(cmd)); } -void OhosSbBlockPage::HandleCommand( +void SbBlockPage::HandleCommand( security_interstitials::SecurityInterstitialCommand command) { // CMD_DONT_PROCEED if (command == security_interstitials::CMD_DONT_PROCEED) { @@ -81,13 +70,13 @@ void OhosSbBlockPage::HandleCommand( } } -void OhosSbBlockPage::OnInterstitialClosing() {} +void SbBlockPage::OnInterstitialClosing() {} -bool OhosSbBlockPage::ShouldDisplayURL() const { +bool SbBlockPage::ShouldDisplayURL() const { return false; } -void OhosSbBlockPage::PopulateInterstitialStrings( +void SbBlockPage::PopulateInterstitialStrings( base::Value::Dict& load_time_data) { load_time_data.Set("policy", std::to_string(policy_)); load_time_data.Set("title", @@ -111,9 +100,8 @@ void OhosSbBlockPage::PopulateInterstitialStrings( "block_info_body", l10n_util::GetStringUTF8(IDS_OHOS_BLOCK_PAGE_RISK_INFO_BODY)); } else { - load_time_data.Set( - "block_info_body", - l10n_util::GetStringUTF8(IDS_OHOS_BLOCK_PAGE_FRAUD_INFO_BODY)); + load_time_data.Set("block_info_body", + l10n_util::GetStringUTF8(IDS_OHOS_BLOCK_PAGE_FRAUD_INFO_BODY)); } if (base::i18n::IsRTL()) { @@ -128,7 +116,7 @@ void OhosSbBlockPage::PopulateInterstitialStrings( l10n_util::GetStringUTF8(IDS_OHOS_BLOCK_PAGE_PROCEED)); } -void OhosSbBlockPage::PopulateUrlTrustListInterstitialStrings( +void SbBlockPage::PopulateUrlTrustListInterstitialStrings( base::Value::Dict& load_time_data) { load_time_data.Set("title", l10n_util::GetStringUTF8(IDS_OHOS_BLOCK_PAGE_TITLE)); @@ -145,7 +133,7 @@ void OhosSbBlockPage::PopulateUrlTrustListInterstitialStrings( IDS_OHOS_BLOCK_PAGE_DONT_PROCEED)); } -std::string OhosSbBlockPage::GetUrlTrustListErrorHTMLContents() { +std::string SbBlockPage::GetUrlTrustListErrorHTMLContents() { base::Value::Dict load_time_data; PopulateUrlTrustListInterstitialStrings(load_time_data); webui::SetLoadTimeDataDefaults(controller()->GetApplicationLocale(), @@ -153,8 +141,8 @@ std::string OhosSbBlockPage::GetUrlTrustListErrorHTMLContents() { std::string html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( URL_TRUST_LIST_ERROR_OHOS_HTML); - webui::AppendWebUiCssTextDefaults(&html); return webui::GetI18nTemplateHtml(html, load_time_data); } + } // namespace ohos_safe_browsing diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h b/libcef/browser/safe_browsing/sb_block_page.h similarity index 51% rename from libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h rename to libcef/browser/safe_browsing/sb_block_page.h index 5abaaf02fa827ca54b2a947e3a3c367b51008b94..728e92f2c50c3ada18e7919a2a4409c0c3c5bc9a 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h +++ b/libcef/browser/safe_browsing/sb_block_page.h @@ -1,20 +1,9 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_BLOCK_PAGE_H_ -#define CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_BLOCK_PAGE_H_ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_BLOCK_PAGE_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_BLOCK_PAGE_H_ #include @@ -24,8 +13,8 @@ #include "content/public/browser/web_contents.h" #include "url/gurl.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_threat_type.h" +#include "libcef/browser/safe_browsing/sb_controller_client.h" +#include "libcef/browser/safe_browsing/sb_threat_type.h" namespace ohos_safe_browsing { @@ -33,19 +22,19 @@ using security_interstitials::MetricsHelper; using security_interstitials::SecurityInterstitialControllerClient; using security_interstitials::SecurityInterstitialPage; -class OhosSbBlockPage : public SecurityInterstitialPage { +class SbBlockPage : public SecurityInterstitialPage { public: - OhosSbBlockPage( + SbBlockPage( content::WebContents* web_contents, const GURL& request_url, int policy, OHSBThreatType block_type, std::unique_ptr controller_client); - ~OhosSbBlockPage() override; + ~SbBlockPage() override; // DISALLOW_COPY_AND_ASSIGN - OhosSbBlockPage(const OhosSbBlockPage&) = delete; - OhosSbBlockPage& operator=(const OhosSbBlockPage&) = delete; + SbBlockPage(const SbBlockPage&) = delete; + SbBlockPage& operator=(const SbBlockPage&) = delete; std::string GetHTMLContents() override; void OnInterstitialClosing() override; @@ -56,7 +45,8 @@ class OhosSbBlockPage : public SecurityInterstitialPage { void PopulateInterstitialStrings(base::Value::Dict& load_time_data) override; - void PopulateUrlTrustListInterstitialStrings(base::Value::Dict& load_time_data); + void PopulateUrlTrustListInterstitialStrings( + base::Value::Dict& load_time_data); std::string GetUrlTrustListErrorHTMLContents(); @@ -71,4 +61,4 @@ class OhosSbBlockPage : public SecurityInterstitialPage { } // namespace ohos_safe_browsing -#endif // CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_BLOCK_PAGE_H_ +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_BLOCK_PAGE_H_ \ No newline at end of file diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_client.cc b/libcef/browser/safe_browsing/sb_client.cc similarity index 74% rename from libcef/browser/ohos_safe_browsing/ohos_sb_client.cc rename to libcef/browser/safe_browsing/sb_client.cc index 7cb29145143a60a7ba579b8531f785bfea564650..0c512a980ce7406c00331d67f29afe4e1a7ceea7 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_client.cc +++ b/libcef/browser/safe_browsing/sb_client.cc @@ -1,18 +1,8 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "libcef/browser/ohos_safe_browsing/ohos_sb_client.h" +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "libcef/browser/safe_browsing/sb_client.h" #include "base/containers/lru_cache.h" #include "base/i18n/rtl.h" @@ -25,30 +15,30 @@ #include "content/public/common/referrer.h" #include "libcef/browser/alloy/alloy_browser_host_impl.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h" +#include "libcef/browser/safe_browsing/sb_controller_client.h" +#include "libcef/browser/safe_browsing/sb_prefs.h" namespace { constexpr int kMaxCachedProfiles = 100; -base::LRUCache +base::LRUCache blocking_page_info_cache(kMaxCachedProfiles); } // namespace namespace ohos_safe_browsing { -OhosSbClient::OhosSbClient(content::WebContents* web_contents, +SbClient::SbClient(content::WebContents* web_contents, PrefService* prefs, bool incognito_mode) - : content::WebContentsObserver(web_contents), + : content::WebContentsObserver(web_contents), prefs_(prefs), incognito_mode_(incognito_mode) {} -OhosSbClient::~OhosSbClient() = default; +SbClient::~SbClient() = default; // static -bool OhosSbClient::InMaliciousAllowlist(const PrefService* prefs, - const std::string& url, - bool incognito_mode) { +bool SbClient::InMaliciousAllowlist(const PrefService* prefs, + const std::string& url, + bool incognito_mode) { if (!prefs) { return false; } @@ -64,7 +54,7 @@ bool OhosSbClient::InMaliciousAllowlist(const PrefService* prefs, return false; } -void OhosSbClient::NavigationEntryCommitted( +void SbClient::NavigationEntryCommitted( const content::LoadCommittedDetails& load_details) { if (!web_contents() || web_contents()->IsBeingDestroyed()) { return; @@ -87,7 +77,7 @@ void OhosSbClient::NavigationEntryCommitted( ShowBlockingPage(); } -void OhosSbClient::ShowBlockingPage() { +void SbClient::ShowBlockingPage() { if (!web_contents() || web_contents()->IsBeingDestroyed()) { return; } @@ -105,12 +95,13 @@ void OhosSbClient::ShowBlockingPage() { redirect_chain.push_back(virtual_url); std::reverse(redirect_chain.begin(), redirect_chain.end()); - bool is_page_type_normal = + bool is_page_type_normal = (visible_entry->GetPageType() == content::PAGE_TYPE_NORMAL); if (!is_page_type_normal) { return; } - + std::string lang = base::i18n::GetConfiguredLocale(); + for (auto& url : redirect_chain) { const auto& blocking_cached = blocking_page_info_cache.Peek(url); if (blocking_cached != blocking_page_info_cache.end()) { @@ -126,7 +117,7 @@ void OhosSbClient::ShowBlockingPage() { } if ((policy == OHSBPolicyType::POLICY_POPUP_AND_DANGER || - policy == OHSBPolicyType::POLICY_FORBIDDEN_PROHIBIT_ACCESS) && + policy == OHSBPolicyType::POLICY_FORBIDDEN_PROHIBIT_ACCESS) && block_type != OHSBThreatType::THREAT_WARNING) { is_display_block_page = true; NotifySafeBrowsingCheckResult(block_type); @@ -139,14 +130,14 @@ void OhosSbClient::ShowBlockingPage() { } if (is_display_block_page) { - DisplayBlockingPage(url, policy, block_type, "zh-CN"); - return; + DisplayBlockingPage(url, policy, block_type, lang); + return; } } } } -void OhosSbClient::SetEvilUrlPolicyAndHwCode(const GURL& url, +void SbClient::SetEvilUrlPolicyAndHwCode(const GURL& url, int policy, OHSBThreatType block_type, int hw_code, @@ -160,12 +151,12 @@ void OhosSbClient::SetEvilUrlPolicyAndHwCode(const GURL& url, } } -OhosSbClient::BlockingPageInfo::BlockingPageInfo(content::WebContents* web_contents) - : content::WebContentsUserData(*web_contents) {} +SbClient::BlockingPageInfo::BlockingPageInfo(content::WebContents* web_contents) + : content::WebContentsUserData(*web_contents) {} -OhosSbClient::SbBlockingPageInfo::SbBlockingPageInfo() {} +SbClient::SbBlockingPageInfo::SbBlockingPageInfo() {} -OhosSbClient::SbBlockingPageInfo::SbBlockingPageInfo( +SbClient::SbBlockingPageInfo::SbBlockingPageInfo( const GURL& url, ohos_safe_browsing::OHSBThreatType block_type, int hw_code, @@ -177,10 +168,10 @@ OhosSbClient::SbBlockingPageInfo::SbBlockingPageInfo( info_policy(policy), info_redirect_url(redirect_url) {} -OhosSbClient::SbBlockingPageInfo::~SbBlockingPageInfo() {} +SbClient::SbBlockingPageInfo::~SbBlockingPageInfo() {} // static -void OhosSbClient::BlockingPageInfo::SetBlockingPageInfo( +void SbClient::BlockingPageInfo::SetBlockingPageInfo( content::WebContents* web_contents, const GURL& url, int policy, @@ -203,15 +194,15 @@ void OhosSbClient::BlockingPageInfo::SetBlockingPageInfo( } } -void OhosSbClient::DisplayBlockingPage(const GURL& url, +void SbClient::DisplayBlockingPage(const GURL& url, int policy, OHSBThreatType block_type, const std::string& app_locale) { LOG(INFO) << "SafeBrowsing " << __func__ << " url: " << url.spec() << ", type: " << block_type; - auto controller = std::make_unique( + auto controller = std::make_unique( web_contents(), prefs_, url, app_locale, incognito_mode_); - std::unique_ptr blocking_page = std::make_unique( + std::unique_ptr blocking_page = std::make_unique( web_contents(), url, policy, block_type, std::move(controller)); base::WeakPtr error_page_navigation_handle = web_contents()->GetController().LoadPostCommitErrorPage( @@ -224,7 +215,7 @@ void OhosSbClient::DisplayBlockingPage(const GURL& url, } } -bool OhosSbClient::IsBlockPageShowing() { +bool SbClient::IsBlockPageShowing() { security_interstitials::SecurityInterstitialTabHelper* security_interstitial_tab_helper = security_interstitials:: SecurityInterstitialTabHelper::FromWebContents(web_contents()); @@ -232,7 +223,7 @@ bool OhosSbClient::IsBlockPageShowing() { security_interstitial_tab_helper->IsDisplayingInterstitial(); } -void OhosSbClient::NotifySafeBrowsingCheckResult(OHSBThreatType threat_type) { +void SbClient::NotifySafeBrowsingCheckResult(OHSBThreatType threat_type) { if (!web_contents()) { return; } @@ -253,6 +244,6 @@ void OhosSbClient::NotifySafeBrowsingCheckResult(OHSBThreatType threat_type) { load_handler->OnSafeBrowsingCheckResult(type); } -WEB_CONTENTS_USER_DATA_KEY_IMPL(OhosSbClient::BlockingPageInfo); +WEB_CONTENTS_USER_DATA_KEY_IMPL(SbClient::BlockingPageInfo); } // namespace ohos_safe_browsing diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_client.h b/libcef/browser/safe_browsing/sb_client.h similarity index 60% rename from libcef/browser/ohos_safe_browsing/ohos_sb_client.h rename to libcef/browser/safe_browsing/sb_client.h index 87a42706c0aa6126db04183c17380e9604bad0ab..fe62fa31b413173df56f9d4043f9b249a0e0c0b7 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_client.h +++ b/libcef/browser/safe_browsing/sb_client.h @@ -1,20 +1,9 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_CLIENT_H_ -#define CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_CLIENT_H_ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_CLIENT_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_CLIENT_H_ #include @@ -24,21 +13,21 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_threat_type.h" +#include "libcef/browser/safe_browsing/sb_block_page.h" +#include "libcef/browser/safe_browsing/sb_threat_type.h" namespace ohos_safe_browsing { -class OhosSbClient : public content::WebContentsObserver { +class SbClient : public content::WebContentsObserver { public: - explicit OhosSbClient(content::WebContents* web_contents, - PrefService* prefs, - bool incognito_mode); - ~OhosSbClient() override; + explicit SbClient(content::WebContents* web_contents, + PrefService* prefs, + bool incognito_mode); + ~SbClient() override; // DISALLOW_COPY_AND_ASSIGN - OhosSbClient(const OhosSbClient&) = delete; - OhosSbClient& operator=(const OhosSbClient&) = delete; + SbClient(const SbClient&) = delete; + SbClient& operator=(const SbClient&) = delete; struct SbBlockingPageInfo { SbBlockingPageInfo(); @@ -66,13 +55,12 @@ class OhosSbClient : public content::WebContentsObserver { BlockingPageInfo(const BlockingPageInfo&) = delete; BlockingPageInfo& operator=(const BlockingPageInfo&) = delete; - static void SetBlockingPageInfo( - content::WebContents* web_contents, - const GURL& url, - int policy, - OHSBThreatType block_type, - int hw_code, - const GURL& redirect_url); + static void SetBlockingPageInfo(content::WebContents* web_contents, + const GURL& url, + int policy, + OHSBThreatType block_type, + int hw_code, + const GURL& redirect_url); private: explicit BlockingPageInfo(content::WebContents* web_contents); @@ -83,32 +71,38 @@ class OhosSbClient : public content::WebContentsObserver { OHSBThreatType block_type_ = OHSBThreatType::THREAT_DEFAULT; int hw_code_{0}; GURL redirect_url_ = GURL(""); + WEB_CONTENTS_USER_DATA_KEY_DECL(); }; void ShowBlockingPage(); - + bool IsBlockPageShowing(); void SetEvilUrlPolicyAndHwCode(const GURL& url, int policy, OHSBThreatType block_type, int hw_code, - const GURL& redirect_url); + const GURL& redirect_url); static bool InMaliciousAllowlist(const PrefService* prefs, const std::string& url, bool incognito_mode); + + bool InMaliciousAllowlist(const std::string& url) { + return SbClient::InMaliciousAllowlist(prefs_, url, incognito_mode_); + } + private: // WebContentsObserver implementation void NavigationEntryCommitted( const content::LoadCommittedDetails& load_details) override; - + void DisplayBlockingPage(const GURL& url, int policy, OHSBThreatType block_type, const std::string& app_locale); - + void NotifySafeBrowsingCheckResult(OHSBThreatType threat_type); PrefService* prefs_; @@ -117,4 +111,4 @@ class OhosSbClient : public content::WebContentsObserver { } // namespace ohos_safe_browsing -#endif // CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_CLIENT_H_ +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_CLIENT_H_ diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.cc b/libcef/browser/safe_browsing/sb_controller_client.cc similarity index 60% rename from libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.cc rename to libcef/browser/safe_browsing/sb_controller_client.cc index 67c090beed4183da93001d735056bdbe8ae19a17..2263b2a4ac8418dcc292a0bbaaa9534b672476ae 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.cc +++ b/libcef/browser/safe_browsing/sb_controller_client.cc @@ -1,19 +1,8 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#include "libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h" +#include "libcef/browser/safe_browsing/sb_controller_client.h" #include "components/prefs/scoped_user_pref_update.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -22,12 +11,12 @@ #include "content/browser/renderer_host/navigation_controller_impl.h" #include "content/public/browser/web_contents.h" #include "content/public/common/referrer.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h" +#include "libcef/browser/safe_browsing/sb_prefs.h" constexpr char kDefaultPageUrl[] = "about:blank"; -OhosSbControllerClient::OhosSbControllerClient(content::WebContents* web_contents, +SbControllerClient::SbControllerClient(content::WebContents* web_contents, PrefService* prefs, const GURL& url, const std::string& app_locale, @@ -44,10 +33,10 @@ OhosSbControllerClient::OhosSbControllerClient(content::WebContents* web_content url_(url), incognito_mode_(incognito_mode) {} -OhosSbControllerClient::~OhosSbControllerClient() {} +SbControllerClient::~SbControllerClient() {} // static -std::unique_ptr OhosSbControllerClient::GetMetricsHelper( +std::unique_ptr SbControllerClient::GetMetricsHelper( const GURL& url) { MetricsHelper::ReportDetails settings; settings.metric_prefix = "oh.safe_browsing"; @@ -55,39 +44,39 @@ std::unique_ptr OhosSbControllerClient::GetMetricsHelper( return std::make_unique(url, settings, nullptr); } -void OhosSbControllerClient::GoBack() { +void SbControllerClient::GoBack() { SecurityInterstitialControllerClient::GoBackAfterNavigationCommitted(); return; } -void OhosSbControllerClient::Proceed() { +void SbControllerClient::Proceed() { // With committed interstitials the site has already // been added to the allowlist, so reload will proceed. Reload(); return; } -void OhosSbControllerClient::Reload() { +void SbControllerClient::Reload() { if (!web_contents_) return; - ScopedListPrefUpdate(prefs_, - incognito_mode_ ? + ScopedListPrefUpdate(prefs_, + incognito_mode_ ? ohos_safe_browsing::kIncognitoMaliciousAllowList : ohos_safe_browsing::kMaliciousAllowList) ->Append(url_.has_host()? url_.host() : url_.spec()); web_contents_->GetController().Reload(content::ReloadType::NORMAL, true); } -PrefService* OhosSbControllerClient::GetPrefService() { +PrefService* SbControllerClient::GetPrefService() { return prefs_; } -const std::string& OhosSbControllerClient::GetApplicationLocale() const { +const std::string& SbControllerClient::GetApplicationLocale() const { return app_locale_; } -const std::string OhosSbControllerClient::GetExtendedReportingPrefName() const { +const std::string SbControllerClient::GetExtendedReportingPrefName() const { return std::string(); } diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h b/libcef/browser/safe_browsing/sb_controller_client.h similarity index 55% rename from libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h rename to libcef/browser/safe_browsing/sb_controller_client.h index c14da6b2d7a6509afba63611a8a7feae3dc12161..f86633ba8c53b9ab4d6f6bb0011808c0eb402d4a 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_controller_client.h +++ b/libcef/browser/safe_browsing/sb_controller_client.h @@ -1,20 +1,9 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#ifndef CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_CONTROLLER_CLIENT_H_ -#define CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_CONTROLLER_CLIENT_H_ +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_CONTROLLER_CLIENT_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_CONTROLLER_CLIENT_H_ #include #include @@ -38,15 +27,15 @@ class SettingsPageHelper; using security_interstitials::MetricsHelper; using security_interstitials::SecurityInterstitialControllerClient; -class OhosSbControllerClient : public SecurityInterstitialControllerClient { +class SbControllerClient : public SecurityInterstitialControllerClient { public: - OhosSbControllerClient(content::WebContents* web_contents, + SbControllerClient(content::WebContents* web_contents, PrefService* prefs, const GURL& url, const std::string& app_locale, bool incognito_mode); - ~OhosSbControllerClient() override; + ~SbControllerClient() override; void Proceed() override; void Reload() override; @@ -67,4 +56,4 @@ private: bool incognito_mode_{false}; }; -#endif // CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_CONTROLLER_CLIENT_H_ +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_CONTROLLER_CLIENT_H_ diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_prefs.cc b/libcef/browser/safe_browsing/sb_prefs.cc similarity index 40% rename from libcef/browser/ohos_safe_browsing/ohos_sb_prefs.cc rename to libcef/browser/safe_browsing/sb_prefs.cc index 2eb7ef37174afd3dba447448a9fa37843a4aa463..bd00d225d3e3bf660afdf5f0edeb7b404bd12dcc 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_prefs.cc +++ b/libcef/browser/safe_browsing/sb_prefs.cc @@ -1,19 +1,8 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#include "libcef/browser/ohos_safe_browsing/ohos_sb_prefs.h" +#include "libcef/browser/safe_browsing/sb_prefs.h" #include "components/prefs/pref_registry_simple.h" diff --git a/libcef/browser/safe_browsing/sb_prefs.h b/libcef/browser/safe_browsing/sb_prefs.h new file mode 100644 index 0000000000000000000000000000000000000000..6c8cbcb37e3c35d2de8e68b85841acf1e47fc0be --- /dev/null +++ b/libcef/browser/safe_browsing/sb_prefs.h @@ -0,0 +1,20 @@ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_PREFS_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_PREFS_H_ + +#include "components/prefs/pref_registry_simple.h" + +namespace ohos_safe_browsing { + +extern const char kMaliciousAllowList[]; + +extern const char kIncognitoMaliciousAllowList[]; + +void RegisterProfilePrefs(PrefRegistrySimple* registry); + +} // namespace ohos_safe_browsing + +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_PREFS_H_ diff --git a/libcef/browser/ohos_safe_browsing/ohos_sb_threat_type.h b/libcef/browser/safe_browsing/sb_threat_type.h similarity index 39% rename from libcef/browser/ohos_safe_browsing/ohos_sb_threat_type.h rename to libcef/browser/safe_browsing/sb_threat_type.h index 360c2fdc5d9f97635be2769a74f017c5e29c714f..bbdaa88f50199d0db5ff628b5790cab961990dce 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_sb_threat_type.h +++ b/libcef/browser/safe_browsing/sb_threat_type.h @@ -1,20 +1,9 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#ifndef CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_THREAT_TYPE_H_ -#define CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_THREAT_TYPE_H_ +#ifndef CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_THREAT_TYPE_H_ +#define CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_THREAT_TYPE_H_ namespace ohos_safe_browsing { @@ -41,4 +30,4 @@ enum OHSBPolicyType { } // namespace ohos_safe_browsing -#endif // CEF_LIBCEF_BROWSER_OHOS_SAFE_BROWSING_OHOS_SB_THREAT_TYPE_H_ +#endif // CEF_LIBCEF_BROWSER_SAFE_BROWSING_SB_THREAT_TYPE_H_ diff --git a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_interface.h b/libcef/browser/safe_browsing/url_trust_list_interface.h similarity index 91% rename from libcef/browser/ohos_safe_browsing/ohos_url_trust_list_interface.h rename to libcef/browser/safe_browsing/url_trust_list_interface.h index 2eb35d4d61fe2ea0d4b2f734e0d842520af619be..8d861d166b96efef5eb0872bb0e0c7aa573deaea 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_interface.h +++ b/libcef/browser/safe_browsing/url_trust_list_interface.h @@ -32,10 +32,10 @@ enum class UrlListSetResult : int { SET_OK = 0, }; -class OhosUrlTrustListInterface : public base::SupportsUserData::Data { +class UrlTrustListInterface : public base::SupportsUserData::Data { public: static char interfaceKey; - virtual ~OhosUrlTrustListInterface() = default; + virtual ~UrlTrustListInterface() = default; virtual UrlTrustCheckResult CheckUrlTrustList(const GURL& url) { return UrlTrustCheckResult::RESULT_ALLOW; } diff --git a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.cc b/libcef/browser/safe_browsing/url_trust_list_manager.cc similarity index 94% rename from libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.cc rename to libcef/browser/safe_browsing/url_trust_list_manager.cc index 04d059ac356820455bd57b495683a8b0ae015d70..74ac2c068349f080ecf69f1a52e9ce3ad40fcd34 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.cc +++ b/libcef/browser/safe_browsing/url_trust_list_manager.cc @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.h" +#include "libcef/browser/safe_browsing/url_trust_list_manager.h" #include "base/json/json_reader.h" #include "base/values.h" @@ -21,9 +21,9 @@ namespace ohos_safe_browsing { static constexpr int MAX_PATH_SIZE = 0x10000; -char OhosUrlTrustListInterface::interfaceKey; +char UrlTrustListInterface::interfaceKey; -OhosUrlTrustListManager::OhosUrlTrustListManager() {} +UrlTrustListManager::UrlTrustListManager() {} static bool FormatUrlRule(UrlTrustRule& urlRule, std::string& err) { @@ -88,7 +88,7 @@ static bool CheckUrlRuleValid(UrlTrustRule& urlRule, std::string& err) return true; } -UrlListSetResult OhosUrlTrustListManager::SetUrlTrustListWithErrMsg( +UrlListSetResult UrlTrustListManager::SetUrlTrustListWithErrMsg( const std::string& urlTrustList, std::string& detailErrMsg) { if (urlTrustList.empty()) { @@ -135,7 +135,7 @@ UrlListSetResult OhosUrlTrustListManager::SetUrlTrustListWithErrMsg( return UrlListSetResult::SET_OK; } -UrlTrustCheckResult OhosUrlTrustListManager::CheckUrlTrustList( +UrlTrustCheckResult UrlTrustListManager::CheckUrlTrustList( const GURL& url) { if (ruleMap_.size() == 0) { diff --git a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.h b/libcef/browser/safe_browsing/url_trust_list_manager.h similarity index 91% rename from libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.h rename to libcef/browser/safe_browsing/url_trust_list_manager.h index 775b85d1cdfd0c6dec5b643d323592e45999d142..32cf68ed1c2835f4517251c1499197df741ad62b 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_manager.h +++ b/libcef/browser/safe_browsing/url_trust_list_manager.h @@ -19,7 +19,7 @@ #include #include #include "base/json/json_value_converter.h" -#include "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_interface.h" +#include "libcef/browser/safe_browsing/url_trust_list_interface.h" namespace ohos_safe_browsing { static bool ParseString(const base::Value* value, std::string* field) { @@ -71,10 +71,10 @@ public: } }; -class OhosUrlTrustListManager : public OhosUrlTrustListInterface { +class UrlTrustListManager : public UrlTrustListInterface { public: - OhosUrlTrustListManager(); - virtual ~OhosUrlTrustListManager() = default; + UrlTrustListManager(); + virtual ~UrlTrustListManager() = default; UrlTrustCheckResult CheckUrlTrustList(const GURL& url) override; UrlListSetResult SetUrlTrustListWithErrMsg( const std::string& urlTrustList, std::string& detailErrMsg); diff --git a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.cc b/libcef/browser/safe_browsing/url_trust_list_navigation_throttle.cc similarity index 56% rename from libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.cc rename to libcef/browser/safe_browsing/url_trust_list_navigation_throttle.cc index 87a8ded2d8d8c53a0a7394a313c5602b9e7b7615..6b457d6d1f805e606cdb8ac92ca34f1511c3c172 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.cc +++ b/libcef/browser/safe_browsing/url_trust_list_navigation_throttle.cc @@ -12,41 +12,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.h" +#include "libcef/browser/safe_browsing/url_trust_list_navigation_throttle.h" #include "base/i18n/rtl.h" #include "components/security_interstitials/content/security_interstitial_tab_helper.h" #include "content/public/browser/web_contents.h" -#include "libcef/browser/ohos_safe_browsing/ohos_url_trust_list_interface.h" -#include "libcef/browser/ohos_safe_browsing/ohos_safe_browsing_response.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_block_page.h" -#include "libcef/browser/ohos_safe_browsing/ohos_sb_threat_type.h" +#include "libcef/browser/safe_browsing/url_trust_list_interface.h" +#include "libcef/browser/safe_browsing/safe_browsing_response.h" +#include "libcef/browser/safe_browsing/sb_block_page.h" +#include "libcef/browser/safe_browsing/sb_threat_type.h" + +using NavigationThrottle = content::NavigationThrottle; +using ThrottleCheckResult = content::NavigationThrottle::ThrottleCheckResult; namespace ohos_safe_browsing { -std::unique_ptr OhosUrlTrustListNavigationThrottle::Create( +std::unique_ptr UrlTrustListNavigationThrottle::Create( content::NavigationHandle* handle) { - return base::WrapUnique(new OhosUrlTrustListNavigationThrottle(handle)); + return base::WrapUnique(new UrlTrustListNavigationThrottle(handle)); } -OhosUrlTrustListNavigationThrottle::OhosUrlTrustListNavigationThrottle( - content::NavigationHandle* navigation_handle) - : content::NavigationThrottle(navigation_handle) {} +UrlTrustListNavigationThrottle::UrlTrustListNavigationThrottle( + content::NavigationHandle* navigation_handle) : NavigationThrottle(navigation_handle) {} -OhosUrlTrustListNavigationThrottle::~OhosUrlTrustListNavigationThrottle() = default; +UrlTrustListNavigationThrottle::~UrlTrustListNavigationThrottle() = default; -content::NavigationThrottle::ThrottleCheckResult -OhosUrlTrustListNavigationThrottle::WillStartRequest() { +ThrottleCheckResult UrlTrustListNavigationThrottle::WillStartRequest() { content::NavigationHandle *handle = navigation_handle(); - if (!handle || handle->GetNetErrorCode() == net::ERR_BLOCKED_BY_CLIENT) { + if (!handle || !handle->IsInMainFrame() || + handle->GetNetErrorCode() == net::ERR_BLOCKED_BY_CLIENT) { return PROCEED; } + content::WebContents* webContents = handle->GetWebContents(); if (!webContents) { return PROCEED; } auto manager = - reinterpret_cast( - webContents->GetUserData(&OhosUrlTrustListInterface::interfaceKey)); + reinterpret_cast( + webContents->GetUserData(&UrlTrustListInterface::interfaceKey)); if (!manager) { return PROCEED; } @@ -54,10 +57,9 @@ OhosUrlTrustListNavigationThrottle::WillStartRequest() { UrlTrustCheckResult::RESULT_ALLOW) { auto gurl = handle->GetURL(); auto locale = base::i18n::GetConfiguredLocale(); - auto controller = std::make_unique( + auto controller = std::make_unique( webContents, nullptr, gurl, locale, false); - std::unique_ptr blocking_page = - std::make_unique( + std::unique_ptr blocking_page = std::make_unique( webContents, gurl, OHSBPolicyType::POLICY_URL_TRUST_LIST, OHSBThreatType::THREAT_URL_TRUST_LIST, std::move(controller)); std::string html = blocking_page->GetUrlTrustListErrorHTMLContents(); @@ -68,7 +70,7 @@ OhosUrlTrustListNavigationThrottle::WillStartRequest() { return PROCEED; } -const char* OhosUrlTrustListNavigationThrottle::GetNameForLogging() { - return "OhosUrlTrustListNavigationThrottle"; +const char* UrlTrustListNavigationThrottle::GetNameForLogging() { + return "UrlTrustListNavigationThrottle"; } } // namespace ohos_safe_browsing diff --git a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.h b/libcef/browser/safe_browsing/url_trust_list_navigation_throttle.h similarity index 85% rename from libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.h rename to libcef/browser/safe_browsing/url_trust_list_navigation_throttle.h index c9d794ea1f996702713ac74e2beef44201dc5717..1fab675891bbe1d8f3d24d0e142e59765de45990 100644 --- a/libcef/browser/ohos_safe_browsing/ohos_url_trust_list_navigation_throttle.h +++ b/libcef/browser/safe_browsing/url_trust_list_navigation_throttle.h @@ -20,14 +20,13 @@ #include "content/public/browser/navigation_throttle.h" namespace ohos_safe_browsing { -class OhosUrlTrustListNavigationThrottle : public content::NavigationThrottle { +class UrlTrustListNavigationThrottle : public content::NavigationThrottle { public: static std::unique_ptr Create( content::NavigationHandle* handle); - OhosUrlTrustListNavigationThrottle( - content::NavigationHandle* navigation_handle); - ~OhosUrlTrustListNavigationThrottle() override; + UrlTrustListNavigationThrottle(content::NavigationHandle* navigation_handle); + ~UrlTrustListNavigationThrottle() override; ThrottleCheckResult WillStartRequest() override; const char* GetNameForLogging() override; diff --git a/libcef/browser/storage/web_storage_impl.cc b/libcef/browser/storage/web_storage_impl.cc index 7165aa071dd33d50520064bc78ca3c4585b51089..bd1705ffab79263b694fb38966ea01d72466c0bd 100644 --- a/libcef/browser/storage/web_storage_impl.cc +++ b/libcef/browser/storage/web_storage_impl.cc @@ -621,7 +621,7 @@ CefRefPtr CefWebStorage::GetGlobalManager( // static CefRefPtr CefWebStorage::GetGlobalIncognitoManager( CefRefPtr callback) { - LOG(INFO) << "CefWebStorage::GetGlobalIncognitoManager."; + LOG(INFO) << "CefWebStorage::GetGlobalIncognitoManage."; CefRefPtr context = CefRequestContext::GetGlobalOTRContext(); return context ? context->GetWebStorage(callback) : nullptr; } diff --git a/libcef/common/app_manager.cc b/libcef/common/app_manager.cc index 24f9b13cd4b76d2b945e24a35fac74c719f7f86c..bf1b3d1c1badffb4bd604b5dbc65e83dc91d206a 100644 --- a/libcef/common/app_manager.cc +++ b/libcef/common/app_manager.cc @@ -100,7 +100,6 @@ void CefAppManager::AddAdditionalSchemes( application->OnRegisterCustomSchemes(&schemeRegistrar); schemeRegistrar.GetSchemes(schemes); } - #ifdef OHOS_SCHEME_HANDLER { CefSchemeRegistrarImpl schemeRegistrar; @@ -108,7 +107,7 @@ void CefAppManager::AddAdditionalSchemes( if (cmdLine && cmdLine->HasSwitch(switches::kOhSchemeHandlerCustomScheme)) { std::string cmdlineSchemes = cmdLine->GetSwitchValueASCII(switches::kOhSchemeHandlerCustomScheme); - LOG(INFO) << "render scheme_handler cmdlineScheme:" << cmdlineSchemes; + LOG(INFO) << "scheme_handler cmdlineScheme:" << cmdlineSchemes; absl::optional schemeInfos = base::JSONReader::Read(cmdlineSchemes); if (schemeInfos && schemeInfos->is_dict()) { for (auto kv : schemeInfos->GetDict()) { @@ -121,6 +120,48 @@ void CefAppManager::AddAdditionalSchemes( #endif #ifdef OHOS_NETWORK_LOAD + RenderAddCustomSchemes(); +#endif + + scheme::AddInternalSchemes(schemes); + scheme_info_list_locked_ = true; +} + +#if BUILDFLAG(IS_WIN) +const wchar_t* CefAppManager::GetResourceDllName() { + static wchar_t file_path[MAX_PATH + 1] = {0}; + + if (file_path[0] == 0) { + // Retrieve the module path (usually libcef.dll). + base::FilePath module; + base::PathService::Get(base::FILE_MODULE, &module); + const std::wstring wstr = module.value(); + size_t count = std::min(static_cast(MAX_PATH), wstr.size()); + wcsncpy(file_path, wstr.c_str(), count); + file_path[count] = 0; + } + + return file_path; +} +#endif // BUILDFLAG(IS_WIN) + +#ifdef OHOS_NETWORK_LOAD +std::vector CefAppManager::CustomSchemeCmdLineSplit( + std::string str, + const char split) { + std::istringstream inStream(str); + std::vector ret; + std::string token; + while (getline(inStream, token, split)) { + if (!token.empty()) { + ret.push_back(token); + token.clear(); + } + } + return ret; +} + +void CefAppManager::RenderAddCustomSchemes() { CefRefPtr cmdLine = CefCommandLine::GetGlobalCommandLine(); if (cmdLine->HasSwitch(switches::kProcessType)) { LOG(INFO) << "render Add custom schemes"; @@ -165,44 +206,5 @@ void CefAppManager::AddAdditionalSchemes( } } } -#endif - - scheme::AddInternalSchemes(schemes); - - scheme_info_list_locked_ = true; -} - -#if BUILDFLAG(IS_WIN) -const wchar_t* CefAppManager::GetResourceDllName() { - static wchar_t file_path[MAX_PATH + 1] = {0}; - - if (file_path[0] == 0) { - // Retrieve the module path (usually libcef.dll). - base::FilePath module; - base::PathService::Get(base::FILE_MODULE, &module); - const std::wstring wstr = module.value(); - size_t count = std::min(static_cast(MAX_PATH), wstr.size()); - wcsncpy(file_path, wstr.c_str(), count); - file_path[count] = 0; - } - - return file_path; -} -#endif // BUILDFLAG(IS_WIN) - -#ifdef OHOS_NETWORK_LOAD -std::vector CefAppManager::CustomSchemeCmdLineSplit( - std::string str, - const char split) { - std::istringstream inStream(str); - std::vector ret; - std::string token; - while (getline(inStream, token, split)) { - if (!token.empty()) { - ret.push_back(token); - token.clear(); - } - } - return ret; } #endif diff --git a/libcef/common/app_manager.h b/libcef/common/app_manager.h index a1192e075e928c1660f2125ca17882baff062cdb..391230da2c6d065f87e5a01b0a0c867d9efb2f74 100644 --- a/libcef/common/app_manager.h +++ b/libcef/common/app_manager.h @@ -75,6 +75,7 @@ class CefAppManager { #ifdef OHOS_NETWORK_LOAD std::vector CustomSchemeCmdLineSplit(std::string str, const char split); + void RenderAddCustomSchemes(); #endif // Custom schemes handled by the client. diff --git a/libcef/common/extensions/api/_api_features.json b/libcef/common/extensions/api/_api_features.json index 7f44cd43ffa93f72dcf4553ed5ca82ca155b2b55..720c230e52db9b7ee91320f31ac267c0403a5b36 100644 --- a/libcef/common/extensions/api/_api_features.json +++ b/libcef/common/extensions/api/_api_features.json @@ -43,8 +43,8 @@ "contexts": ["blessed_extension"], "disallow_for_service_workers": false }, - // OHOS_ARKWEB_EXTENSIONS - "developerPrivate": [{ + // OHOS_ARKWEB_EXTENSIONS + "developerPrivate": [{ "dependencies": ["permission:developerPrivate", "permission:management"], "contexts": ["blessed_extension"] }, { @@ -54,5 +54,14 @@ "chrome://extensions/*", "arkweb://extensions/*" ] - }] + }], + "extension": { + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app"], + "contexts": ["blessed_extension"] + }, + "extension.getURL": { + "contexts": ["blessed_extension", "unblessed_extension", "content_script"], + "max_manifest_version": 2 + } } diff --git a/libcef/common/mojom/cef.mojom b/libcef/common/mojom/cef.mojom index ebe83d83224cf2b364bdaba659bdd17eb1ee226f..8c168ec436e7f8ed8d5b42525054d5e58013c1b0 100644 --- a/libcef/common/mojom/cef.mojom +++ b/libcef/common/mojom/cef.mojom @@ -130,7 +130,7 @@ interface RenderFrame { PutZoomingForTextFactor(float factor); [EnableIf=is_ohos] - GetImageForContextNode(); + GetImageForContextNode(int32 command_id); [EnableIf=is_ohos] GetImagesWithResponse() => (bool response); @@ -170,11 +170,11 @@ interface RenderFrame { [EnableIf=ohos_get_scroll_offset, Sync] GetOverScrollOffset() => (float offset_x, float offset_y); + [EnableIf=ohos_input_events] + UpdateDrawRect(); + [EnableIf=is_ohos] TerminateRenderProcess(); - - [EnableIf=is_ohos] - UpdateDrawRect(); }; // Interface for communicating with a frame in the browser process. @@ -193,10 +193,10 @@ interface BrowserFrame { UpdateDraggableRegions(array? regions); [EnableIf=is_ohos] - OnGetImageForContextNode(GetImageForContextNodeParams params); + OnGetImageForContextNode(GetImageForContextNodeParams params, int32 command_id); [EnableIf=is_ohos] - OnGetImageForContextNodeNull(); + OnGetImageForContextNodeNull(int32 command_id); // Give the application a chance to decide whether to override loading the url. [EnableIf=is_ohos, Sync] diff --git a/libcef/common/request_impl.cc b/libcef/common/request_impl.cc index e172463c6467f80cdf64a72cf0d1d8f0b2e378b2..be55afe7a0b66135feebe74774b807548246cd2d 100644 --- a/libcef/common/request_impl.cc +++ b/libcef/common/request_impl.cc @@ -46,7 +46,6 @@ #if defined(OHOS_SCHEME_HANDLER) #include "base/datashare_uri_utils.h" -#include "base/task/thread_pool.h" #include "base/files/file.h" #include "net/base/io_buffer.h" #include "services/network/chunked_data_pipe_upload_data_stream.h" @@ -225,7 +224,7 @@ std::unique_ptr CreateUploadDataStream( const bool has_null_source = element.read_only_once().value(); auto upload_data_stream = std::make_unique( - body, element.ReleaseChunkedDataPipeGetter(), has_null_source); + body, element.ReleaseChunkedDataPipeGetter(), has_null_source, true); if (element.read_only_once()) { upload_data_stream->EnableCache(); } @@ -1062,10 +1061,12 @@ CefRefPtr CefPostDataStream::Create() { // CefPostDataStreamImpl ------------------------------------------------------ CefPostDataStreamImpl::CefPostDataStreamImpl() { - } CefPostDataStreamImpl::~CefPostDataStreamImpl() { + if (is_data_pipe_ && upload_stream_) { + content::GetIOThreadTaskRunner({})->DeleteSoon(FROM_HERE, std::move(upload_stream_)); + } } void CefPostDataStreamImpl::Reset() { @@ -1073,6 +1074,17 @@ void CefPostDataStreamImpl::Reset() { init_callback_ = nullptr; } +void CefPostDataStreamImpl::GetChunkedDataPipeGetter( + network::ResourceRequestBody* body) { + LOG(INFO) << "scheme_handler get chunked data pip getter initialated_: " << initialated_; + if (body && upload_stream_ && !initialated_) { + body->SetToChunkedDataPipe( + static_cast(upload_stream_.get()) + ->ReleaseChunkedDataPipeGetter(), + network::ResourceRequestBody::ReadOnlyOnce(HasNullSource())); + } +} + void CefPostDataStreamImpl::Set(network::ResourceRequestBody* body) { std::vector open_files; if (body) { @@ -1083,7 +1095,13 @@ void CefPostDataStreamImpl::Set(network::ResourceRequestBody* body) { LOG(INFO) << "scheme_handler file path: " << file_element.path() << " real path: " << real_path; open_files.push_back(base::File(base::FilePath(real_path), base::File::FLAG_OPEN | base::File::FLAG_READ)); } + + if (element.type() == network::DataElement::Tag::kDataPipe || + element.type() == network::DataElement::Tag::kChunkedDataPipe) { + is_data_pipe_ = true; + } } + scoped_refptr task_runner = base::ThreadPool::CreateSequencedTaskRunner( {base::MayBlock(), base::TaskPriority::USER_VISIBLE}); @@ -1105,6 +1123,7 @@ void CefPostDataStreamImpl::OnStreamInitialized(int rv) { } void CefPostDataStreamImpl::Init(CefRefPtr init_callback) { + initialated_ = true; init_callback_ = init_callback; if (upload_stream_) { int rv = upload_stream_->Init( @@ -1120,7 +1139,31 @@ void CefPostDataStreamImpl::Init(CefRefPtr init_c } } -void CefPostDataStreamImpl::Read( +void CefPostDataStreamImpl::ReadOnTaskRunner( + void* buffer, + int buf_len, + base::WaitableEvent* event) { + scoped_refptr upload_buffer = + base::MakeRefCounted( + reinterpret_cast(buffer)); + if (upload_stream_) { + int rv = upload_stream_->Read( + upload_buffer.get(),buf_len, + base::BindOnce(&CefPostDataStreamImpl::OnStreamRead, + base::Unretained(this), upload_buffer, event)); + if (rv == net::ERR_IO_PENDING) { + last_read_rv_ = rv; + return; + } + last_read_rv_ = rv; + event->Signal(); + } else { + last_read_rv_ = -2; + event->Signal(); + } +} + +void CefPostDataStreamImpl::ReadAsync( void* buffer, int buf_len, CefRefPtr read_callback) { @@ -1130,23 +1173,54 @@ void CefPostDataStreamImpl::Read( if (upload_stream_) { int rv = upload_stream_->Read( upload_buffer.get(),buf_len, - base::BindOnce(&CefPostDataStreamImpl::OnStreamRead, + base::BindOnce(&CefPostDataStreamImpl::OnStreamReadAsync, base::Unretained(this), upload_buffer, read_callback)); - if (rv == net::ERR_IO_PENDING) + if (rv == net::ERR_IO_PENDING) { return; - OnStreamRead(upload_buffer, read_callback, rv); + } + OnStreamReadAsync(upload_buffer, read_callback, rv); } else { - OnStreamRead(upload_buffer, read_callback, -2); + OnStreamReadAsync(upload_buffer, read_callback, -2); } } -void CefPostDataStreamImpl::OnStreamRead( - scoped_refptr buffer, - CefRefPtr read_callback, int rv) { - LOG(INFO) << "scheme_handler CefPostDataStreamImpl::OnStreamRead rv: " << rv; +void CefPostDataStreamImpl::Read( + void* buffer, + int buf_len, + CefRefPtr read_callback) { + if (base::SequencedTaskRunner::HasCurrentDefault() || IsInMemory() || IsChunked()) { + ReadAsync(buffer, buf_len, read_callback); + } else { + if (sequenced_task_runner_) { + base::WaitableEvent* completion = new base::WaitableEvent(); + sequenced_task_runner_->PostTask( + FROM_HERE, base::BindOnce(&CefPostDataStreamImpl::ReadOnTaskRunner, + this, buffer, buf_len, completion)); + completion->Wait(); + delete completion; + read_callback->OnReadComplete((char*)buffer, last_read_rv_); + } else { + read_callback->OnReadComplete((char*)buffer, -2); + } + } +} +void CefPostDataStreamImpl::OnStreamReadAsync( + scoped_refptr buffer, + CefRefPtr read_callback, + int rv) { if (read_callback) { - read_callback->OnReadComplete(buffer->data(), rv); + read_callback->OnReadComplete(buffer->data(), rv); + } +} + +void CefPostDataStreamImpl::OnStreamRead( + scoped_refptr buffer, + base::WaitableEvent* event, + int rv) { + last_read_rv_ = rv; + if (event) { + event->Signal(); } } diff --git a/libcef/common/request_impl.h b/libcef/common/request_impl.h index f24d58f332f5cbf1cb18d0ffb18811ecb27e6b4b..23dd69063d515bfafdb8647d098b50d5d34540ee 100644 --- a/libcef/common/request_impl.h +++ b/libcef/common/request_impl.h @@ -19,8 +19,12 @@ #include "url/gurl.h" #if defined(OHOS_SCHEME_HANDLER) +#include "base/synchronization/waitable_event.h" +#include "base/task/thread_pool.h" #include "net/base/io_buffer.h" #include "net/base/upload_data_stream.h" +#include "services/network/chunked_data_pipe_upload_data_stream.h" +#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h" #endif namespace blink { @@ -230,17 +234,32 @@ class CefPostDataStreamImpl : public CefPostDataStream { void Set(network::ResourceRequestBody* body); void Reset() override; + void GetChunkedDataPipeGetter(network::ResourceRequestBody* body); + private: void OnStreamInitialized(int rv); void OnStreamRead(scoped_refptr buffer, - CefRefPtr read_callback, + base::WaitableEvent* event, int rv); + void ReadAsync(void* buffer, + int buf_len, + CefRefPtr read_callback); + void OnStreamReadAsync(scoped_refptr buffer, + CefRefPtr read_callback, + int rv); + void ReadOnTaskRunner(void* buffer, + int buf_len, + base::WaitableEvent* event); CefRefPtr read_callback_; CefRefPtr init_callback_; std::unique_ptr upload_stream_; - + bool initialated_{false}; + bool is_data_pipe_{false}; + scoped_refptr sequenced_task_runner_ = + base::ThreadPool::CreateSequencedTaskRunner({}); + int last_read_rv_ = -2; mutable base::Lock lock_; IMPLEMENT_REFCOUNTING(CefPostDataStreamImpl); }; diff --git a/libcef/common/response_impl.cc b/libcef/common/response_impl.cc index 2127045e69fb3a68f0435f91c0be6884e71634e7..0dc331316416e396d1e53effa3745446d8cd54b7 100644 --- a/libcef/common/response_impl.cc +++ b/libcef/common/response_impl.cc @@ -120,6 +120,11 @@ void CefResponseImpl::SetHeaderByName(const CefString& name, std::string nameLower = name; HttpHeaderUtils::MakeASCIILower(&nameLower); + if (!overwrite) { + header_map_.insert(std::make_pair(name, value)); + return; + } + // There may be multiple values, so remove any first. for (auto it = header_map_.begin(); it != header_map_.end();) { if (base::EqualsCaseInsensitiveASCII(it->first.ToString(), nameLower)) { diff --git a/libcef/common/scheme_registrar_impl.cc b/libcef/common/scheme_registrar_impl.cc index 5d6746c477ddb093962eae3cd250403922d76863..fc3fbef2c1cadaa6cede5a872ff80ad1a57986bb 100644 --- a/libcef/common/scheme_registrar_impl.cc +++ b/libcef/common/scheme_registrar_impl.cc @@ -44,8 +44,7 @@ bool CefSchemeRegistrarImpl::AddCustomScheme(const CefString& scheme_name, const bool is_csp_bypassing = options & CEF_SCHEME_OPTION_CSP_BYPASSING; const bool is_fetch_enabled = options & CEF_SCHEME_OPTION_FETCH_ENABLED; #if BUILDFLAG(IS_OHOS) - const bool is_code_cache_enabled = - options & CEF_SCHEME_OPTION_CODE_CACHE_ENABLED; + const bool is_code_cache_enabled = options & CEF_SCHEME_OPTION_CODE_CACHE_ENABLED; #endif // The |is_display_isolated| value is excluded here because it's registered @@ -70,14 +69,8 @@ bool CefSchemeRegistrarImpl::AddCustomScheme(const CefString& scheme_name, #endif CefSchemeInfo scheme_info = { - scheme, - is_standard, - is_local, - is_display_isolated, - is_secure, - is_cors_enabled, - is_csp_bypassing, - is_fetch_enabled + scheme, is_standard, is_local, is_display_isolated, + is_secure, is_cors_enabled, is_csp_bypassing, is_fetch_enabled #if BUILDFLAG(IS_OHOS) , is_code_cache_enabled diff --git a/libcef/common/soc_perf_util.cc b/libcef/common/soc_perf_util.cc index 18e41108adfc4b45e180f5784d4ff270f08f707d..05790db512753a4b39306af9d5f1a9ef23bc41af 100644 --- a/libcef/common/soc_perf_util.cc +++ b/libcef/common/soc_perf_util.cc @@ -23,7 +23,6 @@ const int MAX_BOOST_RUN_TIME_IN_SECOND = 10; const int REST_TIME_IN_SECOND = 2; } // namespace -// #if defined(OHOS_PERFORMANCE_INC_FREQ) void SocPerUtil::EnableFlingBoost() { TRACE_EVENT0("power", "SocPerUtil::EnableFlingBoost"); OHOS::NWeb::OhosAdapterHelper::GetInstance() @@ -36,7 +35,6 @@ void SocPerUtil::DisableFlingBoost() { .CreateSocPerfClientAdapter() ->ApplySocPerfConfigByIdEx(SOC_PERF_WEB_GUSTURE_ID, false); } -// #endif OHOS_PERFORMANCE_INC_FREQ void SocPerUtil::TryRunSocPerf() { if ((base::Time().Now() - first_time_boost_timestamp).InSeconds() >= diff --git a/libcef/common/soc_perf_util.h b/libcef/common/soc_perf_util.h index a58db41ef66538565b81be856f0f3c7132c115a9..3e0bc185d18d850977410b644722a29735593c85 100644 --- a/libcef/common/soc_perf_util.h +++ b/libcef/common/soc_perf_util.h @@ -12,10 +12,8 @@ namespace soc_perf { class SocPerUtil { public: - // #if defined(OHOS_PERFORMANCE_INC_FREQ) static void EnableFlingBoost(); static void DisableFlingBoost(); - // #endif static void StartBoost(); private: diff --git a/libcef/common/values_impl.cc b/libcef/common/values_impl.cc index 7951809ea1dbe3c3b900ed85c80986acb4c21996..a2ffb7c8d80c2ae1b0a2d5d231cdeba8485b111a 100644 --- a/libcef/common/values_impl.cc +++ b/libcef/common/values_impl.cc @@ -334,7 +334,7 @@ double CefValueImpl::GetDouble() { return ret_value; } -CefString CefValueImpl::GetString() { +std::string CefValueImpl::GetStdString() { base::AutoLock lock_scope(lock_); std::string ret_value; @@ -344,7 +344,7 @@ CefString CefValueImpl::GetString() { return ret_value; } -std::string CefValueImpl::GetStdString() { +CefString CefValueImpl::GetString() { base::AutoLock lock_scope(lock_); std::string ret_value; diff --git a/libcef/renderer/alloy/alloy_content_renderer_client.cc b/libcef/renderer/alloy/alloy_content_renderer_client.cc index 9f35ac3148bae6f0f6676dd469c5650697772fdf..b565753975682a5810259bc587dda5a50d115e95 100644 --- a/libcef/renderer/alloy/alloy_content_renderer_client.cc +++ b/libcef/renderer/alloy/alloy_content_renderer_client.cc @@ -143,7 +143,7 @@ #include "printing/metafile_agent.h" #endif -#include "libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.h" +#include "libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.h" AlloyContentRendererClient::AlloyContentRendererClient() : main_entry_time_(base::TimeTicks::Now()), @@ -246,7 +246,6 @@ void AlloyContentRendererClient::RenderThreadStarted() { subresource_filter_ruleset_dealer_ = std::make_unique(); thread->AddObserver(subresource_filter_ruleset_dealer_.get()); - subresource_filter_user_ruleset_dealer_.reset( new subresource_filter::UserUnverifiedRulesetDealer()); thread->AddObserver(subresource_filter_user_ruleset_dealer_.get()); @@ -349,10 +348,11 @@ void AlloyContentRendererClient::PrepareErrorPage( alternative_error_page_info, std::string* error_html) { AlloySafeBrowsingErrorPageControllerDelegateImpl::Get(render_frame) - ->PrepareForErrorPage(); + ->PrepareForErrorPage(); } #endif + void AlloyContentRendererClient::RenderFrameCreated( content::RenderFrame* render_frame) { #if defined(OHOS_FCP) || defined(OHOS_ARKWEB_ADBLOCK) @@ -399,6 +399,17 @@ void AlloyContentRendererClient::RenderFrameCreated( #endif auto render_frame_observer = new CefRenderFrameObserver(render_frame); +#if BUILDFLAG(IS_OHOS) && defined(OHOS_EX_EXCEPTION_LIST) + AlloyContentSettingsClient* alloy_content_settings_client = + new AlloyContentSettingsClient(render_frame); + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser) && + observer_.get() && alloy_content_settings_client) { + alloy_content_settings_client->SetContentSettingRules( + observer_->content_setting_rules()); + } +#endif + #if defined(OHOS_NO_STATE_PREFETCH) new prerender::PrerenderRenderFrameObserver(render_frame); if (!render_frame->IsMainFrame()) { @@ -994,13 +1005,6 @@ void AlloyContentRendererClient::TriggerElementHidingInFrame(int routing_id) { return; } - blink::WebDocument document = web_frame->GetDocument(); - if (!document.Url().ProtocolIs("https") && - !document.Url().ProtocolIs("http")) { - LOG(ERROR) << "[AdBlock] TriggerElementHidingInFrame scheme error"; - return; - } - blink::WebDocumentSubresourceFilter* filter = web_frame->GetDocumentLoader()->GetWebSubresourceFilter(); if (!filter) { @@ -1008,22 +1012,29 @@ void AlloyContentRendererClient::TriggerElementHidingInFrame(int routing_id) { return; } + blink::WebDocument document = web_frame->GetDocument(); + if (!document.Url().ProtocolIs("https") && + !document.Url().ProtocolIs("http")) { + LOG(ERROR) << "[AdBlock] TriggerElementHidingInFrame scheme error"; + return; + } + if (web_frame->GetHasDocumentTypeOption()) { LOG(WARNING) << "[AdBlock] Match $document for " - << document.Url().GetString().Utf8(); + << "***"; return; } if (web_frame->GetHasElemHideTypeOption()) { LOG(WARNING) << "[AdBlock] Match selemhide for " - << document.Url().GetString().Utf8(); + << "***"; return; } bool has_generichide = web_frame->GetHasGenericHideTypeOption(); if (has_generichide) { LOG(WARNING) << "[AdBlock] Match sgenerichide for " - << document.Url().GetString().Utf8(); + << "***"; } base::TimeTicks start = base::TimeTicks::Now(); @@ -1038,7 +1049,7 @@ void AlloyContentRendererClient::TriggerElementHidingInFrame(int routing_id) { blink::WebDocument::StyleSheetType::kAdBlock); base::TimeDelta duration = base::TimeTicks::Now() - start; LOG(WARNING) << "[AdBlock] Element hiding for " - << document.Url().GetString().Utf8() << "assumming " + << "***" << "assumming " << duration.InMicroseconds() << "microseconds"; return; } @@ -1080,7 +1091,7 @@ void AlloyContentRendererClient::TriggerUserElementHidingInFrame( blink::WebDocument::StyleSheetType::kUserAdBlock); base::TimeDelta duration = base::TimeTicks::Now() - start; LOG(WARNING) << "[User AdBlock] Element hiding for " - << document.Url().GetString().Utf8() << " assumming " + << "***" << " assumming " << duration.InMicroseconds() << " microseconds"; return; } diff --git a/libcef/renderer/alloy/alloy_content_settings_client.cc b/libcef/renderer/alloy/alloy_content_settings_client.cc index 031ea46a42537a6010626a56c7ea924c91b7dffb..4024b15e71e623eb74f897fde8087df0ecc3be80 100644 --- a/libcef/renderer/alloy/alloy_content_settings_client.cc +++ b/libcef/renderer/alloy/alloy_content_settings_client.cc @@ -8,6 +8,56 @@ #include "third_party/blink/public/common/web_preferences/web_preferences.h" #include "third_party/blink/public/web/web_local_frame.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "base/command_line.h" +#include "components/content_settings/core/common/content_settings_pattern.h" +#include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" +#include "third_party/blink/public/platform/web_string.h" +#include "third_party/blink/public/web/web_document.h" +#include "url/origin.h" + +namespace { +GURL GetOriginOrURL(const blink::WebFrame* frame) { + url::Origin top_origin = url::Origin(frame->Top()->GetSecurityOrigin()); + // The |top_origin| is unique ("null") e.g., for file:// URLs. Use the + // document URL as the primary URL in those cases. + // TODO(alexmos): This is broken for --site-per-process, since top() can be a + // WebRemoteFrame which does not have a document(), and the WebRemoteFrame's + // URL is not replicated. See https://crbug.com/628759. + if (top_origin.opaque() && frame->Top()->IsWebLocalFrame()) + return frame->Top()->ToWebLocalFrame()->GetDocument().Url(); + return top_origin.GetURL(); +} + +// Allow passing both WebURL and GURL here, so that we can early return +// without allocating a new backing string if only the default rule matches. +template +ContentSetting GetContentSettingFromRules( + const ContentSettingsForOneType& rules, + const blink::WebFrame* frame, + const URL& secondary_url) { + // If there is only one rule, it's the default rule and we don't need to match + // the patterns. + if (rules.size() == 1) { + DCHECK(rules[0].primary_pattern == ContentSettingsPattern::Wildcard()); + DCHECK(rules[0].secondary_pattern == ContentSettingsPattern::Wildcard()); + return rules[0].GetContentSetting(); + } + const GURL& primary_url = GetOriginOrURL(frame); + const GURL& secondary_gurl = secondary_url; + for (const auto& rule : rules) { + if (rule.primary_pattern.Matches(primary_url) && + rule.secondary_pattern.Matches(secondary_gurl)) { + return rule.GetContentSetting(); + } + } + NOTREACHED(); + return CONTENT_SETTING_DEFAULT; +} +} // namespace +#endif + AlloyContentSettingsClient::AlloyContentSettingsClient( content::RenderFrame* render_frame) : content::RenderFrameObserver(render_frame) { @@ -23,3 +73,103 @@ bool AlloyContentSettingsClient::ShouldAutoupgradeMixedContent() { void AlloyContentSettingsClient::OnDestruct() { delete this; } + +#if defined(OHOS_EX_EXCEPTION_LIST) +bool AlloyContentSettingsClient::ShouldAllowlistForContentSettings() const { + return render_frame()->GetWebFrame()->GetDocument().Url().GetString() == + content::kUnreachableWebDataURL; +} + +bool AlloyContentSettingsClient::AllowScript(bool enabled_per_settings) { + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForBrowser)) { + return enabled_per_settings; + } + + if (render_frame() && render_frame()->GetWebFrame()) { + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + const auto it = cached_script_permissions_.find(frame); + if (it != cached_script_permissions_.end()) + return it->second; + + // Evaluate the content setting rules before + // IsWhitelistedForContentSettings(); if there is only the default rule + // allowing all scripts, it's quicker this way. + bool allow = true; + if (content_setting_rules_) { + ContentSetting setting = GetContentSettingFromRules( + content_setting_rules_->script_rules, frame, + url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); + allow = setting != CONTENT_SETTING_BLOCK; + } + allow = allow || IsWhitelistedForContentSettings(); + + cached_script_permissions_[frame] = allow; + return allow; + } + if (ShouldAllowlistForContentSettings()) { + return true; + } + return blink::WebContentSettingsClient::AllowScript(enabled_per_settings); +} + +void AlloyContentSettingsClient::SetContentSettingRules( + const RendererContentSettingRules* content_setting_rules) { + content_setting_rules_ = content_setting_rules; +} + +const RendererContentSettingRules* +AlloyContentSettingsClient::GetContentSettingRules() { + return content_setting_rules_; +} + +void AlloyContentSettingsClient::DidCommitProvisionalLoad( + ui::PageTransition transition) { + if (!render_frame()) { + return; + } + + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + if (!frame || frame->Parent()) + return; // Not a top-level navigation. + + cached_script_permissions_.clear(); +} + +// static +bool AlloyContentSettingsClient::IsWhitelistedForContentSettings() const { + if (!render_frame() || !render_frame()->GetWebFrame()) { + return false; + } + const blink::WebDocument& document = + render_frame()->GetWebFrame()->GetDocument(); + return IsWhitelistedForContentSettings(document.GetSecurityOrigin(), + document.Url()); +} + +bool AlloyContentSettingsClient::IsWhitelistedForContentSettings( + const blink::WebSecurityOrigin& origin, + const blink::WebURL& document_url) { + if (document_url.GetString() == content::kUnreachableWebDataURL) + return true; + + if (origin.IsOpaque()) + return false; // Uninitialized document? + + blink::WebString protocol = origin.Protocol(); + + if (protocol == content::kChromeUIScheme) + return true; // Browser UI elements should still work. + + if (protocol == content::kChromeDevToolsScheme) + return true; // DevTools UI elements should still work. + + // If the scheme is file:, an empty file name indicates a directory listing, + // which requires JavaScript to function properly. + if (protocol == url::kFileScheme && + document_url.ProtocolIs(url::kFileScheme)) { + return GURL(document_url).ExtractFileName().empty(); + } + return false; +} +#endif \ No newline at end of file diff --git a/libcef/renderer/alloy/alloy_content_settings_client.h b/libcef/renderer/alloy/alloy_content_settings_client.h index c5c7bc2d10d24418cc3781a58d3d64b1826918d1..300d4819930484f781740275df66ca2d64aebfbf 100644 --- a/libcef/renderer/alloy/alloy_content_settings_client.h +++ b/libcef/renderer/alloy/alloy_content_settings_client.h @@ -8,6 +8,15 @@ #include "content/public/renderer/render_frame_observer.h" #include "third_party/blink/public/platform/web_content_settings_client.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "base/containers/flat_map.h" +#include "components/content_settings/core/common/content_settings.h" +#include "third_party/blink/public/platform/web_security_origin.h" +#include "third_party/blink/public/platform/web_url.h" +#include "third_party/blink/public/web/web_frame.h" +#include "ui/base/page_transition_types.h" +#endif + // NWeb implementation of blink::WebContentSettingsClient. class AlloyContentSettingsClient : public content::RenderFrameObserver, public blink::WebContentSettingsClient { @@ -18,6 +27,15 @@ class AlloyContentSettingsClient : public content::RenderFrameObserver, explicit AlloyContentSettingsClient(content::RenderFrame* render_view); +#if defined(OHOS_EX_EXCEPTION_LIST) + // Sets the content setting rules which back |allowScript()| and + // |allowScriptFromSource()|. |content_setting_rules| + // must outlive this |AwContentSettingsClient|. + void SetContentSettingRules( + const RendererContentSettingRules* content_setting_rules); + const RendererContentSettingRules* GetContentSettingRules(); +#endif + private: ~AlloyContentSettingsClient() override; @@ -25,6 +43,35 @@ class AlloyContentSettingsClient : public content::RenderFrameObserver, void OnDestruct() override; bool ShouldAutoupgradeMixedContent() override; + +#if defined(OHOS_EX_EXCEPTION_LIST) + bool ShouldAllowlistForContentSettings() const; + + // blink::WebContentSettingsClient implementation. + bool AllowScript(bool enabled_per_settings) override; + + // content::RenderFrameObserver implementation. + void DidCommitProvisionalLoad(ui::PageTransition transition) override; + + // Helpers. + // True if |render_frame()| contains content that is white-listed for content + // settings. + bool IsWhitelistedForContentSettings() const; + + // Exposed for unit tests. + static bool IsWhitelistedForContentSettings( + const blink::WebSecurityOrigin& origin, + const blink::WebURL& document_url); + + // A pointer to content setting rules stored by the renderer. Normally, the + // |RendererContentSettingRules| object is owned by + // |ChromeRenderThreadObserver|. In the tests it is owned by the caller of + // |SetContentSettingRules|. + const RendererContentSettingRules* content_setting_rules_ = nullptr; + + // Caches the result of AllowScript. + base::flat_map cached_script_permissions_; +#endif }; #endif // CEF_LIBCEF_RENDERER_ALLOY_ALLOY_CONTENT_SETTINGS_CLIENT_H_ diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.cc b/libcef/renderer/alloy/alloy_render_thread_observer.cc index 37c6e35050219b3bff04096334005786226087e5..79145080da7a73b7b6b1abb92715274eece1b398 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.cc +++ b/libcef/renderer/alloy/alloy_render_thread_observer.cc @@ -61,8 +61,22 @@ void AlloyRenderThreadObserver::SetConfiguration( dynamic_params_ = std::move(params); } +#if defined(OHOS_EX_EXCEPTION_LIST) +void AlloyRenderThreadObserver::SetContentSettingRules( + const RendererContentSettingRules& rules) { + content_setting_rules_ = rules; +} +#endif // defined(OHOS_EX_EXCEPTION_LIST) + void AlloyRenderThreadObserver::OnRendererConfigurationAssociatedRequest( mojo::PendingAssociatedReceiver receiver) { renderer_configuration_receivers_.Add(this, std::move(receiver)); } + +#if defined(OHOS_EX_EXCEPTION_LIST) +const RendererContentSettingRules* +AlloyRenderThreadObserver::content_setting_rules() const { + return &content_setting_rules_; +} +#endif // defined(OHOS_EX_EXCEPTION_LIST) \ No newline at end of file diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.h b/libcef/renderer/alloy/alloy_render_thread_observer.h index 2b4ed4494b8d622eb64dab4559f8d6625eac63a0..9a33af8054b856a4756af9f0a1c8cca38659b442 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.h +++ b/libcef/renderer/alloy/alloy_render_thread_observer.h @@ -15,6 +15,10 @@ #include "content/public/renderer/render_thread_observer.h" #include "mojo/public/cpp/bindings/associated_receiver_set.h" +#if defined(OHOS_EX_EXCEPTION_LIST) +#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" +#endif + // This class sends and receives control messages in the renderer process. class AlloyRenderThreadObserver : public content::RenderThreadObserver, public chrome::mojom::RendererConfiguration { @@ -33,6 +37,10 @@ class AlloyRenderThreadObserver : public content::RenderThreadObserver, // render process is running. chrome::mojom::DynamicParamsPtr GetDynamicParams() const; +#if defined(OHOS_EX_EXCEPTION_LIST) + const RendererContentSettingRules* content_setting_rules() const; +#endif + private: // content::RenderThreadObserver: void RegisterMojoInterfaces( @@ -55,8 +63,14 @@ class AlloyRenderThreadObserver : public content::RenderThreadObserver, mojo::PendingAssociatedReceiver receiver); +#if defined(OHOS_EX_EXCEPTION_LIST) + void SetContentSettingRules(const RendererContentSettingRules& rules) override; +#endif // defined(OHOS_EX_EXCEPTION_LIST) + bool is_incognito_process_ = false; + RendererContentSettingRules content_setting_rules_; + mojo::AssociatedReceiverSet renderer_configuration_receivers_; diff --git a/libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.cc b/libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.cc similarity index 60% rename from libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.cc rename to libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.cc index ed357959ccd17492e1446c6fae2bc9d8a4102838..257fc36430b33fe5c825957e05dc00f74237eaae 100644 --- a/libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.cc +++ b/libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.cc @@ -1,19 +1,8 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.h" +// Copyright (c) 2022 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.h" #include "content/public/renderer/render_frame.h" @@ -46,4 +35,4 @@ void AlloySafeBrowsingErrorPageControllerDelegateImpl::DidFinishLoad() { security_interstitials::SecurityInterstitialPageController::Install( render_frame()); } -} \ No newline at end of file +} diff --git a/libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.h b/libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.h similarity index 71% rename from libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.h rename to libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.h index af0ba7d8a2e7be74534b13b8d64cf00fa87c82d2..f52aa58c75798ea45dc92cb983046ce5f35b7024 100644 --- a/libcef/renderer/alloy/ohos_safe_browsing_error_page_controller_delegate_impl.h +++ b/libcef/renderer/alloy/alloy_safe_browsing_error_page_controller_delegate_impl.h @@ -1,17 +1,6 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright (c) 2022 Huawei Device Co., Ltd. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #include "components/security_interstitials/content/renderer/security_interstitial_page_controller.h" #include "components/security_interstitials/core/controller_client.h" diff --git a/libcef/renderer/browser_impl.cc b/libcef/renderer/browser_impl.cc index 4c026df600ee8259dde3af6e286f913ac8f7ee3a..4d71ad6bf8072cd0cf0c1fe8d6e6122155f9f20c 100644 --- a/libcef/renderer/browser_impl.cc +++ b/libcef/renderer/browser_impl.cc @@ -28,6 +28,9 @@ #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_security_policy.h" #include "third_party/blink/public/web/web_view.h" +#if defined(OHOS_EX_NAVIGATION) +#include "content/public/browser/navigation_controller.h" +#endif #if BUILDFLAG(IS_OHOS) const char* CONTENT_SIZE_MESSAGE = "ContentSize.Message"; @@ -488,6 +491,29 @@ bool CefBrowserImpl::ShouldShowLoadingUI() { } // #endif // defined(OHOS_NWEB_EX) +#if defined(OHOS_EX_NAVIGATION) +int CefBrowserImpl::InsertBackForwardEntry(int index, const CefString& url) { + return static_cast( + content::NavigationController::NavigationEntryUpdateError::ERR_OTHER); +} + +int CefBrowserImpl::UpdateNavigationEntryUrl(int index, const CefString& url) { + return static_cast( + content::NavigationController::NavigationEntryUpdateError::ERR_OTHER); +} + +void CefBrowserImpl::ClearForwardList() {} +#endif + +#if defined(OHOS_ARKWEB_EXTENSIONS) +void CefBrowserImpl::SetTabId(int32_t tab_id) { + tab_id_ = tab_id; +} +int32_t CefBrowserImpl::GetTabId() { + return tab_id_; +} +#endif + #if BUILDFLAG(IS_OHOS) void CefBrowserImpl::DidUpdateMainFrameLayout() { needs_contents_size_update_ = true; @@ -502,26 +528,35 @@ void CefBrowserImpl::DidCommitCompositorFrame() { blink::WebFrame* main_frame = GetWebView()->MainFrame(); blink::WebLocalFrame* web_local_frame = main_frame->ToWebLocalFrame(); - gfx::Size contents_size = blink_glue::GetContentSize(web_local_frame); + gfx::Size contents_size = main_frame->ToWebLocalFrame()->DocumentSize(); + + if (contents_size.IsEmpty()) { + contents_size = GetWebView()->ContentsPreferredMinimumSize(); + } + int content_width = contents_size.width(); int content_height = contents_size.height(); gfx::Size viewport_size = blink_glue::GetVisualViewportSize(web_local_frame); - if (content_width != content_width_ || content_height != content_height_) { + if (content_width != content_width_ || content_height != content_height_ || + viewport_size.width() != viewport_width_ || + viewport_size.height() != viewport_height_) { content_width_ = content_width; content_height_ = content_height; + viewport_width_ = viewport_size.width(); + viewport_height_ = viewport_size.height(); CefRefPtr message = CefProcessMessage::Create(CONTENT_SIZE_MESSAGE); message->GetArgumentList()->SetInt(0, content_width_); message->GetArgumentList()->SetInt(1, content_height_); message->GetArgumentList()->SetInt(2, viewport_size.width()); message->GetArgumentList()->SetInt(3, viewport_size.height()); auto web_frame = GetMainFrame(); + web_frame->SendProcessMessage(PID_BROWSER, message); LOG(DEBUG) << "Fit content SendProcessMessage Content width: " << content_width << ",height: " << content_height << ". Viewport width:" << viewport_size.width() << ",height:" << viewport_size.height(); - web_frame->SendProcessMessage(PID_BROWSER, message); } } -#endif \ No newline at end of file +#endif diff --git a/libcef/renderer/browser_impl.h b/libcef/renderer/browser_impl.h index 5ed5af4b1077a12aaabf094b699c25530f2fb71e..971bdafddf8464572cc77a492e070a82151cd9ab 100644 --- a/libcef/renderer/browser_impl.h +++ b/libcef/renderer/browser_impl.h @@ -96,6 +96,11 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { void DidUpdateMainFrameLayout() override; #endif +#if defined(OHOS_ARKWEB_EXTENSIONS) + void SetTabId(int32_t tab_id) override; + int32_t GetTabId() override; +#endif + #if BUILDFLAG(IS_OHOS) bool CanGoBackOrForward(int num_steps) override; void GoBackOrForward(int num_steps) override; @@ -122,12 +127,10 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { void PasswordSuggestionSelected(int list_index) override{} // #endif // #ifdefined(OHOS_EX_FREE_COPY) - void SelectAndCopy() override{} - bool ShouldShowFreeCopy() override { return false; } + void ShowFreeCopyMenu() override{} + bool ShouldShowFreeCopyMenu() override { return false; } // #endif int GetNWebId() override { return -1; } - void SetEnableBlankTargetPopupIntercept( - bool enableBlankTargetPopup) override {} #if defined(OHOS_NO_STATE_PREFETCH) void PrefetchPage(CefString& url, CefString& additionalHttpHeaders) override { } @@ -140,6 +143,7 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { // #if defined(OHOS_SECURITY_STATE) int GetSecurityLevel() override{ return 0; } // #endif + #endif #if BUILDFLAG(IS_OHOS) @@ -169,6 +173,14 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { void UpdateBrowserControlsHeight(int height, bool animate) override {} // #endif // defined(OHOS_NWEB_EX) +#if defined(OHOS_EX_NAVIGATION) + int InsertBackForwardEntry(int index, const CefString& url) override; + + int UpdateNavigationEntryUrl(int index, const CefString& url) override; + + void ClearForwardList() override; +#endif + #ifdef OHOS_BFCACHE void SetBackForwardCacheOptions(int32_t size, int32_t timeToLive) override {} #endif @@ -214,6 +226,12 @@ class CefBrowserImpl : public CefBrowser, public blink::WebViewObserver { int content_width_ = 0; int content_height_ = 0; bool needs_contents_size_update_ = true; + int viewport_width_ = 0; + int viewport_height_ = 0; +#endif + +#if defined(OHOS_ARKWEB_EXTENSIONS) + int tab_id_; #endif IMPLEMENT_REFCOUNTING(CefBrowserImpl); diff --git a/libcef/renderer/extensions/extensions_dispatcher_delegate.cc b/libcef/renderer/extensions/extensions_dispatcher_delegate.cc index 51d3751efc2b08d2b4e2c10b9b0a37643931bf46..c73f4ae7704c1a7d3666f012011272f3259e644e 100644 --- a/libcef/renderer/extensions/extensions_dispatcher_delegate.cc +++ b/libcef/renderer/extensions/extensions_dispatcher_delegate.cc @@ -9,6 +9,10 @@ #include "extensions/common/extension_features.h" #include "extensions/renderer/resource_bundle_source_map.h" +#if defined(OHOS_ARKWEB_EXTENSIONS) +#include "chrome/renderer/extensions/api/extension_hooks_delegate.h" +#endif + namespace extensions { CefExtensionsDispatcherDelegate::CefExtensionsDispatcherDelegate() {} @@ -18,4 +22,15 @@ CefExtensionsDispatcherDelegate::~CefExtensionsDispatcherDelegate() {} void CefExtensionsDispatcherDelegate::PopulateSourceMap( extensions::ResourceBundleSourceMap* source_map) {} +#if defined(OHOS_ARKWEB_EXTENSIONS) +void CefExtensionsDispatcherDelegate::InitializeBindingsSystem( + extensions::Dispatcher* dispatcher, + extensions::NativeExtensionBindingsSystem* bindings_system) { + extensions::APIBindingsSystem* bindings = bindings_system->api_system(); + bindings->RegisterHooksDelegate( + "extension", std::make_unique( + bindings_system->messaging_service())); +} +#endif + } // namespace extensions diff --git a/libcef/renderer/extensions/extensions_dispatcher_delegate.h b/libcef/renderer/extensions/extensions_dispatcher_delegate.h index 5ccebb6d5da2b81b477a5d8603aa2efe36cb00d2..3ee3574d40ef0efc94dc27e701f22f1b35f9be7e 100644 --- a/libcef/renderer/extensions/extensions_dispatcher_delegate.h +++ b/libcef/renderer/extensions/extensions_dispatcher_delegate.h @@ -6,6 +6,10 @@ #define CEF_LIBCEF_RENDERER_EXTENSIONS_EXTENSIONS_DISPATCHER_DELEGATE_H_ #include "extensions/renderer/dispatcher_delegate.h" +#if defined(OHOS_ARKWEB_EXTENSIONS) +#include "extensions/renderer/dispatcher.h" +#include "extensions/renderer/native_extension_bindings_system.h" +#endif namespace extensions { @@ -22,6 +26,11 @@ class CefExtensionsDispatcherDelegate : public DispatcherDelegate { void PopulateSourceMap( extensions::ResourceBundleSourceMap* source_map) override; +#if defined(OHOS_ARKWEB_EXTENSIONS) + void InitializeBindingsSystem( + Dispatcher* dispatcher, + NativeExtensionBindingsSystem* bindings_system) override; +#endif }; } // namespace extensions diff --git a/libcef/renderer/frame_impl.cc b/libcef/renderer/frame_impl.cc index c17f2b6a0791b2c4731ac5edd0b7c99be0b3af1f..90fff7f2049186a13a01825b4c514bbede9614db 100644 --- a/libcef/renderer/frame_impl.cc +++ b/libcef/renderer/frame_impl.cc @@ -988,7 +988,6 @@ void CefFrameImpl::OnFocusedNodeChanged(const blink::WebElement& element) { return; } #endif // defined(OHOS_INPUT_EVENTS) - cef::mojom::HitDataParamsPtr data = cef::mojom::HitDataParams::New(); data->href = element.GetAttribute("href").Utf16(); data->anchor_text = element.TextContent().Utf16(); @@ -1073,7 +1072,7 @@ void CefFrameImpl::PutZoomingForTextFactor(float factor) { render_frame->GetWebFrame()->FrameWidget()->SetTextZoomFactor(factor); } -void CefFrameImpl::GetImageForContextNode() { +void CefFrameImpl::GetImageForContextNode(int command_id) { if (!frame_) { LOG(ERROR) << "GetImageForContextNode frame is nullptr"; return; @@ -1084,19 +1083,20 @@ void CefFrameImpl::GetImageForContextNode() { cef::mojom::GetImageForContextNodeParamsPtr params = cef::mojom::GetImageForContextNodeParams::New(); - blink::WebNode context_node = frame_->ContextMenuImageNode(); + blink::WebNode context_node = frame_->ContextMenuNode(); std::vector image_data; gfx::Size original_size; std::string image_extension; if (context_node.IsNull() || !context_node.IsElementNode()) { + LOG(WARNING) << "Context node is null or is not element node"; SendToBrowserFrame(__FUNCTION__, base::BindOnce( - [](cef::mojom::GetImageForContextNodeParamsPtr data, + [](cef::mojom::GetImageForContextNodeParamsPtr data,int command_id, const BrowserFrameType& browser_frame) { - browser_frame->OnGetImageForContextNodeNull(); + browser_frame->OnGetImageForContextNodeNull(command_id); }, - std::move(params))); + std::move(params), command_id)); return; } @@ -1110,14 +1110,16 @@ void CefFrameImpl::GetImageForContextNode() { params->height = resize_image.height(); params->image = resize_image; params->image_extension = image_extension; + LOG(DEBUG) << "GetImageForContextNode, image width: " << resize_image.width() + << ", height: " << resize_image.height(); SendToBrowserFrame( __FUNCTION__, base::BindOnce( - [](cef::mojom::GetImageForContextNodeParamsPtr data, + [](cef::mojom::GetImageForContextNodeParamsPtr data,int command_id, const BrowserFrameType& browser_frame) { - browser_frame->OnGetImageForContextNode(std::move(data)); + browser_frame->OnGetImageForContextNode(std::move(data), command_id); }, - std::move(params))); + std::move(params), command_id)); } GURL CefFrameImpl::GetAbsoluteUrl(const blink::WebNode& node, @@ -1380,7 +1382,7 @@ void CefFrameImpl::UpdateDrawRect() { DCHECK(render_frame->IsMainFrame()); blink::WebView* webview = render_frame->GetWebView(); if (!webview) { - LOG(ERROR) << "UpdateDrawRect get webview failed"; + LOG(ERROR) << "SetDrawRect get webview failed"; return; } webview->UpdateDrawRect(); diff --git a/libcef/renderer/frame_impl.h b/libcef/renderer/frame_impl.h index cfa50ea8906a60e39bf8a9c7ac4fa501d89e96d3..17350bde986a9a9651a7a2531591df22e023cc10 100644 --- a/libcef/renderer/frame_impl.h +++ b/libcef/renderer/frame_impl.h @@ -203,7 +203,7 @@ class CefFrameImpl void SetJsOnlineProperty(bool network_up) override; #endif void PutZoomingForTextFactor(float factor) override; - void GetImageForContextNode() override; + void GetImageForContextNode(int command_id) override; #ifdef OHOS_I18N void UpdateLocale(const std::string& locale) override; #endif // #ifdef OHOS_I18N diff --git a/libcef/renderer/javascript/oh_gin_javascript_function_invocation_helper.cc b/libcef/renderer/javascript/oh_gin_javascript_function_invocation_helper.cc index 23b9c87ba16a40277191acf755e3239068022f5e..acff08ac4d56d9d8490de92ba842b9bf85959e10 100644 --- a/libcef/renderer/javascript/oh_gin_javascript_function_invocation_helper.cc +++ b/libcef/renderer/javascript/oh_gin_javascript_function_invocation_helper.cc @@ -17,12 +17,6 @@ #include "ohos_adapter_helper.h" #include "v8/include/v8-exception.h" -#define MAX_FLOWBUF_DATA_SIZE 52428800 /* 50 MB */ -#define MAX_ENTRIES 10 -#define HEADER_SIZE (MAX_ENTRIES * 8) /* 10 * (int position + int length) */ -#define INDEX_SIZE 2 -#define DEFAULT_ID 1073741824 - namespace { const char kMethodInvocationAsConstructorDisallowed[] = @@ -37,6 +31,11 @@ const char kMethodInvocationErrorMessage[] = namespace NWEB { int32_t OhGinJavascriptFunctionInvocationHelper::maxFdNum_ = -1; std::atomic OhGinJavascriptFunctionInvocationHelper::usedFd_ {0}; +const int MAX_FLOWBUF_DATA_SIZE = 52428800; /* 50 MB */ +const int MAX_ENTRIES = 10; +const int HEADER_SIZE = (MAX_ENTRIES * 8); /* 10 * (int position + int length) */ +const int INDEX_SIZE = 2; +const int DEFAULT_ID = 1073741824; OhGinJavascriptFunctionInvocationHelper:: OhGinJavascriptFunctionInvocationHelper( @@ -206,7 +205,7 @@ OhGinJavascriptFunctionInvocationHelper::InvokeJavascriptMethodFlowbuf( gin::Arguments* args, OhGinJavascriptBridgeObject* object) { if (dispatcher_->IsAsyncMethod(object->object_id(), method_name_)) { - return dispatcher_->InvokeJavascriptMethodAsync(object->object_id(), method_name_, arguments); + return InvokeJavascriptMethod(arguments, error, args, object); } auto flowbufferAdapter = OHOS::NWeb::OhosAdapterHelper::GetInstance().CreateFlowbufferAdapter(); diff --git a/libcef/renderer/render_manager.cc b/libcef/renderer/render_manager.cc index c89f92d3a01749664e88e2e4573ae388ba1c7081..530cebf7751281bd02c100dd256ade85a5b9e2aa 100644 --- a/libcef/renderer/render_manager.cc +++ b/libcef/renderer/render_manager.cc @@ -253,11 +253,8 @@ void CefRenderManager::WebKitInitialized() { } #if BUILDFLAG(IS_OHOS) if (info.is_code_cache_enabled) { - LOG(DEBUG) << "Render manager register the scheme:" - << info.scheme_name.c_str() << " supported code cache."; - blink::SchemeRegistry:: - RegisterURLSchemeAsSupportingCodeCacheWithResponseTime( - String(info.scheme_name)); + LOG(DEBUG) << "Render manager register the scheme:" << info.scheme_name.c_str() << " supported code cache."; + blink::SchemeRegistry::RegisterURLSchemeAsSupportingCodeCacheWithResponseTime(String(info.scheme_name)); } #endif } diff --git a/libcef_dll/cpptoc/access_request_cpptoc.cc b/libcef_dll/cpptoc/access_request_cpptoc.cc index 68767665046f1303e0a803be96c543b9602c6b8a..abfa21655555f98fe6add0979efb519053ea25cc 100644 --- a/libcef_dll/cpptoc/access_request_cpptoc.cc +++ b/libcef_dll/cpptoc/access_request_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=41d5919c2dd767426711253b5a7fd741b283682d$ +// $hash=fca736be0d0cf028a13a7b338d5e19ca26ac5a6d$ // #include "libcef_dll/cpptoc/access_request_cpptoc.h" diff --git a/libcef_dll/cpptoc/access_request_cpptoc.h b/libcef_dll/cpptoc/access_request_cpptoc.h index 3334c2220fc0a304ce70bdfae15a32d7609266b7..8ce9c60ae05edf58474e214a6b5777b1b7d48b24 100644 --- a/libcef_dll/cpptoc/access_request_cpptoc.h +++ b/libcef_dll/cpptoc/access_request_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a68e8f4cb6b06e1359b04b8f2fec6e51d52e7e7d$ +// $hash=44c32953a5dc70e64d35222732817d6b065f0e33$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_ACCESS_REQUEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc b/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc index 96f293dc8f8e46dbb171f3f212bf59f30853f422..69190db52cea94223936292abdf0511e8ec833e1 100644 --- a/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/accessibility_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9ce35c9de37d66355402b640df7068f40ff47d1c$ +// $hash=3ad767f0b424a886e1783b416f532fbaf6b8cbbe$ // #include "libcef_dll/cpptoc/accessibility_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/accessibility_handler_cpptoc.h b/libcef_dll/cpptoc/accessibility_handler_cpptoc.h index 3683d3e5e2aa160a5e334a52d95147d44c4887cb..faf271035e848add6a2270ed96c2d1915d0a900e 100644 --- a/libcef_dll/cpptoc/accessibility_handler_cpptoc.h +++ b/libcef_dll/cpptoc/accessibility_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dcb546161d26453a2fc10e0bedf1a7d0e2010def$ +// $hash=0d1469b1473cbef38092a2b0624ac33faa6e1d89$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_ACCESSIBILITY_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/app_cpptoc.cc b/libcef_dll/cpptoc/app_cpptoc.cc index a8e9ec77d8e95a3d0e22e5fa6a40b506ce11fca9..8bd882f1a98f0f494cad5733a65e4da3bb6060cc 100644 --- a/libcef_dll/cpptoc/app_cpptoc.cc +++ b/libcef_dll/cpptoc/app_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=754b23bd4451df2b40e62a22e99652069422550d$ +// $hash=3b8d5f1990e9638e0baf2c3351c779f53c8b868a$ // #include "libcef_dll/cpptoc/app_cpptoc.h" diff --git a/libcef_dll/cpptoc/app_cpptoc.h b/libcef_dll/cpptoc/app_cpptoc.h index 2aea11bc4e8a67a99f35f66942156def75559d53..fe94e85891294dbd29cee92638dc3c4777805d23 100644 --- a/libcef_dll/cpptoc/app_cpptoc.h +++ b/libcef_dll/cpptoc/app_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f232ede960f84fea711628392351ae95e57af378$ +// $hash=a4d3edb584e87581659ded4e0bb20739b2b0efea$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/audio_handler_cpptoc.cc b/libcef_dll/cpptoc/audio_handler_cpptoc.cc index e2529f2a10ab5d5f0d345deb7774356a9070f277..543c9e821da8534cbbd7877e4b08dcdab5b53822 100644 --- a/libcef_dll/cpptoc/audio_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/audio_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=221ccbf7fd0cb53ade0e9a108314e103c675e4f4$ +// $hash=5f113123b4a9cd31cb451c9b9e60d5e04c38a6b7$ // #include "libcef_dll/cpptoc/audio_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/audio_handler_cpptoc.h b/libcef_dll/cpptoc/audio_handler_cpptoc.h index 6996e27058fe5b244040551c1bd8963d48697883..1d574545486efe260aba4083be65c971aaa838e9 100644 --- a/libcef_dll/cpptoc/audio_handler_cpptoc.h +++ b/libcef_dll/cpptoc/audio_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d67e7dfa6bbb0a144d5199a8c8f0a31e91483d0e$ +// $hash=6d31cfb9774514e0a15c999903fa4eb9ce76634d$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_AUDIO_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.cc b/libcef_dll/cpptoc/auth_callback_cpptoc.cc index ed0c2b4986bc29a5760960b2875f2e24464ec752..d3f2857dce071b64213b868da06154b27ba6812c 100644 --- a/libcef_dll/cpptoc/auth_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/auth_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=207b3c2d62f08a73e3e26ef33509c8072501afdd$ +// $hash=7734d8c094e71eb959c29680d0abf321d0b6362d$ // #include "libcef_dll/cpptoc/auth_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.h b/libcef_dll/cpptoc/auth_callback_cpptoc.h index 3d1f2b006b8e771ba3465ab7b6e99dc959ef97c5..6a1dd700efad2bfd91ddc2142784ab065165f258 100644 --- a/libcef_dll/cpptoc/auth_callback_cpptoc.h +++ b/libcef_dll/cpptoc/auth_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c5e3d7f3c228ee0e1907f4a26532d15e973ee185$ +// $hash=be94cb2e319c4a42e8bc9ee41b78935834e8a59c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_AUTH_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc b/libcef_dll/cpptoc/before_download_callback_cpptoc.cc index 09d7bd1372dd193bf2d736dd9e0827dc2e99d341..f5577e621cbce1451f812df928294dc73089c2b8 100644 --- a/libcef_dll/cpptoc/before_download_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/before_download_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=75d912cc78d1535fdd73fb91230a8e19489f23f3$ +// $hash=fbd5a0f83b2df711f30cd7694877708c5a3b2d50$ // #include "libcef_dll/cpptoc/before_download_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.h b/libcef_dll/cpptoc/before_download_callback_cpptoc.h index 4ba4ad37fc3b66296b935ae15e769357916451cf..9f2944cd96091586020e1a16942f47f1f215a78b 100644 --- a/libcef_dll/cpptoc/before_download_callback_cpptoc.h +++ b/libcef_dll/cpptoc/before_download_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5d4c55aa042db07a6c77d055964fcc55568f73ff$ +// $hash=76dfadaa2d0f5ef6cdb8621cad3136e89b33ae25$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_BEFORE_DOWNLOAD_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.cc b/libcef_dll/cpptoc/binary_value_cpptoc.cc index 75cb2b0239cf48a3bf287927370bc3f96507f8eb..6f0827c36dd5de4672e7d58f360f17c47d0de16b 100644 --- a/libcef_dll/cpptoc/binary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/binary_value_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5086cf67b0ea050c324c57142cf324611c4cb4c9$ +// $hash=905b24443e08e2d3e2464d5f4138e97904be3e9e$ // #include "libcef_dll/cpptoc/binary_value_cpptoc.h" diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.h b/libcef_dll/cpptoc/binary_value_cpptoc.h index 421f5e672812e39cffcbe66b257f1bb26f19d5fe..3f6a9e362ddc930f096f8bdf1adb6e33ca7c7e72 100644 --- a/libcef_dll/cpptoc/binary_value_cpptoc.h +++ b/libcef_dll/cpptoc/binary_value_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=318a89979d60f033cf43da261650963865a67b5c$ +// $hash=bdc631b2bd2c0a68146e823e0ff23e1b3a455023$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_BINARY_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_cpptoc.cc b/libcef_dll/cpptoc/browser_cpptoc.cc index 1bea16e4066cc5807a770538673e637638ccf4cf..ef9e4d782d7ad62e13ac94660aeefafd3b1394ce 100644 --- a/libcef_dll/cpptoc/browser_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_cpptoc.cc @@ -9,23 +9,23 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d25cbbd3db1ccc61b7eeff707b4d9866c67f5d98$ +// $hash=6d5d3e5af0703f079b2041ee90347c72004ad24c$ // #include "libcef_dll/cpptoc/browser_cpptoc.h" +#include #include "libcef_dll/cpptoc/browser_host_cpptoc.h" #include "libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.h" #include "libcef_dll/cpptoc/frame_cpptoc.h" #include "libcef_dll/cpptoc/geolocation_acess_cpptoc.h" #include "libcef_dll/shutdown_checker.h" #include "libcef_dll/transfer_util.h" -#include namespace { // MEMBER FUNCTIONS - Body may be edited by hand. -int CEF_CALLBACK browser_is_valid(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_is_valid(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -42,8 +42,8 @@ int CEF_CALLBACK browser_is_valid(struct _cef_browser_t *self) { return _retval; } -struct _cef_browser_host_t *CEF_CALLBACK -browser_get_host(struct _cef_browser_t *self) { +struct _cef_browser_host_t* CEF_CALLBACK +browser_get_host(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -60,7 +60,7 @@ browser_get_host(struct _cef_browser_t *self) { return CefBrowserHostCppToC::Wrap(_retval); } -int CEF_CALLBACK browser_can_go_back(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_can_go_back(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -77,7 +77,7 @@ int CEF_CALLBACK browser_can_go_back(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_go_back(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_go_back(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -91,7 +91,7 @@ void CEF_CALLBACK browser_go_back(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->GoBack(); } -int CEF_CALLBACK browser_can_go_forward(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_can_go_forward(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -108,7 +108,7 @@ int CEF_CALLBACK browser_can_go_forward(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_go_forward(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_go_forward(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -122,7 +122,7 @@ void CEF_CALLBACK browser_go_forward(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->GoForward(); } -int CEF_CALLBACK browser_is_loading(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_is_loading(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -139,7 +139,7 @@ int CEF_CALLBACK browser_is_loading(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_reload(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_reload(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -153,7 +153,7 @@ void CEF_CALLBACK browser_reload(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->Reload(); } -void CEF_CALLBACK browser_reload_ignore_cache(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_reload_ignore_cache(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -167,7 +167,7 @@ void CEF_CALLBACK browser_reload_ignore_cache(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->ReloadIgnoreCache(); } -void CEF_CALLBACK browser_stop_load(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_stop_load(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -181,7 +181,7 @@ void CEF_CALLBACK browser_stop_load(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->StopLoad(); } -int CEF_CALLBACK browser_get_identifier(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_get_identifier(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -198,8 +198,8 @@ int CEF_CALLBACK browser_get_identifier(struct _cef_browser_t *self) { return _retval; } -int CEF_CALLBACK browser_is_same(struct _cef_browser_t *self, - struct _cef_browser_t *that) { +int CEF_CALLBACK browser_is_same(struct _cef_browser_t* self, + struct _cef_browser_t* that) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -222,7 +222,7 @@ int CEF_CALLBACK browser_is_same(struct _cef_browser_t *self, return _retval; } -int CEF_CALLBACK browser_is_popup(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_is_popup(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -239,7 +239,7 @@ int CEF_CALLBACK browser_is_popup(struct _cef_browser_t *self) { return _retval; } -int CEF_CALLBACK browser_has_document(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_has_document(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -256,8 +256,8 @@ int CEF_CALLBACK browser_has_document(struct _cef_browser_t *self) { return _retval; } -struct _cef_frame_t *CEF_CALLBACK -browser_get_main_frame(struct _cef_browser_t *self) { +struct _cef_frame_t* CEF_CALLBACK +browser_get_main_frame(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -274,8 +274,8 @@ browser_get_main_frame(struct _cef_browser_t *self) { return CefFrameCppToC::Wrap(_retval); } -struct _cef_frame_t *CEF_CALLBACK -browser_get_focused_frame(struct _cef_browser_t *self) { +struct _cef_frame_t* CEF_CALLBACK +browser_get_focused_frame(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -292,8 +292,8 @@ browser_get_focused_frame(struct _cef_browser_t *self) { return CefFrameCppToC::Wrap(_retval); } -struct _cef_frame_t *CEF_CALLBACK -browser_get_frame_byident(struct _cef_browser_t *self, int64 identifier) { +struct _cef_frame_t* CEF_CALLBACK +browser_get_frame_byident(struct _cef_browser_t* self, int64 identifier) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -311,8 +311,8 @@ browser_get_frame_byident(struct _cef_browser_t *self, int64 identifier) { return CefFrameCppToC::Wrap(_retval); } -struct _cef_frame_t *CEF_CALLBACK browser_get_frame(struct _cef_browser_t *self, - const cef_string_t *name) { +struct _cef_frame_t* CEF_CALLBACK browser_get_frame(struct _cef_browser_t* self, + const cef_string_t* name) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -331,7 +331,7 @@ struct _cef_frame_t *CEF_CALLBACK browser_get_frame(struct _cef_browser_t *self, return CefFrameCppToC::Wrap(_retval); } -size_t CEF_CALLBACK browser_get_frame_count(struct _cef_browser_t *self) { +size_t CEF_CALLBACK browser_get_frame_count(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -348,9 +348,9 @@ size_t CEF_CALLBACK browser_get_frame_count(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_get_frame_identifiers(struct _cef_browser_t *self, - size_t *identifiersCount, - int64 *identifiers) { +void CEF_CALLBACK browser_get_frame_identifiers(struct _cef_browser_t* self, + size_t* identifiersCount, + int64* identifiers) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -387,7 +387,7 @@ void CEF_CALLBACK browser_get_frame_identifiers(struct _cef_browser_t *self, } } -void CEF_CALLBACK browser_get_frame_names(struct _cef_browser_t *self, +void CEF_CALLBACK browser_get_frame_names(struct _cef_browser_t* self, cef_string_list_t names) { shutdown_checker::AssertNotShutdown(); @@ -415,8 +415,8 @@ void CEF_CALLBACK browser_get_frame_names(struct _cef_browser_t *self, transfer_string_list_contents(namesList, names); } -struct _cef_browser_permission_request_delegate_t *CEF_CALLBACK -browser_get_permission_request_delegate(struct _cef_browser_t *self) { +struct _cef_browser_permission_request_delegate_t* CEF_CALLBACK +browser_get_permission_request_delegate(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -434,8 +434,8 @@ browser_get_permission_request_delegate(struct _cef_browser_t *self) { return CefBrowserPermissionRequestDelegateCppToC::Wrap(_retval); } -struct _cef_geolocation_acess_t *CEF_CALLBACK -browser_get_geolocation_permissions(struct _cef_browser_t *self) { +struct _cef_geolocation_acess_t* CEF_CALLBACK +browser_get_geolocation_permissions(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -453,7 +453,7 @@ browser_get_geolocation_permissions(struct _cef_browser_t *self) { return CefGeolocationAcessCppToC::Wrap(_retval); } -int CEF_CALLBACK browser_can_go_back_or_forward(struct _cef_browser_t *self, +int CEF_CALLBACK browser_can_go_back_or_forward(struct _cef_browser_t* self, int num_steps) { shutdown_checker::AssertNotShutdown(); @@ -471,7 +471,7 @@ int CEF_CALLBACK browser_can_go_back_or_forward(struct _cef_browser_t *self, return _retval; } -void CEF_CALLBACK browser_go_back_or_forward(struct _cef_browser_t *self, +void CEF_CALLBACK browser_go_back_or_forward(struct _cef_browser_t* self, int num_steps) { shutdown_checker::AssertNotShutdown(); @@ -486,7 +486,7 @@ void CEF_CALLBACK browser_go_back_or_forward(struct _cef_browser_t *self, CefBrowserCppToC::Get(self)->GoBackOrForward(num_steps); } -void CEF_CALLBACK browser_delete_history(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_delete_history(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -500,7 +500,7 @@ void CEF_CALLBACK browser_delete_history(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->DeleteHistory(); } -void CEF_CALLBACK browser_select_and_copy(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_show_free_copy_menu(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -511,10 +511,11 @@ void CEF_CALLBACK browser_select_and_copy(struct _cef_browser_t *self) { } // Execute - CefBrowserCppToC::Get(self)->SelectAndCopy(); + CefBrowserCppToC::Get(self)->ShowFreeCopyMenu(); } -int CEF_CALLBACK browser_should_show_free_copy(struct _cef_browser_t *self) { +int CEF_CALLBACK +browser_should_show_free_copy_menu(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -525,14 +526,15 @@ int CEF_CALLBACK browser_should_show_free_copy(struct _cef_browser_t *self) { } // Execute - bool _retval = CefBrowserCppToC::Get(self)->ShouldShowFreeCopy(); + bool _retval = CefBrowserCppToC::Get(self)->ShouldShowFreeCopyMenu(); // Return type: bool return _retval; } -void CEF_CALLBACK browser_password_suggestion_selected( - struct _cef_browser_t *self, int list_index) { +void CEF_CALLBACK +browser_password_suggestion_selected(struct _cef_browser_t* self, + int list_index) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -546,8 +548,11 @@ void CEF_CALLBACK browser_password_suggestion_selected( CefBrowserCppToC::Get(self)->PasswordSuggestionSelected(list_index); } -void CEF_CALLBACK browser_update_browser_controls_state( - struct _cef_browser_t *self, int constraints, int current, int animate) { +void CEF_CALLBACK +browser_update_browser_controls_state(struct _cef_browser_t* self, + int constraints, + int current, + int animate) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -562,8 +567,10 @@ void CEF_CALLBACK browser_update_browser_controls_state( constraints, current, animate ? true : false); } -void CEF_CALLBACK browser_update_browser_controls_height( - struct _cef_browser_t *self, int height, int animate) { +void CEF_CALLBACK +browser_update_browser_controls_height(struct _cef_browser_t* self, + int height, + int animate) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -578,9 +585,9 @@ void CEF_CALLBACK browser_update_browser_controls_height( height, animate ? true : false); } -void CEF_CALLBACK browser_prefetch_page(struct _cef_browser_t *self, - cef_string_t *url, - cef_string_t *additionalHttpHeaders) { +void CEF_CALLBACK browser_prefetch_page(struct _cef_browser_t* self, + cef_string_t* url, + cef_string_t* additionalHttpHeaders) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -609,7 +616,7 @@ void CEF_CALLBACK browser_prefetch_page(struct _cef_browser_t *self, CefBrowserCppToC::Get(self)->PrefetchPage(urlStr, additionalHttpHeadersStr); } -void CEF_CALLBACK browser_reload_original_url(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_reload_original_url(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -623,7 +630,7 @@ void CEF_CALLBACK browser_reload_original_url(struct _cef_browser_t *self) { CefBrowserCppToC::Get(self)->ReloadOriginalUrl(); } -int CEF_CALLBACK browser_can_store_web_archive(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_can_store_web_archive(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -640,8 +647,9 @@ int CEF_CALLBACK browser_can_store_web_archive(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_set_browser_user_agent_string( - struct _cef_browser_t *self, const cef_string_t *user_agent) { +void CEF_CALLBACK +browser_set_browser_user_agent_string(struct _cef_browser_t* self, + const cef_string_t* user_agent) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -660,7 +668,7 @@ void CEF_CALLBACK browser_set_browser_user_agent_string( CefBrowserCppToC::Get(self)->SetBrowserUserAgentString(CefString(user_agent)); } -int CEF_CALLBACK browser_should_show_loading_ui(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_should_show_loading_ui(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -677,7 +685,7 @@ int CEF_CALLBACK browser_should_show_loading_ui(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_set_force_enable_zoom(struct _cef_browser_t *self, +void CEF_CALLBACK browser_set_force_enable_zoom(struct _cef_browser_t* self, int forceEnableZoom) { shutdown_checker::AssertNotShutdown(); @@ -693,7 +701,7 @@ void CEF_CALLBACK browser_set_force_enable_zoom(struct _cef_browser_t *self, : false); } -int CEF_CALLBACK browser_get_force_enable_zoom(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_get_force_enable_zoom(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -710,7 +718,7 @@ int CEF_CALLBACK browser_get_force_enable_zoom(struct _cef_browser_t *self) { return _retval; } -int CEF_CALLBACK browser_get_nweb_id(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_get_nweb_id(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -727,8 +735,43 @@ int CEF_CALLBACK browser_get_nweb_id(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_set_enable_blank_target_popup_intercept( - struct _cef_browser_t *self, int enableBlankTargetPopup) { +int CEF_CALLBACK browser_is_ads_block_enabled(struct _cef_browser_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return 0; + } + + // Execute + bool _retval = CefBrowserCppToC::Get(self)->IsAdsBlockEnabled(); + + // Return type: bool + return _retval; +} + +int CEF_CALLBACK +browser_is_ads_block_enabled_for_cur_page(struct _cef_browser_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return 0; + } + + // Execute + bool _retval = CefBrowserCppToC::Get(self)->IsAdsBlockEnabledForCurPage(); + + // Return type: bool + return _retval; +} + +void CEF_CALLBACK browser_enable_ads_block(struct _cef_browser_t* self, + int enable) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -739,12 +782,11 @@ void CEF_CALLBACK browser_set_enable_blank_target_popup_intercept( } // Execute - CefBrowserCppToC::Get(self)->SetEnableBlankTargetPopupIntercept( - enableBlankTargetPopup ? true : false); + CefBrowserCppToC::Get(self)->EnableAdsBlock(enable ? true : false); } int CEF_CALLBACK -browser_get_save_password_automatically(struct _cef_browser_t *self) { +browser_get_save_password_automatically(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -761,8 +803,9 @@ browser_get_save_password_automatically(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_set_save_password_automatically( - struct _cef_browser_t *self, int enable) { +void CEF_CALLBACK +browser_set_save_password_automatically(struct _cef_browser_t* self, + int enable) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -777,7 +820,7 @@ void CEF_CALLBACK browser_set_save_password_automatically( : false); } -void CEF_CALLBACK browser_save_or_update_password(struct _cef_browser_t *self, +void CEF_CALLBACK browser_save_or_update_password(struct _cef_browser_t* self, int is_update) { shutdown_checker::AssertNotShutdown(); @@ -792,7 +835,7 @@ void CEF_CALLBACK browser_save_or_update_password(struct _cef_browser_t *self, CefBrowserCppToC::Get(self)->SaveOrUpdatePassword(is_update ? true : false); } -int CEF_CALLBACK browser_get_save_password(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_get_save_password(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -809,7 +852,7 @@ int CEF_CALLBACK browser_get_save_password(struct _cef_browser_t *self) { return _retval; } -void CEF_CALLBACK browser_set_save_password(struct _cef_browser_t *self, +void CEF_CALLBACK browser_set_save_password(struct _cef_browser_t* self, int enable) { shutdown_checker::AssertNotShutdown(); @@ -824,39 +867,39 @@ void CEF_CALLBACK browser_set_save_password(struct _cef_browser_t *self, CefBrowserCppToC::Get(self)->SetSavePassword(enable ? true : false); } -int CEF_CALLBACK browser_get_security_level(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_enable_safe_browsing(struct _cef_browser_t* self, + int enable) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return 0; + return; } // Execute - int _retval = CefBrowserCppToC::Get(self)->GetSecurityLevel(); - - // Return type: simple - return _retval; + CefBrowserCppToC::Get(self)->EnableSafeBrowsing(enable ? true : false); } -void CEF_CALLBACK browser_enable_safe_browsing(struct _cef_browser_t *self, - int enable) { +int CEF_CALLBACK browser_is_safe_browsing_enabled(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; } // Execute - CefBrowserCppToC::Get(self)->EnableSafeBrowsing(enable ? true : false); + bool _retval = CefBrowserCppToC::Get(self)->IsSafeBrowsingEnabled(); + + // Return type: bool + return _retval; } -int CEF_CALLBACK browser_is_safe_browsing_enabled(struct _cef_browser_t *self) { +int CEF_CALLBACK browser_get_security_level(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -867,30 +910,41 @@ int CEF_CALLBACK browser_is_safe_browsing_enabled(struct _cef_browser_t *self) { } // Execute - bool _retval = CefBrowserCppToC::Get(self)->IsSafeBrowsingEnabled(); + int _retval = CefBrowserCppToC::Get(self)->GetSecurityLevel(); - // Return type: bool + // Return type: simple return _retval; } -void CEF_CALLBACK browser_enable_intelligent_tracking_prevention( - struct _cef_browser_t *self, int enable) { +int CEF_CALLBACK browser_insert_back_forward_entry(struct _cef_browser_t* self, + int index, + const cef_string_t* url) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; + } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return 0; } // Execute - CefBrowserCppToC::Get(self)->EnableIntelligentTrackingPrevention( - enable ? true : false); + int _retval = CefBrowserCppToC::Get(self)->InsertBackForwardEntry( + index, CefString(url)); + + // Return type: simple + return _retval; } -int CEF_CALLBACK browser_is_intelligent_tracking_prevention_enabled( - struct _cef_browser_t *self) { +int CEF_CALLBACK +browser_update_navigation_entry_url(struct _cef_browser_t* self, + int index, + const cef_string_t* url) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -899,68 +953,74 @@ int CEF_CALLBACK browser_is_intelligent_tracking_prevention_enabled( if (!self) { return 0; } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return 0; + } // Execute - bool _retval = - CefBrowserCppToC::Get(self)->IsIntelligentTrackingPreventionEnabled(); + int _retval = CefBrowserCppToC::Get(self)->UpdateNavigationEntryUrl( + index, CefString(url)); - // Return type: bool + // Return type: simple return _retval; } -int CEF_CALLBACK browser_is_ads_block_enabled(struct _cef_browser_t *self) { +void CEF_CALLBACK browser_clear_forward_list(struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return 0; + return; } // Execute - bool _retval = CefBrowserCppToC::Get(self)->IsAdsBlockEnabled(); - - // Return type: bool - return _retval; + CefBrowserCppToC::Get(self)->ClearForwardList(); } -int CEF_CALLBACK -browser_is_ads_block_enabled_for_cur_page(struct _cef_browser_t *self) { +void CEF_CALLBACK +browser_enable_intelligent_tracking_prevention(struct _cef_browser_t* self, + int enable) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return 0; + return; } // Execute - bool _retval = CefBrowserCppToC::Get(self)->IsAdsBlockEnabledForCurPage(); - - // Return type: bool - return _retval; + CefBrowserCppToC::Get(self)->EnableIntelligentTrackingPrevention( + enable ? true : false); } -void CEF_CALLBACK browser_enable_ads_block(struct _cef_browser_t *self, - int enable) { +int CEF_CALLBACK browser_is_intelligent_tracking_prevention_enabled( + struct _cef_browser_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; } // Execute - CefBrowserCppToC::Get(self)->EnableAdsBlock(enable ? true : false); + bool _retval = + CefBrowserCppToC::Get(self)->IsIntelligentTrackingPreventionEnabled(); + + // Return type: bool + return _retval; } -int CEF_CALLBACK browser_set_url_trust_list_with_err_msg( - struct _cef_browser_t *self, const cef_string_t *urlTrustList, - cef_string_t *detailErrMsg) { +int CEF_CALLBACK +browser_set_url_trust_list_with_err_msg(struct _cef_browser_t* self, + const cef_string_t* urlTrustList, + cef_string_t* detailErrMsg) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -991,8 +1051,41 @@ int CEF_CALLBACK browser_set_url_trust_list_with_err_msg( return _retval; } -void CEF_CALLBACK browser_set_back_forward_cache_options( - struct _cef_browser_t *self, int32_t size, int32_t timeToLive) { +void CEF_CALLBACK browser_set_tab_id(struct _cef_browser_t* self, int tab_id) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + + // Execute + CefBrowserCppToC::Get(self)->SetTabId(tab_id); +} + +int CEF_CALLBACK browser_get_tab_id(struct _cef_browser_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return 0; + } + + // Execute + int _retval = CefBrowserCppToC::Get(self)->GetTabId(); + + // Return type: simple + return _retval; +} + +void CEF_CALLBACK +browser_set_back_forward_cache_options(struct _cef_browser_t* self, + int32_t size, + int32_t timeToLive) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -1006,7 +1099,7 @@ void CEF_CALLBACK browser_set_back_forward_cache_options( CefBrowserCppToC::Get(self)->SetBackForwardCacheOptions(size, timeToLive); } -} // namespace +} // namespace // CONSTRUCTOR - Do not edit by hand. @@ -1039,8 +1132,8 @@ CefBrowserCppToC::CefBrowserCppToC() { GetStruct()->can_go_back_or_forward = browser_can_go_back_or_forward; GetStruct()->go_back_or_forward = browser_go_back_or_forward; GetStruct()->delete_history = browser_delete_history; - GetStruct()->select_and_copy = browser_select_and_copy; - GetStruct()->should_show_free_copy = browser_should_show_free_copy; + GetStruct()->show_free_copy_menu = browser_show_free_copy_menu; + GetStruct()->should_show_free_copy_menu = browser_should_show_free_copy_menu; GetStruct()->password_suggestion_selected = browser_password_suggestion_selected; GetStruct()->update_browser_controls_state = @@ -1056,8 +1149,10 @@ CefBrowserCppToC::CefBrowserCppToC() { GetStruct()->set_force_enable_zoom = browser_set_force_enable_zoom; GetStruct()->get_force_enable_zoom = browser_get_force_enable_zoom; GetStruct()->get_nweb_id = browser_get_nweb_id; - GetStruct()->set_enable_blank_target_popup_intercept = - browser_set_enable_blank_target_popup_intercept; + GetStruct()->is_ads_block_enabled = browser_is_ads_block_enabled; + GetStruct()->is_ads_block_enabled_for_cur_page = + browser_is_ads_block_enabled_for_cur_page; + GetStruct()->enable_ads_block = browser_enable_ads_block; GetStruct()->get_save_password_automatically = browser_get_save_password_automatically; GetStruct()->set_save_password_automatically = @@ -1065,35 +1160,41 @@ CefBrowserCppToC::CefBrowserCppToC() { GetStruct()->save_or_update_password = browser_save_or_update_password; GetStruct()->get_save_password = browser_get_save_password; GetStruct()->set_save_password = browser_set_save_password; - GetStruct()->get_security_level = browser_get_security_level; GetStruct()->enable_safe_browsing = browser_enable_safe_browsing; GetStruct()->is_safe_browsing_enabled = browser_is_safe_browsing_enabled; + GetStruct()->get_security_level = browser_get_security_level; + GetStruct()->insert_back_forward_entry = browser_insert_back_forward_entry; + GetStruct()->update_navigation_entry_url = + browser_update_navigation_entry_url; + GetStruct()->clear_forward_list = browser_clear_forward_list; GetStruct()->enable_intelligent_tracking_prevention = browser_enable_intelligent_tracking_prevention; GetStruct()->is_intelligent_tracking_prevention_enabled = browser_is_intelligent_tracking_prevention_enabled; - GetStruct()->is_ads_block_enabled = browser_is_ads_block_enabled; - GetStruct()->is_ads_block_enabled_for_cur_page = - browser_is_ads_block_enabled_for_cur_page; - GetStruct()->enable_ads_block = browser_enable_ads_block; GetStruct()->set_url_trust_list_with_err_msg = browser_set_url_trust_list_with_err_msg; + GetStruct()->set_tab_id = browser_set_tab_id; + GetStruct()->get_tab_id = browser_get_tab_id; GetStruct()->set_back_forward_cache_options = browser_set_back_forward_cache_options; } // DESTRUCTOR - Do not edit by hand. -CefBrowserCppToC::~CefBrowserCppToC() { shutdown_checker::AssertNotShutdown(); } +CefBrowserCppToC::~CefBrowserCppToC() { + shutdown_checker::AssertNotShutdown(); +} template <> CefRefPtr CefCppToCRefCounted::UnwrapDerived( - CefWrapperType type, cef_browser_t *s) { + CefWrapperType type, + cef_browser_t* s) { DCHECK(false) << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCppToCRefCounted::kWrapperType = WT_BROWSER; \ No newline at end of file +CefWrapperType CefCppToCRefCounted::kWrapperType = WT_BROWSER; diff --git a/libcef_dll/cpptoc/browser_cpptoc.h b/libcef_dll/cpptoc/browser_cpptoc.h index 6d9aabfba047ddd94d45d5c6ade96c0d43a0fbf5..e3cb57ed3a3f3fed50f93312116106a893cbf816 100644 --- a/libcef_dll/cpptoc/browser_cpptoc.h +++ b/libcef_dll/cpptoc/browser_cpptoc.h @@ -30,9 +30,9 @@ // This class may be instantiated and accessed DLL-side only. class CefBrowserCppToC : public CefCppToCRefCounted { -public: + public: CefBrowserCppToC(); virtual ~CefBrowserCppToC(); }; -#endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_CPPTOC_H_ +#endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.cc b/libcef_dll/cpptoc/browser_host_cpptoc.cc index 3649f1f55989607decfc1c60af68f7a49f9abed8..db9e4fc3fea17e98b3bfb07806f871f53bc55c1a 100644 --- a/libcef_dll/cpptoc/browser_host_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_host_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3f75d50f1404831fa66091bb96597abd111f3ce9$ +// $hash=06eecec87b975b3fc864635e3cb3dc94efc0221e$ // #include "libcef_dll/cpptoc/browser_host_cpptoc.h" @@ -1615,7 +1615,8 @@ browser_host_get_web_debugging_access(struct _cef_browser_host_t* self) { } void CEF_CALLBACK -browser_host_get_image_for_context_node(struct _cef_browser_host_t* self) { +browser_host_get_image_for_context_node(struct _cef_browser_host_t* self, + int command_id) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -1626,12 +1627,13 @@ browser_host_get_image_for_context_node(struct _cef_browser_host_t* self) { } // Execute - CefBrowserHostCppToC::Get(self)->GetImageForContextNode(); + CefBrowserHostCppToC::Get(self)->GetImageForContextNode(command_id); } void CEF_CALLBACK browser_host_get_image_from_cache(struct _cef_browser_host_t* self, - const cef_string_t* url) { + const cef_string_t* url, + int command_id) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -1647,7 +1649,8 @@ browser_host_get_image_from_cache(struct _cef_browser_host_t* self, } // Execute - CefBrowserHostCppToC::Get(self)->GetImageFromCache(CefString(url)); + CefBrowserHostCppToC::Get(self)->GetImageFromCache(CefString(url), + command_id); } void CEF_CALLBACK @@ -2205,7 +2208,7 @@ browser_host_destroy_all_web_message_ports(struct _cef_browser_host_t* self) { void CEF_CALLBACK browser_host_post_port_message(struct _cef_browser_host_t* self, - cef_string_t* port_handle, + const cef_string_t* port_handle, struct _cef_value_t* message) { shutdown_checker::AssertNotShutdown(); @@ -2236,7 +2239,7 @@ browser_host_post_port_message(struct _cef_browser_host_t* self, void CEF_CALLBACK browser_host_set_port_message_callback(struct _cef_browser_host_t* self, - cef_string_t* port_handle, + const cef_string_t* port_handle, cef_web_message_receiver_t* callback) { shutdown_checker::AssertNotShutdown(); @@ -2997,24 +3000,23 @@ browser_host_set_overscroll_mode(struct _cef_browser_host_t* self, int mode) { CefBrowserHostCppToC::Get(self)->SetOverscrollMode(mode); } -int CEF_CALLBACK browser_host_discard(struct _cef_browser_host_t* self) { +void CEF_CALLBACK +browser_host_set_browser_zoom_level(struct _cef_browser_host_t* self, + double zoomFactor) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return 0; + return; } // Execute - bool _retval = CefBrowserHostCppToC::Get(self)->Discard(); - - // Return type: bool - return _retval; + CefBrowserHostCppToC::Get(self)->SetBrowserZoomLevel(zoomFactor); } -int CEF_CALLBACK browser_host_restore(struct _cef_browser_host_t* self) { +int CEF_CALLBACK browser_host_discard(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3025,26 +3027,27 @@ int CEF_CALLBACK browser_host_restore(struct _cef_browser_host_t* self) { } // Execute - bool _retval = CefBrowserHostCppToC::Get(self)->Restore(); + bool _retval = CefBrowserHostCppToC::Get(self)->Discard(); // Return type: bool return _retval; } -void CEF_CALLBACK -browser_host_set_browser_zoom_level(struct _cef_browser_host_t* self, - double zoomFactor) { +int CEF_CALLBACK browser_host_restore(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; } // Execute - CefBrowserHostCppToC::Get(self)->SetBrowserZoomLevel(zoomFactor); + bool _retval = CefBrowserHostCppToC::Get(self)->Restore(); + + // Return type: bool + return _retval; } int CEF_CALLBACK @@ -3083,24 +3086,36 @@ browser_host_get_shrink_viewport_height(struct _cef_browser_host_t* self) { return _retval; } -void CEF_CALLBACK -browser_host_set_print_background(struct _cef_browser_host_t* self, - int enable) { +int CEF_CALLBACK +browser_host_insert_back_forward_entry(struct _cef_browser_host_t* self, + int index, + const cef_string_t* url) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; + } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return 0; } // Execute - CefBrowserHostCppToC::Get(self)->SetPrintBackground(enable ? true : false); + int _retval = CefBrowserHostCppToC::Get(self)->InsertBackForwardEntry( + index, CefString(url)); + + // Return type: simple + return _retval; } int CEF_CALLBACK -browser_host_get_print_background(struct _cef_browser_host_t* self) { +browser_host_update_navigation_entry_url(struct _cef_browser_host_t* self, + int index, + const cef_string_t* url) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3109,17 +3124,22 @@ browser_host_get_print_background(struct _cef_browser_host_t* self) { if (!self) { return 0; } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return 0; + } // Execute - bool _retval = CefBrowserHostCppToC::Get(self)->GetPrintBackground(); + int _retval = CefBrowserHostCppToC::Get(self)->UpdateNavigationEntryUrl( + index, CefString(url)); - // Return type: bool + // Return type: simple return _retval; } -void CEF_CALLBACK browser_host_set_scrollable(struct _cef_browser_host_t* self, - int enable, - int scrollType) { +void CEF_CALLBACK +browser_host_clear_forward_list(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3130,11 +3150,12 @@ void CEF_CALLBACK browser_host_set_scrollable(struct _cef_browser_host_t* self, } // Execute - CefBrowserHostCppToC::Get(self)->SetScrollable(enable ? true : false, - scrollType); + CefBrowserHostCppToC::Get(self)->ClearForwardList(); } -void CEF_CALLBACK browser_host_start_camera(struct _cef_browser_host_t* self) { +void CEF_CALLBACK +browser_host_set_print_background(struct _cef_browser_host_t* self, + int enable) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3145,24 +3166,30 @@ void CEF_CALLBACK browser_host_start_camera(struct _cef_browser_host_t* self) { } // Execute - CefBrowserHostCppToC::Get(self)->StartCamera(); + CefBrowserHostCppToC::Get(self)->SetPrintBackground(enable ? true : false); } -void CEF_CALLBACK browser_host_stop_camera(struct _cef_browser_host_t* self) { +int CEF_CALLBACK +browser_host_get_print_background(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; } // Execute - CefBrowserHostCppToC::Get(self)->StopCamera(); + bool _retval = CefBrowserHostCppToC::Get(self)->GetPrintBackground(); + + // Return type: bool + return _retval; } -void CEF_CALLBACK browser_host_close_camera(struct _cef_browser_host_t* self) { +void CEF_CALLBACK browser_host_set_scrollable(struct _cef_browser_host_t* self, + int enable, + int scrollType) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3173,7 +3200,8 @@ void CEF_CALLBACK browser_host_close_camera(struct _cef_browser_host_t* self) { } // Execute - CefBrowserHostCppToC::Get(self)->CloseCamera(); + CefBrowserHostCppToC::Get(self)->SetScrollable(enable ? true : false, + scrollType); } cef_string_userfree_t CEF_CALLBACK @@ -3196,8 +3224,7 @@ browser_host_get_last_javascript_proxy_calling_frame_url( return _retval.DetachToUserFree(); } -void CEF_CALLBACK browser_host_set_nweb_id(struct _cef_browser_host_t* self, - int nWebId) { +void CEF_CALLBACK browser_host_start_camera(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3208,33 +3235,24 @@ void CEF_CALLBACK browser_host_set_nweb_id(struct _cef_browser_host_t* self, } // Execute - CefBrowserHostCppToC::Get(self)->SetNWebId(nWebId); + CefBrowserHostCppToC::Get(self)->StartCamera(); } -int CEF_CALLBACK -browser_host_get_pending_size_status(struct _cef_browser_host_t* self) { +void CEF_CALLBACK browser_host_stop_camera(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return 0; + return; } // Execute - bool _retval = CefBrowserHostCppToC::Get(self)->GetPendingSizeStatus(); - - // Return type: bool - return _retval; + CefBrowserHostCppToC::Get(self)->StopCamera(); } -void CEF_CALLBACK -browser_host_precompile_java_script(struct _cef_browser_host_t* self, - const char* url, - const char* script, - cef_cache_options_t* cacheOptions, - cef_precompile_callback_t* callback) { +void CEF_CALLBACK browser_host_close_camera(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3243,50 +3261,42 @@ browser_host_precompile_java_script(struct _cef_browser_host_t* self, if (!self) { return; } - // Verify param: url; type: std_string_byref_const - DCHECK(url); - if (!url) { - return; - } - // Verify param: script; type: std_string_byref_const - DCHECK(script); - if (!script) { - return; - } - // Verify param: cacheOptions; type: refptr_same - DCHECK(cacheOptions); - if (!cacheOptions) { - return; - } - // Verify param: callback; type: refptr_diff - DCHECK(callback); - if (!callback) { + + // Execute + CefBrowserHostCppToC::Get(self)->CloseCamera(); +} + +void CEF_CALLBACK browser_host_set_nweb_id(struct _cef_browser_host_t* self, + int nWebId) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { return; } // Execute - CefBrowserHostCppToC::Get(self)->PrecompileJavaScript( - url, script, CefCacheOptionsCppToC::Unwrap(cacheOptions), - CefPrecompileCallbackCToCpp::Wrap(callback)); + CefBrowserHostCppToC::Get(self)->SetNWebId(nWebId); } -void CEF_CALLBACK -browser_host_set_wake_lock_handler(struct _cef_browser_host_t* self, - int32_t windowId, - cef_set_lock_callback_t* callback) { +int CEF_CALLBACK +browser_host_get_pending_size_status(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return; + return 0; } - // Unverified params: callback // Execute - CefBrowserHostCppToC::Get(self)->SetWakeLockHandler( - windowId, CefSetLockCallbackCToCpp::Wrap(callback)); + bool _retval = CefBrowserHostCppToC::Get(self)->GetPendingSizeStatus(); + + // Return type: bool + return _retval; } struct _cef_download_item_t* CEF_CALLBACK @@ -3310,8 +3320,9 @@ browser_host_get_download_item(struct _cef_browser_host_t* self, } void CEF_CALLBACK -browser_host_notify_needs_reload(struct _cef_browser_host_t* self, - int needs_reload) { +browser_host_set_wake_lock_handler(struct _cef_browser_host_t* self, + int32_t windowId, + cef_set_lock_callback_t* callback) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3320,31 +3331,30 @@ browser_host_notify_needs_reload(struct _cef_browser_host_t* self, if (!self) { return; } + // Unverified params: callback // Execute - CefBrowserHostCppToC::Get(self)->NotifyNeedsReload(needs_reload ? true - : false); + CefBrowserHostCppToC::Get(self)->SetWakeLockHandler( + windowId, CefSetLockCallbackCToCpp::Wrap(callback)); } -int CEF_CALLBACK browser_host_needs_reload(struct _cef_browser_host_t* self) { +void CEF_CALLBACK +browser_host_set_needs_reload(struct _cef_browser_host_t* self, + int needs_reload) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); if (!self) { - return 0; + return; } // Execute - bool _retval = CefBrowserHostCppToC::Get(self)->NeedsReload(); - - // Return type: bool - return _retval; + CefBrowserHostCppToC::Get(self)->SetNeedsReload(needs_reload ? true : false); } -int CEF_CALLBACK -browser_host_terminate_render_process(struct _cef_browser_host_t* self) { +int CEF_CALLBACK browser_host_needs_reload(struct _cef_browser_host_t* self) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3355,19 +3365,18 @@ browser_host_terminate_render_process(struct _cef_browser_host_t* self) { } // Execute - bool _retval = CefBrowserHostCppToC::Get(self)->TerminateRenderProcess(); + bool _retval = CefBrowserHostCppToC::Get(self)->NeedsReload(); // Return type: bool return _retval; } void CEF_CALLBACK -browser_host_register_native_jsproxy(struct _cef_browser_host_t* self, - const cef_string_t* object_name, - cef_string_list_t method_list, - int32_t object_id, - int is_async, - const cef_string_t* permission) { +browser_host_precompile_java_script(struct _cef_browser_host_t* self, + const char* url, + const char* script, + cef_cache_options_t* cacheOptions, + cef_precompile_callback_t* callback) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3376,30 +3385,46 @@ browser_host_register_native_jsproxy(struct _cef_browser_host_t* self, if (!self) { return; } - // Verify param: object_name; type: string_byref_const - DCHECK(object_name); - if (!object_name) { + // Verify param: url; type: std_string_byref_const + DCHECK(url); + if (!url) { return; } - // Verify param: method_list; type: string_vec_byref_const - DCHECK(method_list); - if (!method_list) { + // Verify param: script; type: std_string_byref_const + DCHECK(script); + if (!script) { return; } - // Verify param: permission; type: string_byref_const - DCHECK(permission); - if (!permission) { + // Verify param: cacheOptions; type: refptr_same + DCHECK(cacheOptions); + if (!cacheOptions) { + return; + } + // Verify param: callback; type: refptr_diff + DCHECK(callback); + if (!callback) { return; } - // Translate param: method_list; type: string_vec_byref_const - std::vector method_listList; - transfer_string_list_contents(method_list, method_listList); + // Execute + CefBrowserHostCppToC::Get(self)->PrecompileJavaScript( + url, script, CefCacheOptionsCppToC::Unwrap(cacheOptions), + CefPrecompileCallbackCToCpp::Wrap(callback)); +} + +void CEF_CALLBACK +browser_host_update_draw_rect(struct _cef_browser_host_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } // Execute - CefBrowserHostCppToC::Get(self)->RegisterNativeJSProxy( - CefString(object_name), method_listList, object_id, - is_async ? true : false, CefString(permission)); + CefBrowserHostCppToC::Get(self)->UpdateDrawRect(); } void CEF_CALLBACK @@ -3443,8 +3468,31 @@ browser_host_set_fit_content_mode(struct _cef_browser_host_t* self, int mode) { CefBrowserHostCppToC::Get(self)->SetFitContentMode(mode); } +int CEF_CALLBACK +browser_host_terminate_render_process(struct _cef_browser_host_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return 0; + } + + // Execute + bool _retval = CefBrowserHostCppToC::Get(self)->TerminateRenderProcess(); + + // Return type: bool + return _retval; +} + void CEF_CALLBACK -browser_host_update_draw_rect(struct _cef_browser_host_t* self) { +browser_host_register_native_jsproxy(struct _cef_browser_host_t* self, + const cef_string_t* object_name, + cef_string_list_t method_list, + int32_t object_id, + int is_async, + const cef_string_t* permission) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3453,9 +3501,30 @@ browser_host_update_draw_rect(struct _cef_browser_host_t* self) { if (!self) { return; } + // Verify param: object_name; type: string_byref_const + DCHECK(object_name); + if (!object_name) { + return; + } + // Verify param: method_list; type: string_vec_byref_const + DCHECK(method_list); + if (!method_list) { + return; + } + // Verify param: permission; type: string_byref_const + DCHECK(permission); + if (!permission) { + return; + } + + // Translate param: method_list; type: string_vec_byref_const + std::vector method_listList; + transfer_string_list_contents(method_list, method_listList); // Execute - CefBrowserHostCppToC::Get(self)->UpdateDrawRect(); + CefBrowserHostCppToC::Get(self)->RegisterNativeJSProxy( + CefString(object_name), method_listList, object_id, + is_async ? true : false, CefString(permission)); } void CEF_CALLBACK @@ -3535,6 +3604,21 @@ browser_host_advance_focus_for_ime(struct _cef_browser_host_t* self, CefBrowserHostCppToC::Get(self)->AdvanceFocusForIME(focusType); } +void CEF_CALLBACK browser_host_on_destroy_image_analyzer_overlay( + struct _cef_browser_host_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + + // Execute + CefBrowserHostCppToC::Get(self)->OnDestroyImageAnalyzerOverlay(); +} + void CEF_CALLBACK browser_host_on_safe_insets_change(struct _cef_browser_host_t* self, int left, @@ -3594,6 +3678,55 @@ browser_host_set_grant_file_access_dirs(struct _cef_browser_host_t* self, CefBrowserHostCppToC::Get(self)->SetGrantFileAccessDirs(dir_listList); } +void CEF_CALLBACK +browser_host_web_extension_tab_updated(struct _cef_browser_host_t* self, + int tab_id, + cef_string_list_t changed_property_names, + const cef_string_t* url) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: changed_property_names; type: string_vec_byref_const + DCHECK(changed_property_names); + if (!changed_property_names) { + return; + } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return; + } + + // Translate param: changed_property_names; type: string_vec_byref_const + std::vector changed_property_namesList; + transfer_string_list_contents(changed_property_names, + changed_property_namesList); + + // Execute + CefBrowserHostCppToC::Get(self)->WebExtensionTabUpdated( + tab_id, changed_property_namesList, CefString(url)); +} + +void CEF_CALLBACK browser_host_scroll_focused_editable_node_into_view( + struct _cef_browser_host_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + + // Execute + CefBrowserHostCppToC::Get(self)->ScrollFocusedEditableNodeIntoView(); +} + void CEF_CALLBACK browser_host_set_autofill_callback(struct _cef_browser_host_t* self, cef_web_message_receiver_t* callback) { @@ -3638,21 +3771,6 @@ browser_host_fill_autofill_data(struct _cef_browser_host_t* self, CefValueCppToC::Unwrap(message)); } -void CEF_CALLBACK browser_host_scroll_focused_editable_node_into_view( - struct _cef_browser_host_t* self) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) { - return; - } - - // Execute - CefBrowserHostCppToC::Get(self)->ScrollFocusedEditableNodeIntoView(); -} - void CEF_CALLBACK browser_host_process_autofill_cancel(struct _cef_browser_host_t* self, const char* fillContent) { @@ -3869,46 +3987,55 @@ CefBrowserHostCppToC::CefBrowserHostCppToC() { GetStruct()->create_web_print_document_adapter = browser_host_create_web_print_document_adapter; GetStruct()->set_overscroll_mode = browser_host_set_overscroll_mode; + GetStruct()->set_browser_zoom_level = browser_host_set_browser_zoom_level; GetStruct()->discard = browser_host_discard; GetStruct()->restore = browser_host_restore; - GetStruct()->set_browser_zoom_level = browser_host_set_browser_zoom_level; GetStruct()->get_top_controls_offset = browser_host_get_top_controls_offset; GetStruct()->get_shrink_viewport_height = browser_host_get_shrink_viewport_height; + GetStruct()->insert_back_forward_entry = + browser_host_insert_back_forward_entry; + GetStruct()->update_navigation_entry_url = + browser_host_update_navigation_entry_url; + GetStruct()->clear_forward_list = browser_host_clear_forward_list; GetStruct()->set_print_background = browser_host_set_print_background; GetStruct()->get_print_background = browser_host_get_print_background; GetStruct()->set_scrollable = browser_host_set_scrollable; + GetStruct()->get_last_javascript_proxy_calling_frame_url = + browser_host_get_last_javascript_proxy_calling_frame_url; GetStruct()->start_camera = browser_host_start_camera; GetStruct()->stop_camera = browser_host_stop_camera; GetStruct()->close_camera = browser_host_close_camera; - GetStruct()->get_last_javascript_proxy_calling_frame_url = - browser_host_get_last_javascript_proxy_calling_frame_url; GetStruct()->set_nweb_id = browser_host_set_nweb_id; GetStruct()->get_pending_size_status = browser_host_get_pending_size_status; - GetStruct()->precompile_java_script = browser_host_precompile_java_script; - GetStruct()->set_wake_lock_handler = browser_host_set_wake_lock_handler; GetStruct()->get_download_item = browser_host_get_download_item; - GetStruct()->notify_needs_reload = browser_host_notify_needs_reload; + GetStruct()->set_wake_lock_handler = browser_host_set_wake_lock_handler; + GetStruct()->set_needs_reload = browser_host_set_needs_reload; GetStruct()->needs_reload = browser_host_needs_reload; - GetStruct()->terminate_render_process = browser_host_terminate_render_process; - GetStruct()->register_native_jsproxy = browser_host_register_native_jsproxy; + GetStruct()->precompile_java_script = browser_host_precompile_java_script; + GetStruct()->update_draw_rect = browser_host_update_draw_rect; GetStruct()->send_touchpad_fling_event = browser_host_send_touchpad_fling_event; GetStruct()->set_fit_content_mode = browser_host_set_fit_content_mode; - GetStruct()->update_draw_rect = browser_host_update_draw_rect; + GetStruct()->terminate_render_process = browser_host_terminate_render_process; + GetStruct()->register_native_jsproxy = browser_host_register_native_jsproxy; GetStruct()->on_text_selected = browser_host_on_text_selected; GetStruct()->get_page_scale_factor = browser_host_get_page_scale_factor; GetStruct()->web_page_snapshot = browser_host_web_page_snapshot; GetStruct()->advance_focus_for_ime = browser_host_advance_focus_for_ime; + GetStruct()->on_destroy_image_analyzer_overlay = + browser_host_on_destroy_image_analyzer_overlay; GetStruct()->on_safe_insets_change = browser_host_on_safe_insets_change; GetStruct()->notify_for_next_touch_event = browser_host_notify_for_next_touch_event; GetStruct()->set_grant_file_access_dirs = browser_host_set_grant_file_access_dirs; - GetStruct()->set_autofill_callback = browser_host_set_autofill_callback; - GetStruct()->fill_autofill_data = browser_host_fill_autofill_data; + GetStruct()->web_extension_tab_updated = + browser_host_web_extension_tab_updated; GetStruct()->scroll_focused_editable_node_into_view = browser_host_scroll_focused_editable_node_into_view; + GetStruct()->set_autofill_callback = browser_host_set_autofill_callback; + GetStruct()->fill_autofill_data = browser_host_fill_autofill_data; GetStruct()->process_autofill_cancel = browser_host_process_autofill_cancel; GetStruct()->auto_fill_with_imfevent = browser_host_auto_fill_with_imfevent; } diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.h b/libcef_dll/cpptoc/browser_host_cpptoc.h index fa87feabdd5d8b9f0cd7dc93327f307883d6ebf7..343ba2f4b08f073049aa5d87d818e032060d8297 100644 --- a/libcef_dll/cpptoc/browser_host_cpptoc.h +++ b/libcef_dll/cpptoc/browser_host_cpptoc.h @@ -28,12 +28,12 @@ // Wrap a C++ class with a C structure. // This class may be instantiated and accessed DLL-side only. -class CefBrowserHostCppToC - : public CefCppToCRefCounted { -public: +class CefBrowserHostCppToC : public CefCppToCRefCounted { + public: CefBrowserHostCppToC(); virtual ~CefBrowserHostCppToC(); }; -#endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_HOST_CPPTOC_H_ +#endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_HOST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.cc b/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.cc index a778286b072fc62aa27d92d859b18ac17403cf02..8cde08f9fa796a109316440f5b534114b6e27d08 100644 --- a/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2482785cf70906646697caf085a3d8cd434042ce$ +// $hash=f912dd3fd7e5d22d1e418da5159aae541a147d7d$ // #include "libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.h" @@ -279,6 +279,147 @@ browser_permission_request_delegate_notify_geolocation_permission( ->NotifyGeolocationPermission(value ? true : false, CefString(origin)); } +void CEF_CALLBACK +browser_permission_request_delegate_ask_audio_capture_permission( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin, + cef_permission_callback_t callback) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: origin; type: string_byref_const + DCHECK(origin); + if (!origin) { + return; + } + + // Execute + CefBrowserPermissionRequestDelegateCppToC::Get(self) + ->AskAudioCapturePermission(CefString(origin), callback); +} + +void CEF_CALLBACK +browser_permission_request_delegate_abort_ask_audio_capture_permission( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: origin; type: string_byref_const + DCHECK(origin); + if (!origin) { + return; + } + + // Execute + CefBrowserPermissionRequestDelegateCppToC::Get(self) + ->AbortAskAudioCapturePermission(CefString(origin)); +} + +void CEF_CALLBACK +browser_permission_request_delegate_ask_video_capture_permission( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin, + cef_permission_callback_t callback) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: origin; type: string_byref_const + DCHECK(origin); + if (!origin) { + return; + } + + // Execute + CefBrowserPermissionRequestDelegateCppToC::Get(self) + ->AskVideoCapturePermission(CefString(origin), callback); +} + +void CEF_CALLBACK +browser_permission_request_delegate_abort_ask_video_capture_permission( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: origin; type: string_byref_const + DCHECK(origin); + if (!origin) { + return; + } + + // Execute + CefBrowserPermissionRequestDelegateCppToC::Get(self) + ->AbortAskVideoCapturePermission(CefString(origin)); +} + +void CEF_CALLBACK +browser_permission_request_delegate_ask_clipboard_sanitized_write_permission( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin, + cef_permission_callback_t callback) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: origin; type: string_byref_const + DCHECK(origin); + if (!origin) { + return; + } + + // Execute + CefBrowserPermissionRequestDelegateCppToC::Get(self) + ->AskClipboardSanitizedWritePermission(CefString(origin), callback); +} + +void CEF_CALLBACK +browser_permission_request_delegate_abort_ask_clipboard_sanitized_write_permission( + struct _cef_browser_permission_request_delegate_t* self, + const cef_string_t* origin) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: origin; type: string_byref_const + DCHECK(origin); + if (!origin) { + return; + } + + // Execute + CefBrowserPermissionRequestDelegateCppToC::Get(self) + ->AbortAskClipboardSanitizedWritePermission(CefString(origin)); +} + } // namespace // CONSTRUCTOR - Do not edit by hand. @@ -303,6 +444,18 @@ CefBrowserPermissionRequestDelegateCppToC:: browser_permission_request_delegate_abort_ask_clipboard_read_write_permission; GetStruct()->notify_geolocation_permission = browser_permission_request_delegate_notify_geolocation_permission; + GetStruct()->ask_audio_capture_permission = + browser_permission_request_delegate_ask_audio_capture_permission; + GetStruct()->abort_ask_audio_capture_permission = + browser_permission_request_delegate_abort_ask_audio_capture_permission; + GetStruct()->ask_video_capture_permission = + browser_permission_request_delegate_ask_video_capture_permission; + GetStruct()->abort_ask_video_capture_permission = + browser_permission_request_delegate_abort_ask_video_capture_permission; + GetStruct()->ask_clipboard_sanitized_write_permission = + browser_permission_request_delegate_ask_clipboard_sanitized_write_permission; + GetStruct()->abort_ask_clipboard_sanitized_write_permission = + browser_permission_request_delegate_abort_ask_clipboard_sanitized_write_permission; #if defined(OHOS_SENSOR) GetStruct()->ask_sensors_permission = browser_permission_request_delegate_ask_sensors_permission; diff --git a/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.h b/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.h index ec30e4cfb4318fd10e8f17ed97f455a336803e93..e7e22ba877c4963929193bb4efa0f511c54372d4 100644 --- a/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/browser_permission_request_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0ab301d27e547e1fdd9531b202f310866da84c97$ +// $hash=add424cc39b4f5c546f8333e3c25dc8090880a81$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_BROWSER_PERMISSION_REQUEST_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc b/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc index ac9d8b6340ef91d7b0bccc047eb7ac01be4f6272..3c7c0103507ddb633e3f873d58426d13c15cbb6a 100644 --- a/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_process_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=916c3112975ba2b6cb4ea27248c7822a2fe754ab$ +// $hash=220f18ed407d6cef544e1df6d55015d67143c43f$ // #include "libcef_dll/cpptoc/browser_process_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.h b/libcef_dll/cpptoc/browser_process_handler_cpptoc.h index c6b8d6e6266e9f7eddd5c78f66f64ac82cede410..19b902d512c286ffb3f071179233227ae90ca648 100644 --- a/libcef_dll/cpptoc/browser_process_handler_cpptoc.h +++ b/libcef_dll/cpptoc/browser_process_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e49e094aa0de70a8f685b5e3fc3955396b4e8ccf$ +// $hash=508373dbbfcb411f218ad9688d56b49380d8ca75$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_BROWSER_PROCESS_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/callback_cpptoc.cc b/libcef_dll/cpptoc/callback_cpptoc.cc index 551671265230a87051f569a029990b87016b5d88..daee6ee6cbd42c5abb24d30d1241bcc2a264832d 100644 --- a/libcef_dll/cpptoc/callback_cpptoc.cc +++ b/libcef_dll/cpptoc/callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cc374416cdd6e22f7713eaf4e973b918e428a44e$ +// $hash=9040a3e4e5208ec11e2b29195a0bfa1c3f5ecffa$ // #include "libcef_dll/cpptoc/callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/callback_cpptoc.h b/libcef_dll/cpptoc/callback_cpptoc.h index 1c09fe3ee2f90218ce936d132af2502be73e7f8b..611c202b5be0f5a292833411e4c088882026f379 100644 --- a/libcef_dll/cpptoc/callback_cpptoc.h +++ b/libcef_dll/cpptoc/callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=edb199ed0a0d6dd8776d342e9658e25958090bec$ +// $hash=f0c92901c6462ad03d3c95c0ba92129784c808e1$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/client_cpptoc.cc b/libcef_dll/cpptoc/client_cpptoc.cc index b61a89605b2c87a177ee90e161ab4f6e3512067c..62b9b0a30ff659a6554370ac1c67929f28590d5a 100644 --- a/libcef_dll/cpptoc/client_cpptoc.cc +++ b/libcef_dll/cpptoc/client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=387232500439f3d5a35aee79b2aa2c456c457035$ +// $hash=b8345073459cc202d98bf18e2e59067b8df79c69$ // #include "libcef_dll/cpptoc/client_cpptoc.h" diff --git a/libcef_dll/cpptoc/client_cpptoc.h b/libcef_dll/cpptoc/client_cpptoc.h index 081a44783978c1777e7281146d67c88773797915..3898b87ee470e7b46e3f05a5cda7941dd48a58b6 100644 --- a/libcef_dll/cpptoc/client_cpptoc.h +++ b/libcef_dll/cpptoc/client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5760912f3c203c686bbb13176cd3dadf21c2c5bf$ +// $hash=6dd8a3977d8a7d75da7399a9c15a160afbfcf744$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/command_handler_cpptoc.cc b/libcef_dll/cpptoc/command_handler_cpptoc.cc index 581774e230e22d7a26eb10c82a2ca67abbe8986d..6d9eb8dbf75e0dea4f33f9b81794839078b2ce06 100644 --- a/libcef_dll/cpptoc/command_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/command_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f18efb5dc36f4cb87068f42e73370a57fc00d3c2$ +// $hash=04f92bf7dfa4cfeec409e2418f69e63beff276ff$ // #include "libcef_dll/cpptoc/command_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/command_handler_cpptoc.h b/libcef_dll/cpptoc/command_handler_cpptoc.h index 1472375382e506586ffab3b208aa0cb383c416c1..3c1a73e074e93a7cb63ecd7e3589a2b12938c776 100644 --- a/libcef_dll/cpptoc/command_handler_cpptoc.h +++ b/libcef_dll/cpptoc/command_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a08ddd5741375a18d7aad32e6da6fae896bc9121$ +// $hash=beb365f3b4d93d967612c9d8505240d7b727fd08$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_COMMAND_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/command_line_cpptoc.cc b/libcef_dll/cpptoc/command_line_cpptoc.cc index effaf891e1e1a30090d0aa04c7e7678a10b0c540..cfcfe16ec10bd719129c9ea3c3746231dacf6f87 100644 --- a/libcef_dll/cpptoc/command_line_cpptoc.cc +++ b/libcef_dll/cpptoc/command_line_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5dc6935e9901872a9accf61ca8c9c6006c3302a9$ +// $hash=0feacec72c147c19404395cb872cf47f02a4d092$ // #include "libcef_dll/cpptoc/command_line_cpptoc.h" diff --git a/libcef_dll/cpptoc/command_line_cpptoc.h b/libcef_dll/cpptoc/command_line_cpptoc.h index 08e3ed1d7e778aea75e3dbd3ae631f7d61afdf07..45eb004c92d232ccc8e357de506b0101c8802425 100644 --- a/libcef_dll/cpptoc/command_line_cpptoc.h +++ b/libcef_dll/cpptoc/command_line_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e81fded40d316f81fae6158d04a9d11dd461be83$ +// $hash=f8af58d9e62d25a46593ccebc487734730f6a1a3$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_COMMAND_LINE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/completion_callback_cpptoc.cc b/libcef_dll/cpptoc/completion_callback_cpptoc.cc index 4384fb6227ef11bcfcae4eef669325fba4ca39cd..2e514452448b40cc8151614c5e9a3f09e0a88434 100644 --- a/libcef_dll/cpptoc/completion_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/completion_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0b1eec74eb4e40370f04f75a2fb7ef67e288c9a4$ +// $hash=d1faca27c390ce09058aebddcf7e0a55bdbea45c$ // #include "libcef_dll/cpptoc/completion_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/completion_callback_cpptoc.h b/libcef_dll/cpptoc/completion_callback_cpptoc.h index 3ac4b2a79a927f2a316566a389ae78afa5194140..f57a9e4fae4f1f0b940566d0de8c0aa9e0051d5c 100644 --- a/libcef_dll/cpptoc/completion_callback_cpptoc.h +++ b/libcef_dll/cpptoc/completion_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5088996d4826f6e907e90515b854bf1725a24614$ +// $hash=407df18b90244b245e73c4f69a199663df079f0d$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_COMPLETION_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc b/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc index fcf14d5e640aeffe161856062ddc24912d1fb27b..61e5809cfb75850e678476685c6eb59b56328da0 100644 --- a/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/context_menu_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=99e06c226ae9d3f395e491860ccc367f9f0f6d84$ +// $hash=8e7f27a697ae559208a79edbf59c3786c9fb0ff0$ // #include "libcef_dll/cpptoc/context_menu_handler_cpptoc.h" @@ -365,7 +365,8 @@ void CEF_CALLBACK context_menu_handler_on_quick_menu_dismissed( void CEF_CALLBACK context_menu_handler_on_get_image_for_context_node( struct _cef_context_menu_handler_t* self, cef_browser_t* browser, - struct _cef_image_t* image) { + struct _cef_image_t* image, + int command_id) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -387,12 +388,13 @@ void CEF_CALLBACK context_menu_handler_on_get_image_for_context_node( // Execute CefContextMenuHandlerCppToC::Get(self)->OnGetImageForContextNode( - CefBrowserCToCpp::Wrap(browser), CefImageCToCpp::Wrap(image)); + CefBrowserCToCpp::Wrap(browser), CefImageCToCpp::Wrap(image), command_id); } void CEF_CALLBACK context_menu_handler_on_get_image_from_cache( struct _cef_context_menu_handler_t* self, - struct _cef_image_t* image) { + struct _cef_image_t* image, + int command_id) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -409,7 +411,7 @@ void CEF_CALLBACK context_menu_handler_on_get_image_from_cache( // Execute CefContextMenuHandlerCppToC::Get(self)->OnGetImageFromCache( - CefImageCToCpp::Wrap(image)); + CefImageCToCpp::Wrap(image), command_id); } void CEF_CALLBACK context_menu_handler_hide_handle_and_quick_menu_if_necessary( @@ -429,6 +431,21 @@ void CEF_CALLBACK context_menu_handler_hide_handle_and_quick_menu_if_necessary( hide ? true : false); } +void CEF_CALLBACK context_menu_handler_change_visibility_of_quick_menu( + struct _cef_context_menu_handler_t* self) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + + // Execute + CefContextMenuHandlerCppToC::Get(self)->ChangeVisibilityOfQuickMenu(); +} + } // namespace // CONSTRUCTOR - Do not edit by hand. @@ -454,6 +471,8 @@ CefContextMenuHandlerCppToC::CefContextMenuHandlerCppToC() { context_menu_handler_on_get_image_from_cache; GetStruct()->hide_handle_and_quick_menu_if_necessary = context_menu_handler_hide_handle_and_quick_menu_if_necessary; + GetStruct()->change_visibility_of_quick_menu = + context_menu_handler_change_visibility_of_quick_menu; } // DESTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc b/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc index 8044305afeb8a48fbd39968cfcf62c1431a013f9..6ae17f123a4978fcb7ce0d65142db026422c1413 100644 --- a/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_access_filter_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e78a8da0160d6167a98c97463ebc1cb171c94a06$ +// $hash=d7bbbf41f806f415ac983a9a9f9475ab7783cb10$ // #include "libcef_dll/cpptoc/cookie_access_filter_cpptoc.h" diff --git a/libcef_dll/cpptoc/cookie_access_filter_cpptoc.h b/libcef_dll/cpptoc/cookie_access_filter_cpptoc.h index b4cd61d5523010b0466d3b4a3c729b76e20a58bd..d3e150457aaba9547fd16aba27ef227bcb43df5d 100644 --- a/libcef_dll/cpptoc/cookie_access_filter_cpptoc.h +++ b/libcef_dll/cpptoc/cookie_access_filter_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c9db573e2bf3ef3523d2127c32e260bd61aa4e82$ +// $hash=e0b8da1120abbbb306c6cc789ec94e38dc07ceb0$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_COOKIE_ACCESS_FILTER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc b/libcef_dll/cpptoc/cookie_manager_cpptoc.cc index 29b6000bf52813a5ef04e8ee1a1844ab9ba81523..8227f7b7c896af26b6c003a99b7c8ce92e151ee4 100644 --- a/libcef_dll/cpptoc/cookie_manager_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_manager_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4b0eca82f55ca385ac508407f7a23a509162fa5e$ +// $hash=aa8de45e7447269d9601f7924ca48621913fa316$ // #include "libcef_dll/cpptoc/cookie_manager_cpptoc.h" @@ -129,7 +129,8 @@ cookie_manager_visit_url_cookies(struct _cef_cookie_manager_t* self, const cef_string_t* url, int includeHttpOnly, struct _cef_cookie_visitor_t* visitor, - int is_sync) { + int is_sync, + int is_from_ndk) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -150,7 +151,8 @@ cookie_manager_visit_url_cookies(struct _cef_cookie_manager_t* self, // Execute bool _retval = CefCookieManagerCppToC::Get(self)->VisitUrlCookies( CefString(url), includeHttpOnly ? true : false, - CefCookieVisitorCToCpp::Wrap(visitor), is_sync ? true : false); + CefCookieVisitorCToCpp::Wrap(visitor), is_sync ? true : false, + is_from_ndk ? true : false); // Return type: bool return _retval; @@ -162,7 +164,8 @@ cookie_manager_set_cookie(struct _cef_cookie_manager_t* self, const struct _cef_cookie_t* cookie, struct _cef_set_cookie_callback_t* callback, int is_sync, - const cef_string_t* str_cookie) { + const cef_string_t* str_cookie, + int includeHttpOnly) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -199,7 +202,8 @@ cookie_manager_set_cookie(struct _cef_cookie_manager_t* self, // Execute bool _retval = CefCookieManagerCppToC::Get(self)->SetCookie( CefString(url), cookieObj, CefSetCookieCallbackCToCpp::Wrap(callback), - is_sync ? true : false, CefString(str_cookie)); + is_sync ? true : false, CefString(str_cookie), + includeHttpOnly ? true : false); // Return type: bool return _retval; diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.h b/libcef_dll/cpptoc/cookie_manager_cpptoc.h index e7e1f787c63a022e23f8487059eabd8f871ee160..9f4094feb84975e26215ec42dc330b747cf28b53 100644 --- a/libcef_dll/cpptoc/cookie_manager_cpptoc.h +++ b/libcef_dll/cpptoc/cookie_manager_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=512fc1313311906bac16d24754a46d85fd029939$ +// $hash=3c70ed00438c00d85c27407d1c0947d2b310f401$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_COOKIE_MANAGER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc b/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc index fee7ea6191ba9eb940dff4cd0bcbc3612cdb3172..bba7771e9864565fc02293c2f187d566d5148a7d 100644 --- a/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/cookie_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3671372229cfe2eb303e4dd4938923248472df67$ +// $hash=e5257c40eb42cef92603c1500fb87656d409e480$ // #include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h" diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.h b/libcef_dll/cpptoc/cookie_visitor_cpptoc.h index ac9ac121808dac42c6b8531c736a3444b804074b..f0dd94f0541eba643a4ee0f9adc036a91fd0f179 100644 --- a/libcef_dll/cpptoc/cookie_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/cookie_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1b36e4d8ae64af865423ab907e36a0cf29200bd8$ +// $hash=45985eb9f0544a0c90fea396ec66c921e44f55a5$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/data_base_cpptoc.cc b/libcef_dll/cpptoc/data_base_cpptoc.cc index c9c875386aad4b0ac9d1393b85730fae88e50b25..923fb6296d6849a30022d5028d4c3062e4643540 100644 --- a/libcef_dll/cpptoc/data_base_cpptoc.cc +++ b/libcef_dll/cpptoc/data_base_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f89ceeaed56d314fa2e07fe10b15ba69741f542b$ +// $hash=b1b5b07c75ae0bdb48510c5a7bcc5aa0e31e7991$ // #include "libcef_dll/cpptoc/data_base_cpptoc.h" diff --git a/libcef_dll/cpptoc/data_base_cpptoc.h b/libcef_dll/cpptoc/data_base_cpptoc.h index 0f1012acf34ce1027bd0d6b9c3ba75375a802282..5c3dfb18857bf02d62d8c25cad82d1a6db8a22b0 100644 --- a/libcef_dll/cpptoc/data_base_cpptoc.h +++ b/libcef_dll/cpptoc/data_base_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d30c37284238adb1d8677dbe3dd62db8fc9b9cd7$ +// $hash=bcd06269b419de539f58d0d17f5e568d370641ac$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DATA_BASE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.cc b/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.cc index 5e89bc76cbb24831f1626e2b25ce89fe29720ef2..6cba313e837aa04dab3535a369c08df7a4acc270 100644 --- a/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b68c98cb1b3782a2acb4bb1883e616f023e4a59f$ +// $hash=dedd8595fcd85cd64e35ff00bd028976ca083375$ // #include "libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.h b/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.h index 536ab7d55e463bec6282bae4f76e1fe84b854ea6..d551713feb3c8ea88d65d1a8fb4d828c941185d3 100644 --- a/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.h +++ b/libcef_dll/cpptoc/date_time_chooser_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=95e34c34f0791e850126f2632cdf45ddc83ea022$ +// $hash=91dc5eab01d425309fad9092ce43d372113a834e$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DATE_TIME_CHOOSER_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc index 9c8b33acf487067f20b76cb62b3445e9fd497e6f..fe37e020d87362b2ee2d1eacd3c788ed330cd06b 100644 --- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f2245c2b49be3224592b77ad22c66ac95181332a$ +// $hash=72ebc189ce2a4bcfc796b818409d3b742651fda9$ // #include "libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h index 7a50a0cd14761b6fef31d4ac84342b9b3089d7ec..bc1ebd9531521b1db8be0f933dba793596c4669c 100644 --- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h +++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cde461484eb69bfd0cd2245c2fcc3fb295d602ac$ +// $hash=9ef76b4e16c9ee12b2c5956a3e4789fe2e40d9f0$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DELETE_COOKIES_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc b/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc index 810ccd8b03a6b429568e01b65cc7680a226ec183..2fe36d1ff5e1b734987a86385b06c9f3645f066d 100644 --- a/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc +++ b/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=28fb82efb43251449255e957b818bad7fe520728$ +// $hash=d32b3a49e312971ee0c825fe765c584c033d65e9$ // #include "libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h" diff --git a/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h b/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h index 61e916e634815d2a154f9019355f6dd22a7ede02..6ab9e5c987ad9336c4cc2a2c04cd49e6254680c7 100644 --- a/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h +++ b/libcef_dll/cpptoc/dev_tools_message_observer_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c6c991988013c8b1264c40695a67f91eddae8978$ +// $hash=4f034b01b5709e8012ff089e000216008f6232b6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DEV_TOOLS_MESSAGE_OBSERVER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc index 3d4db5eaabc10af93147dbd5de4993920e0638cf..3beafbc4e1e03f9596a57b1d98c77717cc53bc6a 100644 --- a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2f0e356eb55325a2f897bd2909f87db4537d8673$ +// $hash=3e07641018d19285512c4fdfa92c5a1e84f0d8f2$ // #include "libcef_dll/cpptoc/dialog_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc b/libcef_dll/cpptoc/dictionary_value_cpptoc.cc index 71d9c278986235b8a4fe1c9eca8c26e860caedec..5a81ce008e98a1142e41ac45b1a53d62e09ce432 100644 --- a/libcef_dll/cpptoc/dictionary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/dictionary_value_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1258f3661dc3092f1b3d050e69cb2c97f6a12b85$ +// $hash=ed7d4723843c212ea634d3d9fe3121591de1c71d$ // #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h" diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.h b/libcef_dll/cpptoc/dictionary_value_cpptoc.h index 3bececbaecbd049d8b04a5dca844dcc1aad617af..038b5738ddb84ead792ad7977446b7118574a41a 100644 --- a/libcef_dll/cpptoc/dictionary_value_cpptoc.h +++ b/libcef_dll/cpptoc/dictionary_value_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=21b84eabe9724ce9a5a88b8bef7044b83254baa9$ +// $hash=dd73e5b97103c4ad27620af89886e49bfbdc8d21$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DICTIONARY_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.cc b/libcef_dll/cpptoc/display_handler_cpptoc.cc index bb32c7801e0b067445c09456b4fa774a559932f2..82cc57ebd227218d425a71a8bebc7b2356c3051f 100644 --- a/libcef_dll/cpptoc/display_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/display_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.h b/libcef_dll/cpptoc/display_handler_cpptoc.h index c45eed91d659291446a8a78a3c0920a8c6addf4a..ccc1e439a3c05ee22d2646f70ed1815b05459965 100644 --- a/libcef_dll/cpptoc/display_handler_cpptoc.h +++ b/libcef_dll/cpptoc/display_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7898edd74cb7e651635f1d21c23691c51f487be1$ +// $hash=8ba6fb9ce96e92ba80a05258060e530ddf822264$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.cc b/libcef_dll/cpptoc/domdocument_cpptoc.cc index 5c5b986dced5444b29453261a233e541b9f8e9df..254893d27a798a083f1da464e38defd4011a5b93 100644 --- a/libcef_dll/cpptoc/domdocument_cpptoc.cc +++ b/libcef_dll/cpptoc/domdocument_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=386898a039618f08058606af686341850b6e7bd0$ +// $hash=c2dd1bf044dc413a46e8482869711ed60f7129c7$ // #include "libcef_dll/cpptoc/domdocument_cpptoc.h" diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.h b/libcef_dll/cpptoc/domdocument_cpptoc.h index fc72c5f8d8c74936e66567525876d088d606bb77..bdf946cb6aabdb89b812d9e22be61e8ede540172 100644 --- a/libcef_dll/cpptoc/domdocument_cpptoc.h +++ b/libcef_dll/cpptoc/domdocument_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fffbd23b71b8c0d8cc38a6968cb5833ac26d4499$ +// $hash=6a5b9bb0155acb8c5e6f796e68463825e00a8e53$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOMDOCUMENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/domnode_cpptoc.cc b/libcef_dll/cpptoc/domnode_cpptoc.cc index 7360346e71faa1ad9a4e9e91464fb6e16ac04172..b391a92e7dfb721985be5c992c689fd5f4d52c84 100644 --- a/libcef_dll/cpptoc/domnode_cpptoc.cc +++ b/libcef_dll/cpptoc/domnode_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=914f2f992822d4abfee573ca8a88d99d76b04610$ +// $hash=a9a7b8c8b2cb46d6bd2bb9a8883909ebbde803d7$ // #include "libcef_dll/cpptoc/domnode_cpptoc.h" diff --git a/libcef_dll/cpptoc/domnode_cpptoc.h b/libcef_dll/cpptoc/domnode_cpptoc.h index c8178e5083db1d8b6d59ab948f69fe20a25d61ee..c11783f8f7cb89a002de73881514c4904d1ec7da 100644 --- a/libcef_dll/cpptoc/domnode_cpptoc.h +++ b/libcef_dll/cpptoc/domnode_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b35d85f2b8bbab6bf6f99401444335c6a427fda0$ +// $hash=18f223a2671334b8bd8d463a94b5a3c0191141e8$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOMNODE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.cc b/libcef_dll/cpptoc/domvisitor_cpptoc.cc index 4fb47899144ba619337e57e8aa6a9e1affa83e0c..dcb36eb210aab4c2a0c8437d6076d25ccdf53e1b 100644 --- a/libcef_dll/cpptoc/domvisitor_cpptoc.cc +++ b/libcef_dll/cpptoc/domvisitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d9d0689947b6b9b85f65188ffeff60212563a2da$ +// $hash=fccbe16b1237f36acf744609774b304eb6de8b98$ // #include "libcef_dll/cpptoc/domvisitor_cpptoc.h" diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.h b/libcef_dll/cpptoc/domvisitor_cpptoc.h index 995da3efd48c63e4f45a19af4d92d2bc908f5e95..3cd81a5e27ee65d54a748aa30d523712d7a1a7db 100644 --- a/libcef_dll/cpptoc/domvisitor_cpptoc.h +++ b/libcef_dll/cpptoc/domvisitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=557ec8ba69f8f58e0eb87bffe750a27444439520$ +// $hash=2a64ff6edd81d5158997158c91e75b85dbd8da39$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.cc b/libcef_dll/cpptoc/download_handler_cpptoc.cc index 2678b7ce37195384133aff28d042a58934de6e20..94edd4ce1bac45882a44dc416d4b4064854979ee 100644 --- a/libcef_dll/cpptoc/download_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/download_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c70a949d129e47d660f9fd4200db05e2f5721bed$ +// $hash=d388bfeaf7f74152201d083d9142659d0a799391$ // #include "libcef_dll/cpptoc/download_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.h b/libcef_dll/cpptoc/download_handler_cpptoc.h index 60efae50286c2595bffeaba557b08c93baeb1712..1c1c6ddb9d6e85d9350f4a3c00b63415ee2adba0 100644 --- a/libcef_dll/cpptoc/download_handler_cpptoc.h +++ b/libcef_dll/cpptoc/download_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=609d9d0d61198eca50e23703f17366dc1aded94d$ +// $hash=1b301493e2f905a2761858e2d6623765a540f918$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_image_callback_cpptoc.cc b/libcef_dll/cpptoc/download_image_callback_cpptoc.cc index 58057268dc400dda854fdb53a4eba975e6e4b947..8d2bf5fc394f6cb13d47ab2dea8164a18af08785 100644 --- a/libcef_dll/cpptoc/download_image_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/download_image_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2fc7e28909287ddaf20efa9f3ded39c65d3ff8be$ +// $hash=87ae44d30e4e9b8b28d58910b995212063380ef3$ // #include "libcef_dll/cpptoc/download_image_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/download_image_callback_cpptoc.h b/libcef_dll/cpptoc/download_image_callback_cpptoc.h index c50f8001d9cb5746787aa2f17936efdaf7215458..8e517c7cfaf230717554125cf19af469938cc8f0 100644 --- a/libcef_dll/cpptoc/download_image_callback_cpptoc.h +++ b/libcef_dll/cpptoc/download_image_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=657af36d921feba0bab26102ebc1c976e47918ae$ +// $hash=9a9250d7e4f3d2018c4b441e6616930627625b59$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_IMAGE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc b/libcef_dll/cpptoc/download_item_callback_cpptoc.cc index 3bdd12735b94bbaae3a4c980995371311fd6d448..914b54759db45efa86c9ce1e53bb00b154e3beac 100644 --- a/libcef_dll/cpptoc/download_item_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/download_item_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0c1f3063958f60318fcae0c6b76b5da4fa207ccd$ +// $hash=222759f34997871512b5f89edc78d1b3a0b0cc69$ // #include "libcef_dll/cpptoc/download_item_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.h b/libcef_dll/cpptoc/download_item_callback_cpptoc.h index c1bdbfd1e00f81d476a9fee842fef769fac711db..858baa2fc70f2fcbb992dd7cea69b12d925a4096 100644 --- a/libcef_dll/cpptoc/download_item_callback_cpptoc.h +++ b/libcef_dll/cpptoc/download_item_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9292fa12ac1e2ae08a13e93f83eb8c15f3e9b49a$ +// $hash=1c85860b0d21f2efc1610ed47af70ed570f63926$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_item_cpptoc.cc b/libcef_dll/cpptoc/download_item_cpptoc.cc index 1c910c0b9458df283e61cc5d75524d17e60571cb..a401358374b70f7294112b6c07d772c6a03ed6c9 100644 --- a/libcef_dll/cpptoc/download_item_cpptoc.cc +++ b/libcef_dll/cpptoc/download_item_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d901d43eb44685070a2eb1826137a4d714717940$ +// $hash=8ee1cd1c85cd52069e8344d6f2d28ef4eb0b745c$ // #include "libcef_dll/cpptoc/download_item_cpptoc.h" diff --git a/libcef_dll/cpptoc/download_item_cpptoc.h b/libcef_dll/cpptoc/download_item_cpptoc.h index 891ca0080aed4ed4e33014bf5fa4b207cc7e01b3..dcf26cfd753894a655f3ee8eee4c415783f90a5f 100644 --- a/libcef_dll/cpptoc/download_item_cpptoc.h +++ b/libcef_dll/cpptoc/download_item_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec7ea413a9954d71a6bff0e6251022b8ee75827d$ +// $hash=3817a67cd4da8a318fe118f775a86a3daa22af67$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/drag_data_cpptoc.cc b/libcef_dll/cpptoc/drag_data_cpptoc.cc index 8a25edbb2d7823776553c7ed73e8d02e80207e9e..b732aadda9ab2c309d9c1f73e0a93e3f9570a86b 100644 --- a/libcef_dll/cpptoc/drag_data_cpptoc.cc +++ b/libcef_dll/cpptoc/drag_data_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f9afafb1c8ad66f8dd147270248de4fbcd1fe8c3$ +// $hash=eba11ae8a57573cbbf89d2a15e63279c559aaa52$ // #include "libcef_dll/cpptoc/drag_data_cpptoc.h" diff --git a/libcef_dll/cpptoc/drag_data_cpptoc.h b/libcef_dll/cpptoc/drag_data_cpptoc.h index 4d09874ea3df0f5e65d51c39a611b18c7fe52071..1628e094b1bad17675b9cb25669a8e3a4129277f 100644 --- a/libcef_dll/cpptoc/drag_data_cpptoc.h +++ b/libcef_dll/cpptoc/drag_data_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=36bd6eba9e2d98b2274881e26158f7f9005822ce$ +// $hash=4ce3b8cfc691f8cb7aa224a00d7835283c5039ab$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DRAG_DATA_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/drag_handler_cpptoc.cc b/libcef_dll/cpptoc/drag_handler_cpptoc.cc index 2b84d5bd5339a051c5371a031a2d58e798bd6b94..e7ad52577f8e4c2bf7fd83426807c55363392b26 100644 --- a/libcef_dll/cpptoc/drag_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/drag_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=489fa0cfe92ff9ca22430794766344151175e27b$ +// $hash=eddbb7f93fd3ffa2548b4286ab8cc854366ffc94$ // #include "libcef_dll/cpptoc/drag_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/drag_handler_cpptoc.h b/libcef_dll/cpptoc/drag_handler_cpptoc.h index d18aec58d359424927f8e6650c375f7f4b0ccda8..e8f136b923d6aedd615d04a80c18c82584774485 100644 --- a/libcef_dll/cpptoc/drag_handler_cpptoc.h +++ b/libcef_dll/cpptoc/drag_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bb6095fad28dc2e34c83bf07947c72a624d5d5e4$ +// $hash=9d82217b402aa41686392b0ba81169f4b41035e7$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc index 37c94f62ad94114e782bc6b5bd33d3ea45f86791..059abfd2073eca0a3d0c9625a3f269a7ef43fbe8 100644 --- a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d5e813af8db16d06c8b544bf7dfeb9b00cc4dd93$ +// $hash=ec060a21597376bf3cb198d526c83e457869ca64$ // #include "libcef_dll/cpptoc/end_tracing_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h index 198808dfc5bd76bea395fa7cc2b91b87c773f50d..c6291697f7ea87b4955f4319f30c2a6fd6d85cc2 100644 --- a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h +++ b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c4a9a01b2d7aa8ba62c7e9ca93e740d2119d1ac6$ +// $hash=81dc12ded9752671497f775c397ca120632c4ddb$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_END_TRACING_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/extension_cpptoc.cc b/libcef_dll/cpptoc/extension_cpptoc.cc index 34fa43e41851160cb26a027a93838892ecea5f98..93685ce70e9bce43979cb5b4f5970f9b9e0612a3 100644 --- a/libcef_dll/cpptoc/extension_cpptoc.cc +++ b/libcef_dll/cpptoc/extension_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f93d8498bb115b9aa55f16c6b3b1f68eb9729bdc$ +// $hash=d2d5ac3885b178c1fbbf59de4ce71d8cbb6a495d$ // #include "libcef_dll/cpptoc/extension_cpptoc.h" diff --git a/libcef_dll/cpptoc/extension_cpptoc.h b/libcef_dll/cpptoc/extension_cpptoc.h index d80a8194495f198369620e71d5fa763ba77f7f9b..32eca73369ccd14c2806c6ecd417791fdf46cce3 100644 --- a/libcef_dll/cpptoc/extension_cpptoc.h +++ b/libcef_dll/cpptoc/extension_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=96c41e4ebd8f2073bb8d7f4db039fff82b34665d$ +// $hash=924265d65cc81f721d9757d8b4a325260e1848d1$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_EXTENSION_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/extension_handler_cpptoc.cc b/libcef_dll/cpptoc/extension_handler_cpptoc.cc index 743a75a5cddc5053d1a62e9ed6e3071b8f39f270..6713b8482716da29b8a000fbce3cab98bde69e81 100644 --- a/libcef_dll/cpptoc/extension_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/extension_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8d8587b2574fa0274191b42dad62bb5bebe23f3e$ +// $hash=268a62ebd9b7d8b14dc1510af1d395768d24e20f$ // #include "libcef_dll/cpptoc/extension_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/extension_handler_cpptoc.h b/libcef_dll/cpptoc/extension_handler_cpptoc.h index ec1dc844be8d6cccaf8f4f02ccc47833c4114259..13b489be281be71c00fcc3205a58628a9de50c07 100644 --- a/libcef_dll/cpptoc/extension_handler_cpptoc.h +++ b/libcef_dll/cpptoc/extension_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b0426125f1325485481cf11bc1530a353a971ad5$ +// $hash=db012b196983395c9684bf1275b638e9ccc57949$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_EXTENSION_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc index 84b57e25627516fc27de0da29edf9fed2da1ec10..d10cff2842e472dafa8d47a5ffbfdfb5119487ea 100644 --- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b7f28b646f39a202dbd804cd842cf4bc55223b32$ +// $hash=e203837c6db2beb403d762b9edef23817da8eefc$ // #include "libcef_dll/cpptoc/file_dialog_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h index aaada4ffbc31a009bd1617a556d0fefce0decd87..f0a754b9297469e997014c5559dace586866307f 100644 --- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d75ec8d5c610dfae9d424b3e66c5e4c41372014e$ +// $hash=2db275ca5be351037a0e19531fb2ed4c3af4498d$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_FILE_DIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/find_handler_cpptoc.cc b/libcef_dll/cpptoc/find_handler_cpptoc.cc index 632a4adc6bf0f14c0d65553706f8e83afe4d6ebf..e2a192ecd0ca589f8559a24ce8579553ab1c9178 100644 --- a/libcef_dll/cpptoc/find_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/find_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dba55d924984e110229ff9298189f601ee6ebf4d$ +// $hash=2df390a069798f60909a11621b3984e7a02cce40$ // #include "libcef_dll/cpptoc/find_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/find_handler_cpptoc.h b/libcef_dll/cpptoc/find_handler_cpptoc.h index 609d15e2820957e733a192ca8b54c05a8e92c8d8..cf30c541ef2fa26c297e7ed9a0043a90dafffd54 100644 --- a/libcef_dll/cpptoc/find_handler_cpptoc.h +++ b/libcef_dll/cpptoc/find_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=387db245f4a90f48a56036201c8b81d608f8f39d$ +// $hash=fd8c0866622e63f6564c0b00107ebcb0c82d60fe$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.cc b/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.cc index 5a6a1611bb5f96a6b31bae1031d396ee5fe664ff..6518b527c2b04953c4502b3ca513c5ac4b09084a 100644 --- a/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.cc +++ b/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.cc @@ -91,4 +91,4 @@ CefWrapperType CefCppToCRefCounted::kWrapperType = - WT_FIRST_MEANINGFUL_PAINT_DETAILS; + WT_FIRST_MEANINGFUL_PAINT_DETAILS; \ No newline at end of file diff --git a/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.h b/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.h index 25cb00679aa36ddfe298d6f7213b82f7019ecb64..ffccd513754502cc090a471f21a0c5e3506b48d7 100644 --- a/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.h +++ b/libcef_dll/cpptoc/first_meaningful_paint_details_cpptoc.h @@ -35,4 +35,4 @@ class CefFirstMeaningfulPaintDetailsCppToC virtual ~CefFirstMeaningfulPaintDetailsCppToC(); }; -#endif // CEF_LIBCEF_DLL_CPPTOC_FIRST_MEANINGFUL_PAINT_DETAILS_CPPTOC_H_ +#endif // CEF_LIBCEF_DLL_CPPTOC_FIRST_MEANINGFUL_PAINT_DETAILS_CPPTOC_H_ \ No newline at end of file diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.cc b/libcef_dll/cpptoc/focus_handler_cpptoc.cc index ae219e966103ac69bf199ec08817c2fd20eefe7b..31acfc5298c4338af12abbb1d968907062f1b846 100644 --- a/libcef_dll/cpptoc/focus_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/focus_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5510b099943c7a323de3dc1e52d5720fee09bad8$ +// $hash=0c39dbbfcbc1d5722ea173a74d287e752f7acfc8$ // #include "libcef_dll/cpptoc/focus_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.h b/libcef_dll/cpptoc/focus_handler_cpptoc.h index 905c84502ea197701b707c3616ba9a0dda09c09d..1dc59c421bfde7dd860401fa40de80c11ab6c04d 100644 --- a/libcef_dll/cpptoc/focus_handler_cpptoc.h +++ b/libcef_dll/cpptoc/focus_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f403c4bd73bef9f9871be23405eb3cf874f7942e$ +// $hash=b4e1894b64083f0045302da4840abf664c5a2429$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/form_handler_cpptoc.cc b/libcef_dll/cpptoc/form_handler_cpptoc.cc index d7851a50231bda80dc9f70232fdb46feb97cd4f2..c388ff7d1ab071bb95e14f944a4632cca4287459 100644 --- a/libcef_dll/cpptoc/form_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/form_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e9e42bc0805352ccdc498002d77bfd01e05c307b$ +// $hash=e14635519a864dcf0d63601bd28b1a0a4970c2d1$ // #include "libcef_dll/cpptoc/form_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/form_handler_cpptoc.h b/libcef_dll/cpptoc/form_handler_cpptoc.h index 63d9e1a324561bb9e1220714d6982123fbd8f6d6..3c65444e886ba4540e2420632dee014f41bd0e0d 100644 --- a/libcef_dll/cpptoc/form_handler_cpptoc.h +++ b/libcef_dll/cpptoc/form_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5ba0b31f82f3815b9b4ab1b55cde1f7a1d6cee17$ +// $hash=cd9ca60654a5fc79f02c119e2a42f23a73fc2c91$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_FORM_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/frame_cpptoc.cc b/libcef_dll/cpptoc/frame_cpptoc.cc index e57cb192d41ee8248ea63c84b0e59ad1e217dd53..bf3380a7a82a98a80ada7d7766082ea7884fd55c 100644 --- a/libcef_dll/cpptoc/frame_cpptoc.cc +++ b/libcef_dll/cpptoc/frame_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // diff --git a/libcef_dll/cpptoc/frame_cpptoc.h b/libcef_dll/cpptoc/frame_cpptoc.h index cb3b432ac83853883aeb894bf9e600574ddc7871..dab946904c7aac1dda7fd2a6924d1205399d6fad 100644 --- a/libcef_dll/cpptoc/frame_cpptoc.h +++ b/libcef_dll/cpptoc/frame_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2c99665e298dffa1a7eff42382ec36579c39016c$ +// $hash=e2af583c7a4b0b6b071e9e96ce8645375902673d$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_FRAME_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/frame_handler_cpptoc.cc b/libcef_dll/cpptoc/frame_handler_cpptoc.cc index 14811e951c334ad9a0a85d7475548ea31a63e2d3..68ae7a49f145f420b48fd3459501f46037cffc93 100644 --- a/libcef_dll/cpptoc/frame_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/frame_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4a3d33abbaa00a373ea515338ed67d96708dbb9c$ +// $hash=73bfc92f74c8cd32ae894b99710c1de5bd5099a0$ // #include "libcef_dll/cpptoc/frame_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/frame_handler_cpptoc.h b/libcef_dll/cpptoc/frame_handler_cpptoc.h index a83471877ef71a9395c36ddddcfbd769fc89849d..c553a2dd73ab1ef9483061e6765369b22b0a4476 100644 --- a/libcef_dll/cpptoc/frame_handler_cpptoc.h +++ b/libcef_dll/cpptoc/frame_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5e4c37ca3d237a08b0410f1e48cc31514c2577b1$ +// $hash=72b035624f1edff425da000635d111f72186fffc$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_FRAME_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/geolocation_acess_cpptoc.cc b/libcef_dll/cpptoc/geolocation_acess_cpptoc.cc index 8e337270944cf2e2ad681e60fe5c6628ec52ee03..ce4d90b1d4d151e753dbc15ead40d4f0ffe077d7 100644 --- a/libcef_dll/cpptoc/geolocation_acess_cpptoc.cc +++ b/libcef_dll/cpptoc/geolocation_acess_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ffdc734d650cdc76b4cabc63a0bf52442b712cc5$ +// $hash=a9b5dda39aef952f3e8eb628a7a15017cd446174$ // #include "libcef_dll/cpptoc/geolocation_acess_cpptoc.h" diff --git a/libcef_dll/cpptoc/geolocation_acess_cpptoc.h b/libcef_dll/cpptoc/geolocation_acess_cpptoc.h index 0fa97c10c33aacf49d61386cf47706891f0e373a..f2ab7de54a655ca9942355f8afceb3b92a5a0fe3 100644 --- a/libcef_dll/cpptoc/geolocation_acess_cpptoc.h +++ b/libcef_dll/cpptoc/geolocation_acess_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6deb97f42d20779c6426c745c58a8159add56a8a$ +// $hash=66a1438642f8ff3dd315b9535336be8d6b2c3e99$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_ACESS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc index 763d4cf7b7e27e63bad097b3558aaa850ae1c532..3d5a0d8ed46d0c11c6f1e08062bac89529ce8563 100644 --- a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fec3296cedf53576084a61a8f19ad418aa111df9$ +// $hash=961058ad701237a60c8ccbe6ce98c3654c1ae51e$ // #include "libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h index 2e73866bba5d27326d57576c88b89a5575f4bd5a..0056536b211aa82dc8f5b88ae6a450f97731d019 100644 --- a/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_extension_resource_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d55002c59927f7d7b6601e0771c26e3734a7602c$ +// $hash=76b58a0d3f719bb4899c87ec701d89a96a45ae31$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GET_EXTENSION_RESOURCE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_images_callback_cpptoc.cc b/libcef_dll/cpptoc/get_images_callback_cpptoc.cc index 77be5c27a847358c1fa4d4d4d062ed06f28918ae..68460296ed96b3eacbb04668874a0d85a3d64b05 100644 --- a/libcef_dll/cpptoc/get_images_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_images_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0de2ead75613ec221f86c8b7be9dea259add4818$ +// $hash=592d4ac350c88a56b7ec0498809892d1a6f292fa$ // #include "libcef_dll/cpptoc/get_images_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/get_images_callback_cpptoc.h b/libcef_dll/cpptoc/get_images_callback_cpptoc.h index e5acbadfa8feca26c1b3aad824dbf296ca3d6e43..27cc93f4eaeef567084b8f6adcbb3148f87d9099 100644 --- a/libcef_dll/cpptoc/get_images_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_images_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=29a1f1baf2241288aaf4a52b900468fe0cf529c8$ +// $hash=d5b18c7be26bf71b47bb68718126ef89fad457d3$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GET_IMAGES_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.cc b/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.cc index 294f9ff29a62e743554700bd7ed998ac7522b65f..6800e7d20eb923c5e421502caced350964b25cbf 100644 --- a/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4d51e159b12fe37d7ff02f3bf4a47b57ba73e872$ +// $hash=9e9d27ab3230f62b7b36158218169837b8bf70f2$ // #include "libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.h b/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.h index f0f17f997de8c46944bbc66b810ea586e0afd9b2..97fdb9f9ec701ba17d1f80e01a131663da041ee8 100644 --- a/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_origin_usage_or_quota_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c2175f01b8450498987fae5ba37ca06b239b61a2$ +// $hash=79d42142140e6b820264a3d723ee0f1ffa1747f2$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GET_ORIGIN_USAGE_OR_QUOTA_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_origins_callback_cpptoc.cc b/libcef_dll/cpptoc/get_origins_callback_cpptoc.cc index f5d0cd7ed0d065a55d78e331edce03f936676797..10210ec0a05e2cd7651222800aa415a32643e7dc 100644 --- a/libcef_dll/cpptoc/get_origins_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_origins_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=29adcfbbb1658c9af3f7e325fa4b56eabb008372$ +// $hash=bc70acf47e067818a2c01f65c319bca589af931c$ // #include "libcef_dll/cpptoc/get_origins_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/get_origins_callback_cpptoc.h b/libcef_dll/cpptoc/get_origins_callback_cpptoc.h index 7941381f025abe7eacfdb124d6edcc06e6b71d52..5f09c5b4ad923b5e0c975084da172fb57fcb3f7c 100644 --- a/libcef_dll/cpptoc/get_origins_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_origins_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f2ea0176fc4472db5184811dbde5514ca58ac39c$ +// $hash=a0d4dd8ca32ce2f249a5f36f798be8dfa594d25a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GET_ORIGINS_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_password_callback_cpptoc.cc b/libcef_dll/cpptoc/get_password_callback_cpptoc.cc index 08a4c92b7f0a89d99ad65b76ba6c0cffd2f73a33..f9426a3ae25c7dec9d74c86c8a6c68c88f4e8ce2 100644 --- a/libcef_dll/cpptoc/get_password_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_password_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6803cd83f998b59bd7e58f0a41e34fb2e41d1563$ +// $hash=2ed9dfc169a78b9899dbdef6671321e2686359c0$ // #include "libcef_dll/cpptoc/get_password_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/get_password_callback_cpptoc.h b/libcef_dll/cpptoc/get_password_callback_cpptoc.h index bf85a8f7ce6c281a581a8fdff8c96685d1583408..cf05e671a1aadabc4b598765b0fea068d7a845f8 100644 --- a/libcef_dll/cpptoc/get_password_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_password_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3a7754bcb21c857f1333dc77e80b41935d4d6fac$ +// $hash=8b44eb587cfa3c7e9af480503103aa35641c1d53$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GET_PASSWORD_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.cc b/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.cc index 6d888048e64be74355581b6508e306091d5b1a31..fb1566e1bbf3761075589402205ae930a9c35b66 100644 --- a/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bc86cefeae4b0a831604bcbd61e7a91fe4c233cc$ +// $hash=63596e7084c8b427d34d25ac957bdc286b76f10e$ // #include "libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.h b/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.h index b907827b65d1ed5fb52751ea36b6642f4cdb9977..45c61ea2449ee4bfe7b9f6e1983206b83125e51e 100644 --- a/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_saved_passwords_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=64cb9e931fe47c4a8d970bbfcd27d2a98805c95b$ +// $hash=0fd58ec9d3022be0f1e36315486687bf2c710977$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_GET_SAVED_PASSWORDS_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/image_cpptoc.cc b/libcef_dll/cpptoc/image_cpptoc.cc index f095b323b34729974c10cf71debc77468cd59eef..cb40093ee0da9c500f61df53e0873e2787e59b58 100644 --- a/libcef_dll/cpptoc/image_cpptoc.cc +++ b/libcef_dll/cpptoc/image_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e5c412635b86295558dd1ba5741f90a386c77b28$ +// $hash=beb7882398ddea540b847e5c9fb44ed19f91f125$ // #include "libcef_dll/cpptoc/image_cpptoc.h" diff --git a/libcef_dll/cpptoc/image_cpptoc.h b/libcef_dll/cpptoc/image_cpptoc.h index 5e7d090b3e6ed18ad49dbae2424962b74b1de839..3f63462f19aaf0aba79c54c42e4f6784a6d193ca 100644 --- a/libcef_dll/cpptoc/image_cpptoc.h +++ b/libcef_dll/cpptoc/image_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=93ab2e59475760ff93f9232f3857d151f87b2077$ +// $hash=4ce026e90daa0a4d5d4be0baf1e8dbd3ede5974f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_IMAGE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/java_script_result_callback_cpptoc.cc b/libcef_dll/cpptoc/java_script_result_callback_cpptoc.cc index 5fce28fce28c262bc1dc208f7f6604e55e4b5529..a95b7ea94fadb0b3f29c2a4fa53bec98587c14a4 100644 --- a/libcef_dll/cpptoc/java_script_result_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/java_script_result_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=109f995a94a70f5ba71acfb7ecf12d9f78267d20$ +// $hash=00215ab759af3c11533528c79123b5a4b1841a78$ // #include "libcef_dll/cpptoc/java_script_result_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/java_script_result_callback_cpptoc.h b/libcef_dll/cpptoc/java_script_result_callback_cpptoc.h index 2df5f8296aca94e7dbec073c2a0376c04b0be2e4..f029712a922eccd78e8efbf08949b61e5965cd5d 100644 --- a/libcef_dll/cpptoc/java_script_result_callback_cpptoc.h +++ b/libcef_dll/cpptoc/java_script_result_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ee4c0ecc67ad977bc611b4988787febd2a2aef12$ +// $hash=d2e376ccc88d8547a4b4aca415a638f8b5fe6eab$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_JAVA_SCRIPT_RESULT_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc index 5704fad0b6d7c998d8a3af6d5491fbe47d4470b7..c1e59a4667c250b80ad5a794f2ac732895576e22 100644 --- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dfbadf8fc51bb7378be8971c061cc62d608271b9$ +// $hash=893e80b636f7ecd2b0e0fae18d1a0e1e568cd3ac$ // #include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h index 692ac0319ee497947bc9e66569c515d84f7b57c6..772ae287b6127e1dcf1802bf6e378fcdaf22eaca 100644 --- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=526d1a7bdc16d6ba73c552dc36dd114e30a66c51$ +// $hash=37aac75252a6f35a8abe927ca603849ce98ac1e1$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc index f0a4d0b0929109a7421da8684f8272a470ca1690..8ce4aa2ac74d54be2a0350ba752590b373fe4e23 100644 --- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d8119d78ed9842a3ac7227978fbccfc50e9b8ecd$ +// $hash=6e9e14705c119ec33c4f8574a56cfdc61e1343de$ // #include "libcef_dll/cpptoc/jsdialog_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h index 0139f4a533273acadd35ba110d27b10878f1d3aa..93f193d1db3de831b6eec29f3f9c2af3c0e27dc7 100644 --- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h +++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fa0d14594aa86c629b8f7a8e25f2472aaac9cb76$ +// $hash=c6a25a7ceb346f562302df398305f3d09a7c587d$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.cc b/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.cc index 9c610cd5ba87f1ea238134fda63d51e5f5ffa140..3a3960c5e4c20ef25e62340929cc5e1e961ca367 100644 --- a/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.cc +++ b/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.cc @@ -179,4 +179,4 @@ CefWrapperType CefCppToCRefCounted::kWrapperType = - WT_LARGEST_CONTENTFUL_PAINT_DETAILS; + WT_LARGEST_CONTENTFUL_PAINT_DETAILS; \ No newline at end of file diff --git a/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.h b/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.h index 3df4887caf7db10f2861243d242ab80ad59f0bd3..4bba376700d7b28a952f7614c82f43c0d207cdc5 100644 --- a/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.h +++ b/libcef_dll/cpptoc/largest_contentful_paint_details_cpptoc.h @@ -35,4 +35,4 @@ class CefLargestContentfulPaintDetailsCppToC virtual ~CefLargestContentfulPaintDetailsCppToC(); }; -#endif // CEF_LIBCEF_DLL_CPPTOC_LARGEST_CONTENTFUL_PAINT_DETAILS_CPPTOC_H_ +#endif // CEF_LIBCEF_DLL_CPPTOC_LARGEST_CONTENTFUL_PAINT_DETAILS_CPPTOC_H_ \ No newline at end of file diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc index 4ad495224d68bb55f818e0f7e65df58e5fedf63b..d34e5c961c950c7cb6701aed01a73c33ad94c331 100644 --- a/libcef_dll/cpptoc/life_span_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7915ff2b52e217fe46b4d9dec2d4baba843aacb1$ +// $hash=d4eef1c42368d390aa8084fd31b1af58493449a5$ // #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.h b/libcef_dll/cpptoc/life_span_handler_cpptoc.h index 920ea96409b36729d3abc0f3f970daafa6e8594e..531314a0f60b310e9e2325fb163821faffb77f57 100644 --- a/libcef_dll/cpptoc/life_span_handler_cpptoc.h +++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cd7929df40f92067e230ffc6ca9e69ad76c8a86b$ +// $hash=74c66feec24c563e6f3f32230dcb0dbf45ed9350$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/list_value_cpptoc.cc b/libcef_dll/cpptoc/list_value_cpptoc.cc index 64f032c33ca6485be5a986243bf2642f928ccc17..e296fbc018da829d5cfaccbc65144eee3e6dd409 100644 --- a/libcef_dll/cpptoc/list_value_cpptoc.cc +++ b/libcef_dll/cpptoc/list_value_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=84860bcc80ecc096e177118c9aa12e962250fc95$ +// $hash=1431751cc07f3678e8e893c638391c9701a9e4fb$ // #include "libcef_dll/cpptoc/list_value_cpptoc.h" diff --git a/libcef_dll/cpptoc/list_value_cpptoc.h b/libcef_dll/cpptoc/list_value_cpptoc.h index 2e1750327bbf883a8449adf66a20d1a30ec7113a..3e7b9c5138a3af8f149005e0824e73d1029b349e 100644 --- a/libcef_dll/cpptoc/list_value_cpptoc.h +++ b/libcef_dll/cpptoc/list_value_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0d62014e7287cb6da34a31a9e0349b9bf2b39c5d$ +// $hash=bb4f6bacea8366b11d1526059c5ad4c3df495630$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_LIST_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/load_committed_details_cpptoc.cc b/libcef_dll/cpptoc/load_committed_details_cpptoc.cc index bb62b22a76afdf2eb8d6b2a36ec352cf3dced3ba..330b6548c4c427c77028aedea9cd4c3b514215b6 100644 --- a/libcef_dll/cpptoc/load_committed_details_cpptoc.cc +++ b/libcef_dll/cpptoc/load_committed_details_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ba7670c595854058ccb4e00d10bad87a34e746fd$ +// $hash=7c5daea9b1a9249a0d73a627c9798e87331d8d60$ // #include "libcef_dll/cpptoc/load_committed_details_cpptoc.h" diff --git a/libcef_dll/cpptoc/load_committed_details_cpptoc.h b/libcef_dll/cpptoc/load_committed_details_cpptoc.h index 5230d7012961c0065c1efebb03db079abc5150e2..4cdccfe8874429b469fc690df7642f77a58d861d 100644 --- a/libcef_dll/cpptoc/load_committed_details_cpptoc.h +++ b/libcef_dll/cpptoc/load_committed_details_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=613421f9fa01eb86693045332ebbcd4268806b0a$ +// $hash=a37a28bbe79e2694d4ed3340392cc26606a05f2a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_LOAD_COMMITTED_DETAILS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.cc b/libcef_dll/cpptoc/load_handler_cpptoc.cc index b1718455c468d1dbfc3f4748b6b601b451a31769..d5dea23c1e0490399ac2933372cb5c3987a0dfed 100644 --- a/libcef_dll/cpptoc/load_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/load_handler_cpptoc.cc @@ -319,6 +319,22 @@ load_handler_on_first_contentful_paint(struct _cef_load_handler_t* self, navigationStartTick, firstContentfulPaintMs); } +void CEF_CALLBACK +load_handler_on_safe_browsing_check_result(struct _cef_load_handler_t* self, + int threat_type) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + + // Execute + CefLoadHandlerCppToC::Get(self)->OnSafeBrowsingCheckResult(threat_type); +} + void CEF_CALLBACK load_handler_on_first_meaningful_paint( struct _cef_load_handler_t* self, cef_first_meaningful_paint_details_t* details) { @@ -385,22 +401,6 @@ void CEF_CALLBACK load_handler_on_navigation_entry_committed( CefLoadCommittedDetailsCToCpp::Wrap(details)); } -void CEF_CALLBACK -load_handler_on_safe_browsing_check_result(struct _cef_load_handler_t* self, - int threat_type) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) { - return; - } - - // Execute - CefLoadHandlerCppToC::Get(self)->OnSafeBrowsingCheckResult(threat_type); -} - void CEF_CALLBACK load_handler_on_intelligent_tracking_prevention_result( struct _cef_load_handler_t* self, const cef_string_t* website_host, @@ -451,10 +451,10 @@ CefLoadHandlerCppToC::CefLoadHandlerCppToC() { load_handler_on_first_meaningful_paint; GetStruct()->on_largest_contentful_paint = load_handler_on_largest_contentful_paint; - GetStruct()->on_navigation_entry_committed = - load_handler_on_navigation_entry_committed; GetStruct()->on_safe_browsing_check_result = load_handler_on_safe_browsing_check_result; + GetStruct()->on_navigation_entry_committed = + load_handler_on_navigation_entry_committed; GetStruct()->on_intelligent_tracking_prevention_result = load_handler_on_intelligent_tracking_prevention_result; } diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.h b/libcef_dll/cpptoc/load_handler_cpptoc.h index 75f1e16cd1048359cc25eea9f5400a10de9c856d..b17e7746a1cd12047c1a7b480ec372777a6f0d19 100644 --- a/libcef_dll/cpptoc/load_handler_cpptoc.h +++ b/libcef_dll/cpptoc/load_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1e7b2ebc3ed2229e3dbef5adfb6ae879cc6c2c2c$ +// $hash=60feef3855499ffd313c9e10fe4e8a6304acc871$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_access_callback_cpptoc.cc b/libcef_dll/cpptoc/media_access_callback_cpptoc.cc index 44907ac57ff74014c34b9be36942c741cc8ea41c..ae4fb720df72bfe21ab0bdb6d94fa65418874da1 100644 --- a/libcef_dll/cpptoc/media_access_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/media_access_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=539410dcde7c8d016eb7cabb7fdc0e1f884a8742$ +// $hash=80cfd5e986d8a5f4b71c3058806cf2ee66100f6e$ // #include "libcef_dll/cpptoc/media_access_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_access_callback_cpptoc.h b/libcef_dll/cpptoc/media_access_callback_cpptoc.h index cee8caadd75829218ee625c2e3bbae2149efc630..9609f4e41d2d70712aadcade5c934569d868b338 100644 --- a/libcef_dll/cpptoc/media_access_callback_cpptoc.h +++ b/libcef_dll/cpptoc/media_access_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=03282b7e3e3664aa68bc37231d3475a6edde85d5$ +// $hash=4b3da65396a9a358cbcdb289e275062a7b4402d5$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_ACCESS_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_handler_cpptoc.cc b/libcef_dll/cpptoc/media_handler_cpptoc.cc index 1b637cf1edd9b95a23603051364a23ea61de37a7..deeab0d9e8312ceb9f97bbf5fb4c3d925b24ee63 100644 --- a/libcef_dll/cpptoc/media_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/media_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8c72ddbfb413667b866b9a52f8d305cf785a7347$ +// $hash=4ade112186cef7a820e3be25acbe24181a3aedf0$ // #include "libcef_dll/cpptoc/media_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_handler_cpptoc.h b/libcef_dll/cpptoc/media_handler_cpptoc.h index 08d62e473dc4cba3341ab78f9e758cf9fd86d63b..c58b236b7a0edd308d584eaa39db73b1d2372066 100644 --- a/libcef_dll/cpptoc/media_handler_cpptoc.h +++ b/libcef_dll/cpptoc/media_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=df9657faa8793b1a0f4a67dbb48472948c6b334e$ +// $hash=b746efc1ae26c0a1f481d010b321817e5bf3f21f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_observer_cpptoc.cc b/libcef_dll/cpptoc/media_observer_cpptoc.cc index 58dafdb82501a4f0a12a958b73c07d437c85b7ad..10bb22b11fcbcdb0e6bf30a17e8755a141f08187 100644 --- a/libcef_dll/cpptoc/media_observer_cpptoc.cc +++ b/libcef_dll/cpptoc/media_observer_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bda6f1c15445d32a8f86b0c62724c01e6a014208$ +// $hash=22f71b1cb703d48b29d6e4eefb294fd713b5bf0e$ // #include "libcef_dll/cpptoc/media_observer_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_observer_cpptoc.h b/libcef_dll/cpptoc/media_observer_cpptoc.h index f74ba0aebb2c66f5d01798c6e71b4f13afc95bbd..0161197d0a931bbcecec127c38d7667e0e6a92e6 100644 --- a/libcef_dll/cpptoc/media_observer_cpptoc.h +++ b/libcef_dll/cpptoc/media_observer_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6f7dd106022ef26563306a40ac5506fb626c9742$ +// $hash=79a189744a4f09ec791d9636b247f090aa2cae58$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_OBSERVER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_route_cpptoc.cc b/libcef_dll/cpptoc/media_route_cpptoc.cc index 246c366c5463154d2bbf26076b9fb19ec5ef1f16..ebd18baf8834341cfe769a747cf84cd276b03b05 100644 --- a/libcef_dll/cpptoc/media_route_cpptoc.cc +++ b/libcef_dll/cpptoc/media_route_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c6e463595409ce6ea23901a0732c31c412144cb1$ +// $hash=3273e6b77a9d01d328b538480cfd2fb0ed45201c$ // #include "libcef_dll/cpptoc/media_route_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_route_cpptoc.h b/libcef_dll/cpptoc/media_route_cpptoc.h index 64c6af8d8cbedd9a343e6873c777a1bdf2e4fa43..c204275d6fc217a04e3a1a0a46a8cc7cf24edeec 100644 --- a/libcef_dll/cpptoc/media_route_cpptoc.h +++ b/libcef_dll/cpptoc/media_route_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=00e6dfe28ab8faaf9ec904d5d570a76b91360058$ +// $hash=3489d6674c9411c8240767db40adff59a6f2ae4e$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_ROUTE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc b/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc index 704aae85caee32c6ac420a3df799b8df9fbd6a7e..e54a4189945018c68313e39c894df3b79e8c484a 100644 --- a/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/media_route_create_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cfb96c6b081d44a4dde50c7cda61e3481c63ce43$ +// $hash=35856cbf3eaacfdeceed8d49fa1e6ae066d21fe7$ // #include "libcef_dll/cpptoc/media_route_create_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_route_create_callback_cpptoc.h b/libcef_dll/cpptoc/media_route_create_callback_cpptoc.h index 2daa1bd3daa19de4189d1bf414618cb38fa96e14..b28004ce01788a2eeb3bf82d4a0ef09ef1c5f987 100644 --- a/libcef_dll/cpptoc/media_route_create_callback_cpptoc.h +++ b/libcef_dll/cpptoc/media_route_create_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=658240aaf9f3ba4e65878c27bfc604f3d3f7ff7c$ +// $hash=d40e59390639a5fb850103f7b8a458e3bc1c8f55$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_ROUTE_CREATE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_router_cpptoc.cc b/libcef_dll/cpptoc/media_router_cpptoc.cc index 26aba5d25a4f8061f5e220f45b95ac8c8a0e3460..176424d37d44ee987197742af89c1ae092ba7a5c 100644 --- a/libcef_dll/cpptoc/media_router_cpptoc.cc +++ b/libcef_dll/cpptoc/media_router_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c95159440be2da67d89298167f047aaea0c254e8$ +// $hash=e98de61436e52c5be6153cc4e3644962259eddeb$ // #include "libcef_dll/cpptoc/media_router_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_router_cpptoc.h b/libcef_dll/cpptoc/media_router_cpptoc.h index c2eb33baf4d4cbf97c193fae1db6804260ca0ace..f7d5c937ecf4e1326e43975869545df3158de0a3 100644 --- a/libcef_dll/cpptoc/media_router_cpptoc.h +++ b/libcef_dll/cpptoc/media_router_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ea40a527809ee7857be77791c10baa6fe158d7c5$ +// $hash=9b393780a7f736211be3b2ac604af8b59226db5e$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_ROUTER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_sink_cpptoc.cc b/libcef_dll/cpptoc/media_sink_cpptoc.cc index afc6061c5f475dbe6c95bcfd8d8e2294eba1cb3a..0b71f1cc686665aa4d14f262bc1125d78749696d 100644 --- a/libcef_dll/cpptoc/media_sink_cpptoc.cc +++ b/libcef_dll/cpptoc/media_sink_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5e9c88099be2c8d7ce3574999097423432efd220$ +// $hash=34cf5c3fde544a2f8a323ea3f55ed88db0010672$ // #include "libcef_dll/cpptoc/media_sink_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_sink_cpptoc.h b/libcef_dll/cpptoc/media_sink_cpptoc.h index 9144256ef3f746cb2335337503b30e9ebfaef219..3252cf2882675788b66d8184aa644a87772a6c3b 100644 --- a/libcef_dll/cpptoc/media_sink_cpptoc.h +++ b/libcef_dll/cpptoc/media_sink_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f23866255324a72d2f4f4fcfd27d5a16fca235ba$ +// $hash=233a4ba3634b10b92d605e85bb49ccb7f4e0abe3$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_SINK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc b/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc index bb10fda92bb3b24e0eb8dbf46bccf102cf4864e5..ffc288ae7b91c10b722d2b05b519bf9836ac2575 100644 --- a/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=48d5bd712540c85c83360d4342acedd2412fcf30$ +// $hash=9e43a07b0d4886995b29b55315fe8397641293df$ // #include "libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h b/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h index 7f94756ca4f017ff47fd6ff0da6a439edd9a7eda..0522de766ca736127d32c587c3f2db72a95ef1f7 100644 --- a/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h +++ b/libcef_dll/cpptoc/media_sink_device_info_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=91c42d78480fed92a283f9859b1ac0fce532e01f$ +// $hash=66fb13a617c9405f7829e797b21a663e5275e61d$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_SINK_DEVICE_INFO_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/media_source_cpptoc.cc b/libcef_dll/cpptoc/media_source_cpptoc.cc index 0ce19741f82fc4686ebd81a98074271fd1f26c89..f84810e2eb374d1be585c6948680d80abf0d51e2 100644 --- a/libcef_dll/cpptoc/media_source_cpptoc.cc +++ b/libcef_dll/cpptoc/media_source_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4e30f66181cbf56da3e37fd55f4542bfd853d83a$ +// $hash=28f41d6cd0959174263b1cf5d1da37b4fe4c463b$ // #include "libcef_dll/cpptoc/media_source_cpptoc.h" diff --git a/libcef_dll/cpptoc/media_source_cpptoc.h b/libcef_dll/cpptoc/media_source_cpptoc.h index 6cc32ed8188977bcb598f60b7f9135feb6d41e42..25f10d6eaf6e4b8f8fa58a4b33649baa9f66eb7a 100644 --- a/libcef_dll/cpptoc/media_source_cpptoc.h +++ b/libcef_dll/cpptoc/media_source_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ba13a5a03e64240ee3208ec7b7366cf91c4283de$ +// $hash=ac61adb518bfd33bcc31e62410a1849dbf73dc3f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MEDIA_SOURCE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.cc b/libcef_dll/cpptoc/menu_model_cpptoc.cc index e96d09ddba9ab26450ec0095859df9afbd972532..c8b257348c7576c28395119545662c205df0136f 100644 --- a/libcef_dll/cpptoc/menu_model_cpptoc.cc +++ b/libcef_dll/cpptoc/menu_model_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5781ee6b658c422d5b071b7442934bd237f1cadb$ +// $hash=e41fe8c89bde5a6883bb523230c3067900c85827$ // #include "libcef_dll/cpptoc/menu_model_cpptoc.h" diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.h b/libcef_dll/cpptoc/menu_model_cpptoc.h index 85f360e981cf1359cb853e92fad6281b6dddfaa4..9344a7269361c6c8f8b32964790b85f860f54df0 100644 --- a/libcef_dll/cpptoc/menu_model_cpptoc.h +++ b/libcef_dll/cpptoc/menu_model_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6271032d1ece3a64e53b1b3013214d358c8b1d6d$ +// $hash=5f39f05bb39da5ede094d0e9789c5ef1dee1cf7f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc index 197ae0aee0ac0f7b0c4881caf356439bca358e79..7c070935411a831b9a683300fecfd443e6e63d18 100644 --- a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a69369fe8fadea409955f130afb3d158e9e66c79$ +// $hash=e3f7a1bb81a732eddd8995d14490216d147f510c$ // #include "libcef_dll/cpptoc/menu_model_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h index f5316dcaac02f3ac15673993c2468df45a892904..50a03ba4db0a65c31c59b74bb7f5aff134ebb34e 100644 --- a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=95c1e3b51fda25550a7a239f6a3ad1ef94cb5c2f$ +// $hash=2277b8692532f706316bb97ffe611394a00e1023$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/navigation_entry_cpptoc.cc b/libcef_dll/cpptoc/navigation_entry_cpptoc.cc index 5b87c9c5e4782eef0f83e078b0d19c28409c7c26..fa98329e492a6510b36bc056e6a231dacef84ec4 100644 --- a/libcef_dll/cpptoc/navigation_entry_cpptoc.cc +++ b/libcef_dll/cpptoc/navigation_entry_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2fafeb89d83adcd24ca12c7e77477696fcd9a797$ +// $hash=7c0682536255bcb504a826f5b8f6f119f71b770c$ // #include "libcef_dll/cpptoc/navigation_entry_cpptoc.h" diff --git a/libcef_dll/cpptoc/navigation_entry_cpptoc.h b/libcef_dll/cpptoc/navigation_entry_cpptoc.h index 71d9b2c5463a731cef06455e8b512e40f2d7a6ff..38285d8148aa617b74824bf856ed8911d157b457 100644 --- a/libcef_dll/cpptoc/navigation_entry_cpptoc.h +++ b/libcef_dll/cpptoc/navigation_entry_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=09bcb7407c26bffebece07275e496da217328212$ +// $hash=213e6404f2260e81c41b20a42ae7788af80710dc$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc index 2abf3fcf35bb321ddf9c7d3808d6fb5add35be08..cefcf434d275a60d77401dadd98bb580e896357b 100644 --- a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f9d3988a2c25d4079109b89ff555f27c05e45eb7$ +// $hash=f1a90fb1b3cda0cec9e9b4349c722761be164d22$ // #include "libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h" diff --git a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h index 9cf605500f1e53a8766eceb18b32f869fdec5d5e..77bb1a6807fbae7385ddbeed04cd515f7124bd07 100644 --- a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f2730373acc818f4270f082624b80122e4524583$ +// $hash=e2fe9b1846135732e7596c2ff7ab6efadbb5a519$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc index 1bff0aac1422f364e7740bb851635046ef429a2e..c4f4cfa808c251c6ecda92f280e55c4eb0fee7ce 100644 --- a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=21a1fcaffc0a182cbf585c76fc6b906ede397352$ +// $hash=1ed6b4ab7a3ceeab451ba1b898ed91a88f483004$ // #include "libcef_dll/cpptoc/pdf_print_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h index a53ae311e2a84c528b194c9142d0098fcb2a23a4..79130c8db521158c086384e942fafb9106affc6b 100644 --- a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h +++ b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=99e9bf808e4cc150e67822298c122035c56c6b2b$ +// $hash=5e9c671740881e345231547607160ce167d37728$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PDF_PRINT_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.cc b/libcef_dll/cpptoc/permission_handler_cpptoc.cc index df3829fe5a082d33a7910694143887bd49dea0c2..e8913eab70f4c83af1bde2041fdeb827e21c1e98 100644 --- a/libcef_dll/cpptoc/permission_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/permission_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e93e5d01406f0539f79ccdd66f0c12049da5bd70$ +// $hash=1631e01c7930f0c2c94111e8451954c844c84637$ // #include "libcef_dll/cpptoc/permission_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/permission_handler_cpptoc.h b/libcef_dll/cpptoc/permission_handler_cpptoc.h index fa62395b8c3360acf5833d4953ce60603781c380..0ac7a85198aa8f06cddaa4de83fc1e66ec326254 100644 --- a/libcef_dll/cpptoc/permission_handler_cpptoc.h +++ b/libcef_dll/cpptoc/permission_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e303500feb26ffc06c4aeff7454e917735461e8f$ +// $hash=85771f8c4169ad8465d7d53294a2da107ed1a03c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PERMISSION_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc b/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc index 43dbe65633b50977aed20208b28652d432f480d1..ea6744327ee80c73810f1e0a8f615c062acd6a60 100644 --- a/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dabee9d02c60280d0e87b1428999be9daa952681$ +// $hash=3ff7759e8f2dac0ae01122918c5ba0556b244532$ // #include "libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h b/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h index 7fcdfd47adc705cfab16073d8d86d1c5eabbb799..67797889398fe3d603dc6f4f3e6e8304b8c8dfb9 100644 --- a/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h +++ b/libcef_dll/cpptoc/permission_prompt_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec43d6888104ffdc2beca81bc79ab7a3964b8d48$ +// $hash=1fa140e60746b9a65c7ff9216577128cb1d2fb35$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PERMISSION_PROMPT_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/permission_request_cpptoc.cc b/libcef_dll/cpptoc/permission_request_cpptoc.cc index 9d1a0830547df25182c8eec493e8fe7d672fc4e4..dfb9b207cd175e37773b0007218c9efaabdae0d2 100644 --- a/libcef_dll/cpptoc/permission_request_cpptoc.cc +++ b/libcef_dll/cpptoc/permission_request_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b060e18bb0cb89ff4292d2290686d31e779efe5a$ +// $hash=c5eac1a1ca6bfc65cd343175a33cc88b39f0b4de$ // #include "libcef_dll/cpptoc/permission_request_cpptoc.h" diff --git a/libcef_dll/cpptoc/permission_request_cpptoc.h b/libcef_dll/cpptoc/permission_request_cpptoc.h index aecb9aa03a4af814113188d546053f50e2830921..7446187b86322bfa2cb841fa1efc27b7431b0128 100644 --- a/libcef_dll/cpptoc/permission_request_cpptoc.h +++ b/libcef_dll/cpptoc/permission_request_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6a98ff3b98f2c96c2d30b973c9dbbf2cf4d3d19c$ +// $hash=8ef60b5e6629947be455e0c402c9170bf7848cff$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PERMISSION_REQUEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/post_data_cpptoc.cc b/libcef_dll/cpptoc/post_data_cpptoc.cc index 76c3e76c6ac60a3c0ce2aa106cbaeb19204d4fe5..9ab657eefd30cf342cfb1efb7af27478bc9c2047 100644 --- a/libcef_dll/cpptoc/post_data_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=78f397f5b95687128332737aef71747648da6d84$ +// $hash=1c9f3d740266fe84bfa1d6105eaffaf2866a8876$ // #include "libcef_dll/cpptoc/post_data_cpptoc.h" diff --git a/libcef_dll/cpptoc/post_data_cpptoc.h b/libcef_dll/cpptoc/post_data_cpptoc.h index e2bc7c77ac863705ec0a5dbacc74a7a5ab32ac7f..59518a2bd8aff0d92059240d5fdf206fea7d9526 100644 --- a/libcef_dll/cpptoc/post_data_cpptoc.h +++ b/libcef_dll/cpptoc/post_data_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2fa204180318873ffe490800e4cfe3046458ece0$ +// $hash=784458fd59458b07ba3c6eacac3803b9901c354c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_POST_DATA_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/post_data_element_cpptoc.cc b/libcef_dll/cpptoc/post_data_element_cpptoc.cc index 0ce503ef37473ec3e837c2aa847970cf4165e7a3..ef494b3d377d62cc5a30e6c24ef8acffcc6ff848 100644 --- a/libcef_dll/cpptoc/post_data_element_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_element_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=018ff9afac733880b7f2fd9ff03ec4495abe1b4f$ +// $hash=28878433f4b543be6353184d8f930099ea0c9f41$ // #include "libcef_dll/cpptoc/post_data_element_cpptoc.h" diff --git a/libcef_dll/cpptoc/post_data_element_cpptoc.h b/libcef_dll/cpptoc/post_data_element_cpptoc.h index b13b975a72c4eb00599b5bf807c55788bda897c3..5b57b20450e85b726bcc0ac6be0cd49f8174d30a 100644 --- a/libcef_dll/cpptoc/post_data_element_cpptoc.h +++ b/libcef_dll/cpptoc/post_data_element_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f3d926105535fde613308eccba785bd7094cd64c$ +// $hash=6d48d5f01f5cebcdca0fcfa7ce2b39a049fdc9cd$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_POST_DATA_ELEMENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/post_data_stream_cpptoc.cc b/libcef_dll/cpptoc/post_data_stream_cpptoc.cc index 09e5bd305aceb11d9bc501ec088dc93fd4a8ef48..1bab378b2bc5d6148f37fdffd4fed656308a4a7d 100644 --- a/libcef_dll/cpptoc/post_data_stream_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_stream_cpptoc.cc @@ -18,7 +18,7 @@ // GLOBAL FUNCTIONS - Body may be edited by hand. -CEF_EXPORT cef_post_data_stream_t *cef_post_data_stream_create() { +CEF_EXPORT cef_post_data_stream_t* cef_post_data_stream_create() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute @@ -33,8 +33,8 @@ namespace { // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK post_data_stream_set_read_callback( - struct _cef_post_data_stream_t *self, - cef_post_data_stream_read_callback_t *read_callback) { + struct _cef_post_data_stream_t* self, + cef_post_data_stream_read_callback_t* read_callback) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -53,8 +53,8 @@ void CEF_CALLBACK post_data_stream_set_read_callback( } void CEF_CALLBACK -post_data_stream_init(struct _cef_post_data_stream_t *self, - cef_post_data_stream_init_callback_t *init_callback) { +post_data_stream_init(struct _cef_post_data_stream_t* self, + cef_post_data_stream_init_callback_t* init_callback) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -72,9 +72,11 @@ post_data_stream_init(struct _cef_post_data_stream_t *self, CefPostDataStreamInitCallbackCppToC::Unwrap(init_callback)); } -void CEF_CALLBACK post_data_stream_read( - struct _cef_post_data_stream_t *self, void *buffer, int buf_len, - cef_post_data_stream_read_callback_t *read_callback) { +void CEF_CALLBACK +post_data_stream_read(struct _cef_post_data_stream_t* self, + void* buffer, + int buf_len, + cef_post_data_stream_read_callback_t* read_callback) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -99,7 +101,7 @@ void CEF_CALLBACK post_data_stream_read( } uint64 CEF_CALLBACK -post_data_stream_get_size(struct _cef_post_data_stream_t *self) { +post_data_stream_get_size(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -115,7 +117,7 @@ post_data_stream_get_size(struct _cef_post_data_stream_t *self) { } uint64 CEF_CALLBACK -post_data_stream_get_position(struct _cef_post_data_stream_t *self) { +post_data_stream_get_position(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -131,7 +133,7 @@ post_data_stream_get_position(struct _cef_post_data_stream_t *self) { } int CEF_CALLBACK -post_data_stream_is_chunked(struct _cef_post_data_stream_t *self) { +post_data_stream_is_chunked(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -147,7 +149,7 @@ post_data_stream_is_chunked(struct _cef_post_data_stream_t *self) { } int CEF_CALLBACK -post_data_stream_has_null_source(struct _cef_post_data_stream_t *self) { +post_data_stream_has_null_source(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -162,7 +164,7 @@ post_data_stream_has_null_source(struct _cef_post_data_stream_t *self) { return _retval; } -int CEF_CALLBACK post_data_stream_is_eof(struct _cef_post_data_stream_t *self) { +int CEF_CALLBACK post_data_stream_is_eof(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -178,7 +180,7 @@ int CEF_CALLBACK post_data_stream_is_eof(struct _cef_post_data_stream_t *self) { } int CEF_CALLBACK -post_data_stream_is_in_memory(struct _cef_post_data_stream_t *self) { +post_data_stream_is_in_memory(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -193,7 +195,7 @@ post_data_stream_is_in_memory(struct _cef_post_data_stream_t *self) { return _retval; } -void CEF_CALLBACK post_data_stream_reset(struct _cef_post_data_stream_t *self) { +void CEF_CALLBACK post_data_stream_reset(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING DCHECK(self); @@ -205,7 +207,7 @@ void CEF_CALLBACK post_data_stream_reset(struct _cef_post_data_stream_t *self) { CefPostDataStreamCppToC::Get(self)->Reset(); } -} // namespace +} // namespace // CONSTRUCTOR - Do not edit by hand. @@ -228,14 +230,16 @@ CefPostDataStreamCppToC::~CefPostDataStreamCppToC() {} template <> CefRefPtr CefCppToCRefCounted< - CefPostDataStreamCppToC, CefPostDataStream, + CefPostDataStreamCppToC, + CefPostDataStream, cef_post_data_stream_t>::UnwrapDerived(CefWrapperType type, - cef_post_data_stream_t *s) { + cef_post_data_stream_t* s) { DCHECK(false) << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCppToCRefCounted::kWrapperType = WT_POST_DATA_STREAM; diff --git a/libcef_dll/cpptoc/preference_manager_cpptoc.cc b/libcef_dll/cpptoc/preference_manager_cpptoc.cc index 01ea35160e77f23f493beea28047196b5f0ea07d..e58c8698d183390b2426450ad19f7f26adbfb4ec 100644 --- a/libcef_dll/cpptoc/preference_manager_cpptoc.cc +++ b/libcef_dll/cpptoc/preference_manager_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5110030008d3b52ee74e5c9a6e047e191588ebf8$ +// $hash=ea61753d9dc6c4e0e95db78e2f0d07ab0d65c769$ // #include "libcef_dll/cpptoc/preference_manager_cpptoc.h" diff --git a/libcef_dll/cpptoc/preference_manager_cpptoc.h b/libcef_dll/cpptoc/preference_manager_cpptoc.h index 08f75f0eecc25ab871b1c406c923bcb61742deda..8c0a634225ae53c7d9d492d951c2f109754999e3 100644 --- a/libcef_dll/cpptoc/preference_manager_cpptoc.h +++ b/libcef_dll/cpptoc/preference_manager_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b8667a15b4c31df35c7a50773540ac53c9fe8c11$ +// $hash=1a942f4b4935d0c3741ca58c3dc84c6c365827c6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PREFERENCE_MANAGER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/preference_registrar_cpptoc.cc b/libcef_dll/cpptoc/preference_registrar_cpptoc.cc index ee869790b8da85f2770d92ee32e81880ef40609a..65241b39c34784ac55df348db984e6489a30baa3 100644 --- a/libcef_dll/cpptoc/preference_registrar_cpptoc.cc +++ b/libcef_dll/cpptoc/preference_registrar_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f41c3e1766a3ac8694ee2bebc94e6e31b8a2c624$ +// $hash=5b964d4de1850160f24a5cc43d4d51bc622cc546$ // #include "libcef_dll/cpptoc/preference_registrar_cpptoc.h" diff --git a/libcef_dll/cpptoc/preference_registrar_cpptoc.h b/libcef_dll/cpptoc/preference_registrar_cpptoc.h index 5ff210cfb3674d306c06d87516a92ede15e47d39..897a1992a5971417cb60cf415b8b05193f39a1be 100644 --- a/libcef_dll/cpptoc/preference_registrar_cpptoc.h +++ b/libcef_dll/cpptoc/preference_registrar_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fe9a8951eb40a0dd12f1c63f2095bd364549036e$ +// $hash=a276311e31965315ceb5e7f293eaee8140a79acb$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PREFERENCE_REGISTRAR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc index dde4a582e25f0b19ac556e90d0f5d99d8ab4f83e..f72391b3a488c483e49d1089b729a6f23671ace4 100644 --- a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1533c52a82d41b1c4017ee38ca7a8becbd10db55$ +// $hash=c70076350cd4523b0506236e187e3b3320a9dc5f$ // #include "libcef_dll/cpptoc/print_dialog_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h index 0117ce9e77926dbac353209b6be2fc24acc347f4..281ef13984eb884441b7bd576e185063fcd147f3 100644 --- a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=14fd899b8692208f60a5c9944be4c9f8ead0d8f3$ +// $hash=ee6fd2ddae3899be82feca1e37cce919363bae99$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PRINT_DIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_handler_cpptoc.cc b/libcef_dll/cpptoc/print_handler_cpptoc.cc index 51b8caa1050161fcd9ca54c39f8d71154830f995..58d74d6e2823926455d947c229bbfffe1c518ce9 100644 --- a/libcef_dll/cpptoc/print_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/print_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=495825d5c3d119323101d93eac3fd25bfa905c97$ +// $hash=2249e1f0ad86dad3cfac6755c79e3a114d11f4f9$ // #include "libcef_dll/cpptoc/print_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/print_handler_cpptoc.h b/libcef_dll/cpptoc/print_handler_cpptoc.h index 4604819c0dad243cbc95bd929a382e54673d3489..f2d71b3cc5f527ea25b936e8055fd196f060dd37 100644 --- a/libcef_dll/cpptoc/print_handler_cpptoc.h +++ b/libcef_dll/cpptoc/print_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=734387e01bf9c7366f0d381012fceeecd54e006a$ +// $hash=cd0bb4e9c12f53896be544b28ae3c6f38b3504e2$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_job_callback_cpptoc.cc b/libcef_dll/cpptoc/print_job_callback_cpptoc.cc index 6e211d3aec593c382305f824b033c5560659944e..e204873ffd952c1d864a2e9bea78a1ce286cb288 100644 --- a/libcef_dll/cpptoc/print_job_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/print_job_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a979ef695456cdadfd9399450125835802815622$ +// $hash=282e8760f3b06ad59158a4c07b8f44932e827b1d$ // #include "libcef_dll/cpptoc/print_job_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/print_job_callback_cpptoc.h b/libcef_dll/cpptoc/print_job_callback_cpptoc.h index badda3c9a47c13e9f7513373db8da5b6b9fef338..cc5901085d0eb8edcb4a0406628ad9655e7a523d 100644 --- a/libcef_dll/cpptoc/print_job_callback_cpptoc.h +++ b/libcef_dll/cpptoc/print_job_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c820feffc1f482b3e9ac0eb5731c63aacb730f31$ +// $hash=54a355e9511b5d0956f1a7269ee21766fa7f8c87$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PRINT_JOB_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_settings_cpptoc.cc b/libcef_dll/cpptoc/print_settings_cpptoc.cc index 50e4f16f56f0098c30154426392723be1442c099..70e17b2e17afa63c9eaae4861e832bb0cf290f51 100644 --- a/libcef_dll/cpptoc/print_settings_cpptoc.cc +++ b/libcef_dll/cpptoc/print_settings_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=05dab6ef5ea0be5caa908b8ba26bafdb4ac23579$ +// $hash=8f43b6d00d772cb989a29bba70187f9df04ab0bf$ // #include "libcef_dll/cpptoc/print_settings_cpptoc.h" diff --git a/libcef_dll/cpptoc/print_settings_cpptoc.h b/libcef_dll/cpptoc/print_settings_cpptoc.h index cc54703028795b6ff31148c6996f10f0bee5a19a..c7ece39229d0d2626d17c573b42c03e0658d8e82 100644 --- a/libcef_dll/cpptoc/print_settings_cpptoc.h +++ b/libcef_dll/cpptoc/print_settings_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=157306c7a1b1456efa162022cd735f116cebb137$ +// $hash=596144335f97b41394808d0de0908c2a69d04d7a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PRINT_SETTINGS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/process_message_cpptoc.cc b/libcef_dll/cpptoc/process_message_cpptoc.cc index 5f7d0a92aee9a39832f8f79d2fc558ac6f263e06..4a5830afed4e2a35188f5dd9f10996c9934510ab 100644 --- a/libcef_dll/cpptoc/process_message_cpptoc.cc +++ b/libcef_dll/cpptoc/process_message_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c4acfa4481c1cacdf226d5a13ce7bbd4f418f2a2$ +// $hash=f422c73d022a8794c0cbb01f4bb3fbb2a3f7e045$ // #include "libcef_dll/cpptoc/process_message_cpptoc.h" diff --git a/libcef_dll/cpptoc/process_message_cpptoc.h b/libcef_dll/cpptoc/process_message_cpptoc.h index c9442eec947afb60468dd987338b554737e5a5a1..e3f248589385877647313e966823c3614ee6b508 100644 --- a/libcef_dll/cpptoc/process_message_cpptoc.h +++ b/libcef_dll/cpptoc/process_message_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=09a4c3f325ceb7bf873b8abd1a2751591ecc5fb0$ +// $hash=6d4c104d51d4d34c0ec8b767a13db58a6fb0fef8$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_PROCESS_MESSAGE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.cc b/libcef_dll/cpptoc/read_handler_cpptoc.cc index 4b64751fb785d1ea6e43a007cb8ed615035b3d46..3173e51ba1d1ad69d13cf88a8ba93ad7db7578db 100644 --- a/libcef_dll/cpptoc/read_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/read_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7ae8cf4e9bc3ab6c56ff6f736ff37817f1732e0d$ +// $hash=d9cda583bea7df6ee7b9297e4187b37b5c3cc30a$ // #include "libcef_dll/cpptoc/read_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.h b/libcef_dll/cpptoc/read_handler_cpptoc.h index 99a5668b30add4265093fe71b08be387bdf406db..4c4ddc6ee32763aad48daaf105060b29ae0536e1 100644 --- a/libcef_dll/cpptoc/read_handler_cpptoc.h +++ b/libcef_dll/cpptoc/read_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=62f5b46b42f77a4a5b5b1b99098b81a579cf89c5$ +// $hash=8a5eb8ffc9a8857ac10a6586e954dc532d10618a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/registration_cpptoc.cc b/libcef_dll/cpptoc/registration_cpptoc.cc index 29e9b7eb9c68aa2c13f7f199e759367ec3b66513..0f0733af6cc1067252815e73dceedab2304beb7f 100644 --- a/libcef_dll/cpptoc/registration_cpptoc.cc +++ b/libcef_dll/cpptoc/registration_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8cf2a5a19e594d9077fcb95667c836a0f51d8770$ +// $hash=b8ae4bec56faeb74fd5ddad0cacb053a17babc08$ // #include "libcef_dll/cpptoc/registration_cpptoc.h" diff --git a/libcef_dll/cpptoc/registration_cpptoc.h b/libcef_dll/cpptoc/registration_cpptoc.h index 380c2b44f32e6a51c182631c3b7d0d0815c859ed..8fd4ce15dc226fa08411aa87f963064ab79d4045 100644 --- a/libcef_dll/cpptoc/registration_cpptoc.h +++ b/libcef_dll/cpptoc/registration_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3f1fc9e6617947d54c528bbb465b84fb13162311$ +// $hash=461d6b9297ebd61bf8d2df2e3960458a9a3705f6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_REGISTRATION_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.cc b/libcef_dll/cpptoc/render_handler_cpptoc.cc index 9e52eae9d2e7aae60721b43b44a74a83b1d50bb2..3aa3bd291c14b35f82f91594c7180d528d9fa56f 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_handler_cpptoc.cc @@ -1068,53 +1068,6 @@ render_handler_release_resize_hold(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser)); } -void CEF_CALLBACK render_handler_on_update_text_input_state_called( - struct _cef_render_handler_t* self, - cef_browser_t* browser, - const cef_string_t* text, - const cef_range_t* selected_range, - const cef_range_t* compositon_range) { - shutdown_checker::AssertNotShutdown(); - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - DCHECK(self); - if (!self) { - return; - } - // Verify param: browser; type: refptr_diff - DCHECK(browser); - if (!browser) { - return; - } - // Verify param: text; type: string_byref_const - DCHECK(text); - if (!text) { - return; - } - // Verify param: selected_range; type: simple_byref_const - DCHECK(selected_range); - if (!selected_range) { - return; - } - // Verify param: compositon_range; type: simple_byref_const - DCHECK(compositon_range); - if (!compositon_range) { - return; - } - - // Translate param: selected_range; type: simple_byref_const - CefRange selected_rangeVal = selected_range ? *selected_range : CefRange(); - // Translate param: compositon_range; type: simple_byref_const - CefRange compositon_rangeVal = - compositon_range ? *compositon_range : CefRange(); - - // Execute - CefRenderHandlerCppToC::Get(self)->OnUpdateTextInputStateCalled( - CefBrowserCToCpp::Wrap(browser), CefString(text), selected_rangeVal, - compositon_rangeVal); -} - void CEF_CALLBACK render_handler_get_word_selection(struct _cef_render_handler_t* self, cef_browser_t* browser, @@ -1243,6 +1196,53 @@ render_handler_on_overlay_state_changed(struct _cef_render_handler_t* self, CefBrowserCToCpp::Wrap(browser), cef_screen_rectVal); } +void CEF_CALLBACK render_handler_on_update_text_input_state_called( + struct _cef_render_handler_t* self, + cef_browser_t* browser, + const cef_string_t* text, + const cef_range_t* selected_range, + const cef_range_t* compositon_range) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) { + return; + } + // Verify param: text; type: string_byref_const + DCHECK(text); + if (!text) { + return; + } + // Verify param: selected_range; type: simple_byref_const + DCHECK(selected_range); + if (!selected_range) { + return; + } + // Verify param: compositon_range; type: simple_byref_const + DCHECK(compositon_range); + if (!compositon_range) { + return; + } + + // Translate param: selected_range; type: simple_byref_const + CefRange selected_rangeVal = selected_range ? *selected_range : CefRange(); + // Translate param: compositon_range; type: simple_byref_const + CefRange compositon_rangeVal = + compositon_range ? *compositon_range : CefRange(); + + // Execute + CefRenderHandlerCppToC::Get(self)->OnUpdateTextInputStateCalled( + CefBrowserCToCpp::Wrap(browser), CefString(text), selected_rangeVal, + compositon_rangeVal); +} + void CEF_CALLBACK render_handler_get_visible_viewport_rect(struct _cef_render_handler_t* self, cef_browser_t* browser, @@ -1396,12 +1396,12 @@ CefRenderHandlerCppToC::CefRenderHandlerCppToC() { GetStruct()->notify_select_all_clicked = render_handler_notify_select_all_clicked; GetStruct()->release_resize_hold = render_handler_release_resize_hold; - GetStruct()->on_update_text_input_state_called = - render_handler_on_update_text_input_state_called; GetStruct()->get_word_selection = render_handler_get_word_selection; GetStruct()->create_overlay = render_handler_create_overlay; GetStruct()->on_overlay_state_changed = render_handler_on_overlay_state_changed; + GetStruct()->on_update_text_input_state_called = + render_handler_on_update_text_input_state_called; GetStruct()->get_visible_viewport_rect = render_handler_get_visible_viewport_rect; GetStruct()->on_resize_scrollable_viewport = diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.h b/libcef_dll/cpptoc/render_handler_cpptoc.h index 9108e1a6df57c1c4ca56aa14b8024333ea97c795..f56251d7d1e9b7bf088ca10f7557a6b9c473352f 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.h +++ b/libcef_dll/cpptoc/render_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6a6d0204cb5026cc33f1cbd8ff0acd895e29251b$ +// $hash=a0cdfb84f8b30f01dd01556ad3e1725e043641e0$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc b/libcef_dll/cpptoc/render_process_handler_cpptoc.cc index 203529aa44c461607500196133090b34ef321350..253e450084b65edb5ad7ef40bd9363a10ac47eaa 100644 --- a/libcef_dll/cpptoc/render_process_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/render_process_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=56ccd4e409a0567c10ffcdebcb3ab932cdec6db3$ +// $hash=41a3981a7d293d6a13bba9961192d4fc7f0a49f1$ // #include "libcef_dll/cpptoc/render_process_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.h b/libcef_dll/cpptoc/render_process_handler_cpptoc.h index 4c1afb73ae03b207d330d39262e19c1458d6c143..124c4a5092987f596ec0e98db1d701ad1d08c2de 100644 --- a/libcef_dll/cpptoc/render_process_handler_cpptoc.h +++ b/libcef_dll/cpptoc/render_process_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=16d377c5729676965a410975785c17b4135ec914$ +// $hash=1686827d48e7c0d75a603a2b6b8ca05b4f158340$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RENDER_PROCESS_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_context_cpptoc.cc b/libcef_dll/cpptoc/request_context_cpptoc.cc index 7030402a7ea9a1f53aec0092a6b6aecbfab44fed..0f948d0d0c5f467fac1376c95d795936045de1d2 100644 --- a/libcef_dll/cpptoc/request_context_cpptoc.cc +++ b/libcef_dll/cpptoc/request_context_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=629bcc872425bb45693b56b5f7c9f4370b3470c2$ +// $hash=a1aca55148db4e8e67f526d000806124755da3f0$ // #include "libcef_dll/cpptoc/request_context_cpptoc.h" diff --git a/libcef_dll/cpptoc/request_context_cpptoc.h b/libcef_dll/cpptoc/request_context_cpptoc.h index aa2a733ccfd3437e0ee4b08ffadf6e099864dbe7..f798fefbaecc24be5334830da380ae954cff6ca1 100644 --- a/libcef_dll/cpptoc/request_context_cpptoc.h +++ b/libcef_dll/cpptoc/request_context_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5379a792e39ce0e28134466a0a9763ba500fb27c$ +// $hash=07ccff0f6993fe1634467a76d9996081fca0ec3a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_context_handler_cpptoc.cc b/libcef_dll/cpptoc/request_context_handler_cpptoc.cc index 4c2606c17f787ed6a5608d7d646520a4a6806ba7..3497eb597bf0f0113623945911a86866b99cac27 100644 --- a/libcef_dll/cpptoc/request_context_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_context_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=421e76811e2c25380f6a1044e4c46d31aebf41b3$ +// $hash=c247859a657da56e23b37918bd647b81c5ae316c$ // #include "libcef_dll/cpptoc/request_context_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/request_context_handler_cpptoc.h b/libcef_dll/cpptoc/request_context_handler_cpptoc.h index f2fcda958854b7bb92cc332ec223c5c23af8a50a..7a002b9517cb56620fa7d020b38c9c5484481a06 100644 --- a/libcef_dll/cpptoc/request_context_handler_cpptoc.h +++ b/libcef_dll/cpptoc/request_context_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=27aa97d4761de0b6b2620f5d567b02772ca85b40$ +// $hash=0985ec29d8f7825abf5542f7bff3a0477431fc1a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.cc b/libcef_dll/cpptoc/request_handler_cpptoc.cc index e4eda99fa20b266313ffc274c77de3a598fb162e..734cde03d9f78c3f7c01c36bbc3e351f002d0114 100644 --- a/libcef_dll/cpptoc/request_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/request_handler_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d62fbf1af312a46028926e2367f4e097043c6fc0$ +// $hash=347f22333bbd52effefb8aaf6c97c91bb74e3211$ // #include "libcef_dll/cpptoc/request_handler_cpptoc.h" @@ -564,6 +564,34 @@ void CEF_CALLBACK request_handler_on_render_process_responding( CefBrowserCToCpp::Wrap(browser)); } +void CEF_CALLBACK +request_handler_on_update_target_url(struct _cef_request_handler_t* self, + cef_browser_t* browser, + const cef_string_t* url) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: browser; type: refptr_diff + DCHECK(browser); + if (!browser) { + return; + } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return; + } + + // Execute + CefRequestHandlerCppToC::Get(self)->OnUpdateTargetURL( + CefBrowserCToCpp::Wrap(browser), CefString(url)); +} + } // namespace // CONSTRUCTOR - Do not edit by hand. @@ -590,6 +618,7 @@ CefRequestHandlerCppToC::CefRequestHandlerCppToC() { request_handler_on_render_process_not_responding; GetStruct()->on_render_process_responding = request_handler_on_render_process_responding; + GetStruct()->on_update_target_url = request_handler_on_update_target_url; } // DESTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.h b/libcef_dll/cpptoc/request_handler_cpptoc.h index f7dceeb2eb1a4e3bd9b1978a504ee55a667969fd..04a8b9cb8d90fa1ee2b4e3e55a4dceb8ca7037fa 100644 --- a/libcef_dll/cpptoc/request_handler_cpptoc.h +++ b/libcef_dll/cpptoc/request_handler_cpptoc.h @@ -27,11 +27,12 @@ // Wrap a C++ class with a C structure. // This class may be instantiated and accessed wrapper-side only. class CefRequestHandlerCppToC - : public CefCppToCRefCounted { -public: + public: CefRequestHandlerCppToC(); virtual ~CefRequestHandlerCppToC(); }; -#endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ +#endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resolve_callback_cpptoc.cc b/libcef_dll/cpptoc/resolve_callback_cpptoc.cc index 489d780a1103532ac1030cb1d017383941e5655e..17548f258c1640c6d75749ab72dfb67872620344 100644 --- a/libcef_dll/cpptoc/resolve_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resolve_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=38eaa64d351352f888b318541aae316ac74938e6$ +// $hash=e71369876af6d78b7f94e54b7ea5cf19c091a12a$ // #include "libcef_dll/cpptoc/resolve_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/resolve_callback_cpptoc.h b/libcef_dll/cpptoc/resolve_callback_cpptoc.h index c5f1aa36ac783e895eac016cbe5b96c7daa9d7b1..cd35ce3d73963c8abd85fd4775ebd4021ee3acb4 100644 --- a/libcef_dll/cpptoc/resolve_callback_cpptoc.h +++ b/libcef_dll/cpptoc/resolve_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=126d8e0f4b9269383278c95c0cbcbd85c439737f$ +// $hash=aea5c318f99d23b06478b765f81720890aa098b3$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOLVE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_bundle_cpptoc.cc b/libcef_dll/cpptoc/resource_bundle_cpptoc.cc index c2c90b709a342556fb579cf56987e7ae03b57239..81e78d5fb4e124d507c587322a3c498466dc0c47 100644 --- a/libcef_dll/cpptoc/resource_bundle_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_bundle_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c042434f69811156a0ccfa21625d66790215003a$ +// $hash=fc8189d4a430b02f6de35a53188be505db59bfa4$ // #include "libcef_dll/cpptoc/resource_bundle_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_bundle_cpptoc.h b/libcef_dll/cpptoc/resource_bundle_cpptoc.h index e29642cc15dda49ac3717fb07e7ed8854e84e42d..8102bff0994ea1654b8f37f4a6040ec47d1a8ffd 100644 --- a/libcef_dll/cpptoc/resource_bundle_cpptoc.h +++ b/libcef_dll/cpptoc/resource_bundle_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=680b8597180bd2229941a8aa45717831da0dea21$ +// $hash=c126e6379765b577e7251c418bd3fe4dbe392522$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc index 947c434eb112a3b6fd37a195833502c4bfb6b521..513378416d31124fa3e4f6d108baefcb6b34355a 100644 --- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2579eb0e6c593fb14e8beedeb457d27fd7a09acb$ +// $hash=7f625b08e4c82a608dd7178b571f80fce5fe0d70$ // #include "libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h index ecebe89d31f0695d945fb1c6dfb9e82603a2ad1a..3b74d91484943f16823bcae3a3f7098fbe88ca15 100644 --- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h +++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ff67042fe191ba3827ee755b494972972d22dbed$ +// $hash=f6e9e2a12912ea7b9ab5060481e323c180698725$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_handler_cpptoc.cc index 8574c0d969893d9bfdb5dc477ad5ba32b44d4793..e49502bba82f32ddf070ecca0d44faaa032bb4c0 100644 --- a/libcef_dll/cpptoc/resource_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=542ae4ff393e8f1906afbf35e79b236c80913c57$ +// $hash=ec0ed100e05a34f1f7909e93d8f6f3e8aaadbeaf$ // #include "libcef_dll/cpptoc/resource_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.h b/libcef_dll/cpptoc/resource_handler_cpptoc.h index e496ba3159708273e71271d71c256ccea9d366a4..fc57f6477248cc9c5b642af4fd291083212becc6 100644 --- a/libcef_dll/cpptoc/resource_handler_cpptoc.h +++ b/libcef_dll/cpptoc/resource_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4f5c152abb8c59af2ab356ac3d6fe098076a1afc$ +// $hash=3853a8b89137fdd6c71bc86f801536517bde7c88$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOURCE_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc b/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc index 090fa00d5d365820cc1ceab1b77dfb95d95c971c..cb55e8d8fc999dba3a17bde43d5f0bd45313f2ff 100644 --- a/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_read_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b9b9b946e6bfd1e99cef80668bcfb1572da40109$ +// $hash=c7fa8f548cc0e606e09fe76532b3d2bc19473b16$ // #include "libcef_dll/cpptoc/resource_read_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_read_callback_cpptoc.h b/libcef_dll/cpptoc/resource_read_callback_cpptoc.h index 5b68e7fd73c5b97f3ec160856d5d8360ebf69363..f152b5d2b300cec2c0f636361a67c14f0e66aaf5 100644 --- a/libcef_dll/cpptoc/resource_read_callback_cpptoc.h +++ b/libcef_dll/cpptoc/resource_read_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=56241f7ea6cbaba43531879a37fdf20607478f4f$ +// $hash=f5efbaafb5a54dfb9deb422cf31a0908c8a4cfc3$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOURCE_READ_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc b/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc index 7aa2106a167b5241550c2d4255cb1bb6e7591cb3..bd8af2636d87ba85f38488a6a1e1caacd179e5c2 100644 --- a/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_request_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9fdaf3258539b98a1795f5b590719f513d86dbc0$ +// $hash=b508744274495630cce72e1febb2503552ba9379$ // #include "libcef_dll/cpptoc/resource_request_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_request_handler_cpptoc.h b/libcef_dll/cpptoc/resource_request_handler_cpptoc.h index 7a95ca4dc0ea4e46a1d84354819a06ecd65a96d5..7010001717ec1d8ba6b07657f0953edb38c388c3 100644 --- a/libcef_dll/cpptoc/resource_request_handler_cpptoc.h +++ b/libcef_dll/cpptoc/resource_request_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a33d4ac4b108b25bb693f98288ada4996b2a4cbb$ +// $hash=0b8d614a76b9027970354dc850f7b491348a2941$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOURCE_REQUEST_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc b/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc index d3207bc9f2d8d19a438b04990e035d716dc606bd..ac23118f5b7c9f855593b822dff91fa111b58f30 100644 --- a/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/resource_skip_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a8c379b0e1038da0ee479aacbf82770fcfb168ef$ +// $hash=bff1a6490007bd43ac28f862bcc145e3b385b1ca$ // #include "libcef_dll/cpptoc/resource_skip_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/resource_skip_callback_cpptoc.h b/libcef_dll/cpptoc/resource_skip_callback_cpptoc.h index 2cfe522e99ad06b695450a0f6b32dd6583ab0b98..d7a82710cc2a30e33b9e7ac056b22140e369f96a 100644 --- a/libcef_dll/cpptoc/resource_skip_callback_cpptoc.h +++ b/libcef_dll/cpptoc/resource_skip_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a73113bc95cf45afc20140f58afc2880603a1227$ +// $hash=5e756fb08a289333025a894573332555a1ab8e1f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESOURCE_SKIP_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/response_cpptoc.cc b/libcef_dll/cpptoc/response_cpptoc.cc index 4ab4d065b7790ff9ff215009b45f4e71a28853b2..ee44c1dc2040756b6c98452d2cdfa77bc4b8aa9e 100644 --- a/libcef_dll/cpptoc/response_cpptoc.cc +++ b/libcef_dll/cpptoc/response_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=933874b8504a839ed1fe1c7b2b227ee626026b18$ +// $hash=f0c69112a4eba6862aa54a4df7fa10f7e361edf7$ // #include "libcef_dll/cpptoc/response_cpptoc.h" diff --git a/libcef_dll/cpptoc/response_cpptoc.h b/libcef_dll/cpptoc/response_cpptoc.h index 2ba8b950ecbf1b28632e037063cacbfdd9f5c1d0..b84c6990b56dcc89751e980a6b3325392b1f6804 100644 --- a/libcef_dll/cpptoc/response_cpptoc.h +++ b/libcef_dll/cpptoc/response_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3ad9d070640c2ed3356e097271d25834e7a3233c$ +// $hash=624d1cb515a9f5f44d6e63574021689ccfe09b76$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESPONSE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/response_filter_cpptoc.cc b/libcef_dll/cpptoc/response_filter_cpptoc.cc index 94552e1abf4dcdad908559fd2e179ecf36cd5e30..faac2507cc5deebb22673c71dd7122a5e5fd9dcb 100644 --- a/libcef_dll/cpptoc/response_filter_cpptoc.cc +++ b/libcef_dll/cpptoc/response_filter_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=629b9806c669143f394532d2eeac7a2d20176d01$ +// $hash=403513566867d0fd85166242648f269fac987ca5$ // #include "libcef_dll/cpptoc/response_filter_cpptoc.h" diff --git a/libcef_dll/cpptoc/response_filter_cpptoc.h b/libcef_dll/cpptoc/response_filter_cpptoc.h index b8a724f34fba3db34146308b3f0d9bc4958801f9..c17599dcf97cfc2fb7f846035eb5fe8a6a7a2d31 100644 --- a/libcef_dll/cpptoc/response_filter_cpptoc.h +++ b/libcef_dll/cpptoc/response_filter_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1d1ff296af7d4d1730fa55da77925e14df7b0a22$ +// $hash=55d4dc0a6467d6d084de5e1114be0fcd36ae89b9$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RESPONSE_FILTER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc index 92f5697f7edadd987d40c799d9cf6d9b2f29638a..171da8a2aa47e24b643f34b29947dcef1f1c1c8c 100644 --- a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7327e012cab865c3792271a8f305410b013bdd40$ +// $hash=e0ae5295de1a999b825687b01fcb494d2901dacc$ // #include "libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h index 3a0a7d02e5506962920e40b573ac0ad3612bd95c..954af2789749fc2e71aebeecc180e315ba7158ac 100644 --- a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h +++ b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=33a2f74d8d7badd1a4afd128f6faa80df6178d74$ +// $hash=a41928b718004e3e8cc92ba620b20f76ad9181b7$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RUN_CONTEXT_MENU_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc index b309a6505c81d4cebb98c69a0d4cfabde493be8f..eb2e83c7ebdb79fb6af7d42c64895be162b175ec 100644 --- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=894fb10f707d9b251266123da81e11c9bbb7581b$ +// $hash=e55e25cbcc3f016810209ddad7d351f021306820$ // #include "libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h index 2e7f0270eae639363cddd98b9505f600811ae266..c5dac2e3f32eea9bb44b3f8c5fbd705d7e279c90 100644 --- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d9fdaabdad6acb4e2f22f1660eb60975d95935a8$ +// $hash=7f45e5e5b3772e10b2eb6901c3e27e835a873163$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RUN_FILE_DIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc b/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc index 31b24be4d51593a32c114f6b84f64f6bdae1ff2c..d9f5969e258670214143f830348359753f5c3152 100644 --- a/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=879db251d13b259193368bd1605802ea4fe7441e$ +// $hash=005e5ae02a04bc6fdd626063b1f83e465e21e498$ // #include "libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h b/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h index 2bb4bb97a3a6afc4316ae788cf25ca391f2902fc..b8fa640fd29279d82992fd80978a46b7e3cc97b3 100644 --- a/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h +++ b/libcef_dll/cpptoc/run_quick_menu_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d55126b0440c4afac639e03003f8ef7772636fe5$ +// $hash=acc845289f80273062c7fde7d81e0c034a80f4e1$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_RUN_QUICK_MENU_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc index 17abe9ec19b9b0947f222c3fb34a5c4987dd3c79..0ca3d6c1f2cafcb2b65b4888926a65c58fe01701 100644 --- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc +++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0e2aa65ff279e6c61cb4314b4ff483ef3a0ae3fd$ +// $hash=6220412461641a8ca21d4b521f3eb9e7db3ccb63$ // #include "libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h" diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h index 0005c8e79680786b3372e1950c8d2b134c84ad05..75daf7c15c851e12a854b3ff4d23f8ff9aa38c0d 100644 --- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h +++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=275be2d3bb857986d786656c9eeb65a705520362$ +// $hash=746b9d06b417c9730fa98fa456a08e5c53e5475b$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc b/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc index b22e35c14d2695c04573aef6053636267179961c..d259652b9e4fb9ae1b86d7ee1751b3bb94ba54aa 100644 --- a/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc +++ b/libcef_dll/cpptoc/scheme_registrar_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=aace8e3c73bf27dfc7e2ba38cb022d76a370bee9$ +// $hash=850c94d117e9f4b80bc46f8748e0c278c8ef1dcb$ // #include "libcef_dll/cpptoc/scheme_registrar_cpptoc.h" diff --git a/libcef_dll/cpptoc/scheme_registrar_cpptoc.h b/libcef_dll/cpptoc/scheme_registrar_cpptoc.h index c83efd38db152b256f31106d23d81e083eb8a757..3966e2167ad34e01e27c6f30cd545bdc80bd5ac6 100644 --- a/libcef_dll/cpptoc/scheme_registrar_cpptoc.h +++ b/libcef_dll/cpptoc/scheme_registrar_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d40fc5409c24633cb4c5a0b0777219fb7fc53be3$ +// $hash=92c5fb1f7d14753510b029f71579a26970f0304c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.cc b/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.cc index f71e56b3064162b0a8ba3a4f63b21e72137bc9ce..52d68e119be7e67534f9bcd17722df6ec518bb51 100644 --- a/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.cc +++ b/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c1c348c86dc5b1174e917a8fcd8fcfb68d2a555a$ +// $hash=3b85faa76b1263a62eb65415e5e2f6723e56b6a6$ // #include "libcef_dll/cpptoc/screen_capture_access_request_cpptoc.h" diff --git a/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.h b/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.h index ea1db986ab0e251ed5a9fc8203618cd756f3b287..bb699d3b1e19a24e5a1d40734468b4f2d51b56ce 100644 --- a/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.h +++ b/libcef_dll/cpptoc/screen_capture_access_request_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8344e6e745fb2a5d8f6c4feae5fbce888bbf02d7$ +// $hash=d059324ae31a198fd6f29c27f839fbde0e49814e$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SCREEN_CAPTURE_ACCESS_REQUEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc index 34d4675192173fde47025ea9443b0379b5e78157..faf3862f724f3a43abdfead464f59bab308431d7 100644 --- a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f6a610c87ad81581de761abe2e1c08332d81ac42$ +// $hash=1011d1dc6f6567893af73aeace1a7d3bb38fde44$ // #include "libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h index 033d6cf6723b3e40cd419dd0014dcf8da8980af1..34cc05d56dfcae8b63ef1010f49667deccdc0985 100644 --- a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h +++ b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=90c308dfc448a612faa596e9c7b0a6721e1e9921$ +// $hash=31869f5383d73caf6fa9b3fede9f2e47f54a01ae$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SELECT_CLIENT_CERTIFICATE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/select_popup_callback_cpptoc.cc b/libcef_dll/cpptoc/select_popup_callback_cpptoc.cc index 2830767d6caef86ae80fb60657d0cd919b324e2f..e985996ac5665be934ec2a535b4e7b999b97b66e 100644 --- a/libcef_dll/cpptoc/select_popup_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/select_popup_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c333c270503528a3318f3e9a538540b3eb3f0d61$ +// $hash=ef53fc90246794c6555e8e21c0cc4863e7334e65$ // #include "libcef_dll/cpptoc/select_popup_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/select_popup_callback_cpptoc.h b/libcef_dll/cpptoc/select_popup_callback_cpptoc.h index f63bfc1881976a4cec5948594f3a95264e3845f0..75c11dffe90f183473ef4b945ad3197341415a7f 100644 --- a/libcef_dll/cpptoc/select_popup_callback_cpptoc.h +++ b/libcef_dll/cpptoc/select_popup_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=afc77a6379bf93fb41c82977bfda5e3dd1f436cf$ +// $hash=38cd12caaee1fc018d0fd04eee914774eec7c41c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SELECT_POPUP_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/server_cpptoc.cc b/libcef_dll/cpptoc/server_cpptoc.cc index 06eb2849a6e9574d446b95e0e461994d1251ef1d..8e71aa04f1865559ff4a2c920814e78cacc3af69 100644 --- a/libcef_dll/cpptoc/server_cpptoc.cc +++ b/libcef_dll/cpptoc/server_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=29d3c97a27d778a75f53133e76b20e76fd1849ee$ +// $hash=8c3f680313770151c050a6355b3ec042929ef4b8$ // #include "libcef_dll/cpptoc/server_cpptoc.h" diff --git a/libcef_dll/cpptoc/server_cpptoc.h b/libcef_dll/cpptoc/server_cpptoc.h index f342ea6fa695952c69f33fa1a65b343e4d1e32ec..fd191b03c17c5deacb4c04b97c35d86a43ed6f14 100644 --- a/libcef_dll/cpptoc/server_cpptoc.h +++ b/libcef_dll/cpptoc/server_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0aa0a55c0224b59a63a572515030a27f5206663a$ +// $hash=edf9787173ef035101e1d1805f2926b6028530f8$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SERVER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/server_handler_cpptoc.cc b/libcef_dll/cpptoc/server_handler_cpptoc.cc index 5dad46c0d4bf240c32452a4d137b842c219bf9a3..75b7b077b642b2acca33c0effb6e158f6ed11833 100644 --- a/libcef_dll/cpptoc/server_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/server_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=77b348998f91c4798c6627d9f766b240ec7d7b27$ +// $hash=8708ab56ea13185a17f585bb156114f7825408c1$ // #include "libcef_dll/cpptoc/server_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/server_handler_cpptoc.h b/libcef_dll/cpptoc/server_handler_cpptoc.h index 6db0b2adf26c51a015ce958075e72cd13d1500b8..c452567a21858176a1c08c936c6191bebceed6e2 100644 --- a/libcef_dll/cpptoc/server_handler_cpptoc.h +++ b/libcef_dll/cpptoc/server_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=62aded45d2ae364d6bf4e26bf610793d5578c575$ +// $hash=ba72a7b9571b7e2d9d490a02972855eca1ff987f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SERVER_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc index 85f70854b7da2fb94a68e8c94a8f6dfcaf9f38e8..2ebd6d2023cbfe31b24aa7e793b61d4c5465e91c 100644 --- a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6d16b62196087c29f7fcf39818640fce23a90403$ +// $hash=65a2338d30ce4e012afe4e272f3c04ca65116f94$ // #include "libcef_dll/cpptoc/set_cookie_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h index c90dc7f32acf7b57e1fecbfea2a6af95513adbf7..85c34421bd1d8024405e34f1ac46062e9d330643 100644 --- a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h +++ b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=685bc34995400278c80fe8c481b2c3bd05cc9533$ +// $hash=886b832f912900c89787888566d4d5e803c91ebc$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SET_COOKIE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/set_lock_callback_cpptoc.cc b/libcef_dll/cpptoc/set_lock_callback_cpptoc.cc index cf6cec15cfce9fa3df71af2ac6a679f19692d189..92df42340856d95baf913fc74bff6c3b981171c5 100644 --- a/libcef_dll/cpptoc/set_lock_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/set_lock_callback_cpptoc.cc @@ -20,7 +20,7 @@ namespace { // MEMBER FUNCTIONS - Body may be edited by hand. void CEF_CALLBACK -set_lock_callback_handle(struct _cef_set_lock_callback_t *self, int key) { +set_lock_callback_handle(struct _cef_set_lock_callback_t* self, int key) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -34,7 +34,7 @@ set_lock_callback_handle(struct _cef_set_lock_callback_t *self, int key) { CefSetLockCallbackCppToC::Get(self)->Handle(key ? true : false); } -} // namespace +} // namespace // CONSTRUCTOR - Do not edit by hand. @@ -50,14 +50,16 @@ CefSetLockCallbackCppToC::~CefSetLockCallbackCppToC() { template <> CefRefPtr CefCppToCRefCounted< - CefSetLockCallbackCppToC, CefSetLockCallback, + CefSetLockCallbackCppToC, + CefSetLockCallback, cef_set_lock_callback_t>::UnwrapDerived(CefWrapperType type, - cef_set_lock_callback_t *s) { + cef_set_lock_callback_t* s) { DCHECK(false) << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCppToCRefCounted::kWrapperType = WT_SET_LOCK_CALLBACK; diff --git a/libcef_dll/cpptoc/set_lock_callback_cpptoc.h b/libcef_dll/cpptoc/set_lock_callback_cpptoc.h index 29e806326965c1f4be7f24edd403611ff7c9a510..c3a3485eca375924bcc0f61492c3fdf321d17185 100644 --- a/libcef_dll/cpptoc/set_lock_callback_cpptoc.h +++ b/libcef_dll/cpptoc/set_lock_callback_cpptoc.h @@ -29,11 +29,12 @@ // Wrap a C++ class with a C structure. // This class may be instantiated and accessed wrapper-side only. class CefSetLockCallbackCppToC - : public CefCppToCRefCounted { -public: + public: CefSetLockCallbackCppToC(); virtual ~CefSetLockCallbackCppToC(); }; -#endif // CEF_LIBCEF_DLL_CPPTOC_SET_LOCK_CALLBACK_CPPTOC_H_ +#endif // CEF_LIBCEF_DLL_CPPTOC_SET_LOCK_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc index faf56201c83db5f8e4b0eda864f24ee5f8fb2cbe..fec6067f91dd0214c91398ea31b741d462693a3e 100644 --- a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc +++ b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3e119d2c8c0919dc6f2e0a48deff9d9768a6587a$ +// $hash=9b9187a75a85ff63f2244471af1e54f40eae5a82$ // #include "libcef_dll/cpptoc/shared_memory_region_cpptoc.h" diff --git a/libcef_dll/cpptoc/shared_memory_region_cpptoc.h b/libcef_dll/cpptoc/shared_memory_region_cpptoc.h index da266418a82e6c44d0ca134236b8f9f14e5b14f9..85fc6d5a1f1a956b2b1f759019cf79638a7a4149 100644 --- a/libcef_dll/cpptoc/shared_memory_region_cpptoc.h +++ b/libcef_dll/cpptoc/shared_memory_region_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d665f5b7c98336e8eb00e939a09a7923a2c1585d$ +// $hash=65f87b7ef4fffcdd5fb70969719b9bb8fa4c8a7b$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SHARED_MEMORY_REGION_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc index 2b52c0130076f61e01fa6ef550ebcafa8feeca90..1c56096a4f85b3446ae2e4985681c17f58134dc4 100644 --- a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc +++ b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=592d43a6597f03f91eb13ea9354ed552f581ebec$ +// $hash=820d021d1a2ca4ef4b3fa858f10649676ca46bc8$ // #include "libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h" diff --git a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h index b87471680382e074291f3fd6c00e21f7d6f3d492..442e2e1ac11bebfbc0b93dc3a72460df272e44bd 100644 --- a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h +++ b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4ef4a4db382917878a4cbdd19d44ff13a2329400$ +// $hash=da417f77c868bf40de0bff713b6eb935ffb845ea$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SHARED_PROCESS_MESSAGE_BUILDER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/sslinfo_cpptoc.cc b/libcef_dll/cpptoc/sslinfo_cpptoc.cc index 3b302ce70f1908cfd4694d0cc6d57e64f3d5b15b..265d1f750207d8bd93db8648f3196f6442bf6270 100644 --- a/libcef_dll/cpptoc/sslinfo_cpptoc.cc +++ b/libcef_dll/cpptoc/sslinfo_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f2a5ff61638b56c10e6152b4aff770b98370b912$ +// $hash=2bad9d84eb0e3bc50b938832cae6af38837e5ba7$ // #include "libcef_dll/cpptoc/sslinfo_cpptoc.h" diff --git a/libcef_dll/cpptoc/sslinfo_cpptoc.h b/libcef_dll/cpptoc/sslinfo_cpptoc.h index 6e7f82a71bf58124e55a5a9511db8eb7ff2c2f1a..bb9576808edcada5c891b0795a5e8f03d729027e 100644 --- a/libcef_dll/cpptoc/sslinfo_cpptoc.h +++ b/libcef_dll/cpptoc/sslinfo_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c8abc2c6725f309fac9bb2e013099f63d9b56d56$ +// $hash=2eaaaeef70817cde9783efe192d0f57cb73ddfad$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SSLINFO_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/sslstatus_cpptoc.cc b/libcef_dll/cpptoc/sslstatus_cpptoc.cc index 2ddc7057bd2df896491aedc9384aaed3e6eb0578..e6b6bf2fa349a4df18d9fd10190124a45ac34d8d 100644 --- a/libcef_dll/cpptoc/sslstatus_cpptoc.cc +++ b/libcef_dll/cpptoc/sslstatus_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b23d3f9a53bb2c7020ee4d83adcd0de6f3d4a175$ +// $hash=5c03427a3976bd488c9a90ca0456835b6582f59a$ // #include "libcef_dll/cpptoc/sslstatus_cpptoc.h" diff --git a/libcef_dll/cpptoc/sslstatus_cpptoc.h b/libcef_dll/cpptoc/sslstatus_cpptoc.h index be01444b48db441484534f8fff6a96371226c5d8..4e5379fbd68284c137081a8e79cdc5827057267d 100644 --- a/libcef_dll/cpptoc/sslstatus_cpptoc.h +++ b/libcef_dll/cpptoc/sslstatus_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f7f78edd0d1944a6199aa1e2b1f0b4468e8c12eb$ +// $hash=dba266754e189de39172bddaacf0dfa3fdd79351$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_SSLSTATUS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.cc b/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.cc index 44ef5217172375aca29160ece13bfe28caef2d97..06165f5ed6929ed3b3944d5b19e6726458d6e3db 100644 --- a/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=65f37dad6c38861f661cbd33ba4d01c51e50d873$ +// $hash=dd377f2eb494e643e4246509bb0e7a31b12b5998$ // #include "libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.h b/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.h index d65513f28b49f11e1ceec2bfe1a6b00997101427..3df50719b18f0482e57d917c7c47271eaa0a807c 100644 --- a/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.h +++ b/libcef_dll/cpptoc/store_web_archive_result_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ba2e037c3d34c147e9e042ed1914c2dc22d3c64b$ +// $hash=a9b06d8d2a8a85752732cfdc632a1c67070f2a3a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_STORE_WEB_ARCHIVE_RESULT_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.cc b/libcef_dll/cpptoc/stream_reader_cpptoc.cc index 627d5367c0d866df75f5a4e08a501d968b5e8f70..7e6161938d69fca0d86f6ccc508369acab1d3098 100644 --- a/libcef_dll/cpptoc/stream_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/stream_reader_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bc1f4f7b7a9277ee025b1be0a2b11de1c6a5b962$ +// $hash=a724b525291277cfec5b91bb0986bcac487cdea1$ // #include "libcef_dll/cpptoc/stream_reader_cpptoc.h" diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.h b/libcef_dll/cpptoc/stream_reader_cpptoc.h index 37a9cb2f64225d0a104a76e246dfafb45efd2b5f..d4d5dc5aab651e6e1f604f440722d0093a7308b8 100644 --- a/libcef_dll/cpptoc/stream_reader_cpptoc.h +++ b/libcef_dll/cpptoc/stream_reader_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2443d434d9376b16b38a3356082a7cd7649a9771$ +// $hash=6482aca1d5d2c06d39d226f2d085580abc8eee99$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_STREAM_READER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.cc b/libcef_dll/cpptoc/stream_writer_cpptoc.cc index d28d0e33faf3aa1ad3f433811b81bdb3b583996d..e02ee594e022a6d6579d47fbfa1d4214e61d4ef9 100644 --- a/libcef_dll/cpptoc/stream_writer_cpptoc.cc +++ b/libcef_dll/cpptoc/stream_writer_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f6115343b5a97c98dded1c9ac89c73d2444afbc3$ +// $hash=9e43a166c77c493dfdc85dd795f1fcf1010b4785$ // #include "libcef_dll/cpptoc/stream_writer_cpptoc.h" diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.h b/libcef_dll/cpptoc/stream_writer_cpptoc.h index f0f00c0ed272ff331798ed336447c1821fd3afbd..0a5ed64e89418d4bbb990e0afed5c7a1a7427c47 100644 --- a/libcef_dll/cpptoc/stream_writer_cpptoc.h +++ b/libcef_dll/cpptoc/stream_writer_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=72c90d89429ae008178f6b8b790897c36da76029$ +// $hash=7b95fc6bea4023038075ee6712eaceb6c0a153a8$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_STREAM_WRITER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.cc b/libcef_dll/cpptoc/string_visitor_cpptoc.cc index a8e5fd73d785b737773f1cbd75c2287b49363500..e1a25412d25d0170566ef76add232d4f9fd67e74 100644 --- a/libcef_dll/cpptoc/string_visitor_cpptoc.cc +++ b/libcef_dll/cpptoc/string_visitor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=15ed98715c71448aa3bd8b0142920f21a418d08b$ +// $hash=5f35fe588faecf26ddcc03d51c7a2b655cbd773e$ // #include "libcef_dll/cpptoc/string_visitor_cpptoc.h" diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.h b/libcef_dll/cpptoc/string_visitor_cpptoc.h index e66896921e59202c0565eea9fc3afc08da1edf5c..86a2b46fbd7f49b6d87f3303231307d23fc68505 100644 --- a/libcef_dll/cpptoc/string_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/string_visitor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a96933ea713dea958a9cc3fb7a648ee75055078b$ +// $hash=8f717e4df178cef8f90d5af081094a4952fcc90e$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_STRING_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/task_cpptoc.cc b/libcef_dll/cpptoc/task_cpptoc.cc index cc8f64e5c3d3b27571d47375d9247aa27e71d2bb..eb71797639cbf19c0df912eff6b5c4e66dde3296 100644 --- a/libcef_dll/cpptoc/task_cpptoc.cc +++ b/libcef_dll/cpptoc/task_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=24809d9106881d5e59cf9fcdff2bd0506701a515$ +// $hash=118e67ac52da6f21cd4b60a318a04c0ecbce3d55$ // #include "libcef_dll/cpptoc/task_cpptoc.h" diff --git a/libcef_dll/cpptoc/task_cpptoc.h b/libcef_dll/cpptoc/task_cpptoc.h index d82d92dae7b796882a584f346c9553f55acabd69..9a702d94f5a1debefa3c3a6cfa4c00d949446dc1 100644 --- a/libcef_dll/cpptoc/task_cpptoc.h +++ b/libcef_dll/cpptoc/task_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=69d07f172de2cc8d37dc711d2b21c40bc9e45f29$ +// $hash=32859b75e638cd76a9319561b675fa3583818905$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/task_runner_cpptoc.cc b/libcef_dll/cpptoc/task_runner_cpptoc.cc index f69eb24ffd43d2164a7c219b4948b69746e3b9de..9aae9a407c0e9bbda929ec2358d7a3d6b6882747 100644 --- a/libcef_dll/cpptoc/task_runner_cpptoc.cc +++ b/libcef_dll/cpptoc/task_runner_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=640cd6642b4a56a6e51b6d3fc4a1780cfeadb269$ +// $hash=a96ba2c140124da8865f2da4c2b8d6a0c958a1fa$ // #include "libcef_dll/cpptoc/task_runner_cpptoc.h" diff --git a/libcef_dll/cpptoc/task_runner_cpptoc.h b/libcef_dll/cpptoc/task_runner_cpptoc.h index 36bc43daf7f1ce9dd91de91671813c8339fe7021..d462c7e147832c3a2801b58a95967ba992ab5972 100644 --- a/libcef_dll/cpptoc/task_runner_cpptoc.h +++ b/libcef_dll/cpptoc/task_runner_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1d256de1bfb3a2854595e36a44e1955139be2036$ +// $hash=66efea72ce623fbf542496f15d0b5fe33d426286$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TASK_RUNNER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc b/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc index 420c523a1708c5e9cfc42583e8d28e54210afbbb..1fad537b47c1d8da83029a4c4b3015e451aa51b2 100644 --- a/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc +++ b/libcef_dll/cpptoc/test/test_server_connection_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1a59ed8921726601a5a429dc76db34300fd5bb9d$ +// $hash=7467f59c7417d18d7a8ea7690fce9d01b4855d5c$ // #include "libcef_dll/cpptoc/test/test_server_connection_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/test_server_connection_cpptoc.h b/libcef_dll/cpptoc/test/test_server_connection_cpptoc.h index b1821d35d2cb3129b4f4b439cbda4823bdd7ecdc..92baadfa86ad8911ddb9284067dfb6728624261e 100644 --- a/libcef_dll/cpptoc/test/test_server_connection_cpptoc.h +++ b/libcef_dll/cpptoc/test/test_server_connection_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0ad0f73d640fc955853941ae0aa960aae0f796b2$ +// $hash=da4666f75e56bfc41483f5d5627e9db612364ffb$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TEST_SERVER_CONNECTION_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/test_server_cpptoc.cc b/libcef_dll/cpptoc/test/test_server_cpptoc.cc index 4ccf3a8bc83a6b80e7818413b4c5274794115202..e3775693ec8277309c1e1dd9d584f94ed29bf577 100644 --- a/libcef_dll/cpptoc/test/test_server_cpptoc.cc +++ b/libcef_dll/cpptoc/test/test_server_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=140e41b66d89629d54ccb97420a5a65e4f02197d$ +// $hash=3aa25e3d3dcaa8b1499fc4e54dd0cb9d3bb473cb$ // #include "libcef_dll/cpptoc/test/test_server_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/test_server_cpptoc.h b/libcef_dll/cpptoc/test/test_server_cpptoc.h index a8cbd7287005f0fdeb22d6ed8ebdcbac16393ece..0c3bed605f0e1ee0a2111e04eabdbe36149e27a1 100644 --- a/libcef_dll/cpptoc/test/test_server_cpptoc.h +++ b/libcef_dll/cpptoc/test/test_server_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8f8d74e75d604c78c32fd6b67332a1542bc03a01$ +// $hash=f6f3d0a111ecd4f978ed7a1c9493679d027367fd$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TEST_SERVER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc b/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc index 724dad03ecbf7a74e0fd57084e20d94dd48e2dad..d2c9d6fa97b293131a7bef5b7beacd2b143e43ad 100644 --- a/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/test/test_server_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7209e578782e2b7d444ff52df9fb08da1fcc8106$ +// $hash=786c2d8a0269b342c7c3ee49f5bb337341072d31$ // #include "libcef_dll/cpptoc/test/test_server_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/test_server_handler_cpptoc.h b/libcef_dll/cpptoc/test/test_server_handler_cpptoc.h index b4ab638b8cb4565f09cb86795574890ea9d7e478..d844b6b7fcfd4a323fd255e454de76cf35a692ae 100644 --- a/libcef_dll/cpptoc/test/test_server_handler_cpptoc.h +++ b/libcef_dll/cpptoc/test/test_server_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1a2ec9085b4d6ca1808ad43cabe3a7b6dfa761a5$ +// $hash=c52f8327259f74779b2bb7e16a84b5c245da482b$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TEST_SERVER_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_cpptoc.cc index a174b642d88b040a7968ecd3370dee248823a4db..822312f486537771f5c426574282446063bc9b29 100644 --- a/libcef_dll/cpptoc/test/translator_test_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b8bda23044f37e003e72d2a7e5977e5adc7255e9$ +// $hash=39e09b21c40f62f1ec2f9685f065682607405666$ // #include "libcef_dll/cpptoc/test/translator_test_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_cpptoc.h index 0f0aabb6a7f6dcdd1c54f6084b6d431e13627365..c84b470058d6e2f3e7c397eee0c0d5dbce994855 100644 --- a/libcef_dll/cpptoc/test/translator_test_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6bbc66b8d96af6f682fc6cca3dd61469fd22f223$ +// $hash=5f0f8e9729af10fb258c197facf57ae150969f1a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc index 8dc05c627aee0f963255ee9e135d76c1451badbd..70f7835c63d90ea7297d212ae6856faf0c547e9e 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b90c515feded48aa4ea6971c3051b6313cceb3d4$ +// $hash=e94e27d12aa7fa48ea890cb8ab99f2e400d7ff23$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h index bbaf2eedd00b6c0310b089860efd95b333a238cd..71d3384f479d542b13fffad05ea20f2be6a3d29b 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f94680fa6124b640895a1602b8162642d47693e5$ +// $hash=b6731cceb5f02011f2bafe6afa336b95355a1bf0$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc index ff40f5474ae4ab338b3c1dd361e5d337a1d72dbc..d502501ff6686807005ebfa8361412401a166a35 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8a2511a1f4f8ea633ef09bed454b0d445119aaa6$ +// $hash=5c0280db7af6bc6332f308b53a3189d1e64b63d0$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h index 1ffaf958d2b8913b3d52a5eb1a100c4905fe47c6..e8a5309622d435fe8fc9f66303e699c5e953a6ef 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=787e68ac0e09708a95d038df06c558f563fcc564$ +// $hash=871a3626f0e6928f2b1094b6fd01175f2bc82a29$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc index a724a67003449497b0ef531e86154b72134f6299..6e77ab5266228a92c47096714480366dc2235b80 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=965dc2e0743c41a53fdad1b079a009c57ed02921$ +// $hash=09d1f7c2030dd94ea04b11428eaa2820365c39b0$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h index c5ab837bd01a41c2d79d928d7044f4aceec1b85c..c17f7181d86e9f4a873194eccc14a2fe5d22c9b1 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_child_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3a8341a05d089b2c565427e1b3a2d6f0b7357c05$ +// $hash=c578229af8491c038b4a036ca870c5dd268b9244$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc index 6f9936aa431c5b306fcafc8c66577635629fa0c1..3619115a7e99858069a0c72435bb065aa0b30879 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a288fda9be9de3c8a6c85f9299614e4157b8d0f9$ +// $hash=77ac3c6f92cae7e91d7c1961c302fcf4da441cb7$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h index d9f419b8b543969f0046e864a708dd815a25f163..0ed52386f0e2e7d17e85ef415f4e82450fd46db6 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_child_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=16ed86f5c7027b101cafd86ff8d4069a1daf6e11$ +// $hash=f138313a94a2c2943926df60ee5293f5dc9f62b8$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc index 76fd1cdb42613fdc28844b2b2c85bb713464d071..093ce488807141bc40f06a3f2b8bd0e0040bf223 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=22ec6e9cbb7642581bff1c19a7f9a94b3278bdda$ +// $hash=a7585041fd58edc7c8a2760cf360cc3abcf90853$ // #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h index 0faad14baadab8ad495027c79238bec9942e1e68..e1420e8f2175d5b2cf703e4d29003d27a53a2736 100644 --- a/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_ref_ptr_library_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4895638e5366e9e5bbfa500638762cee3bf39489$ +// $hash=f431a7518ff642f5b307dbd716bfcd75c5bcb37a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.cc index 704a04ac3f4f79d5bb40917a056000540d5dd652..cf8058be3346de32deb4457349af3a6a1e1940d1 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=182bc9946a1f1b257fad2dfd1158e39c9d9daee0$ +// $hash=caeeb7277830a5e9a81ba96a9385f65f53e1983f$ // #include "libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h index 7368a95f65057caba993de951e659a2ef4ef4374..894345cccc680d982d6bbc5942d3a3de643706c6 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=462c3f75f7aad3ac7292407243fb2bade953d782$ +// $hash=7a7900759a192fa0586d1ab7e2706c513ed9b715$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc index abaa218efc4a561b28848a31d80f8ef5ff5bcf64..38a3f9fe7519161787bf2490f0453c9de2fbdaca 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b0f1a367e71250dfa37c85415170cd9cf083c1f2$ +// $hash=8b65a39b9871e8185e8923ef48a54dd38e42af95$ // #include "libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h index f3d972a28bf84c40a8d96b2f59c514717f8601cb..d73036be67c7492b282ca25033c3790ded22586a 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=71e6330aa51c2745c56618a6baac77ed16580087$ +// $hash=bf705a17d41da4d434c122928b0f55c8760d3689$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.cc index af83b0fde4bd6b17dbc6a9152402991161d10ee7..b8ef7000e8a7f015571744fcea4bfb103b0c48da 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f8f271d98a03fd2141ec8beecb36d4e9eb789e43$ +// $hash=4208fa6b25929be4a48ba1beefc454a08fc22759$ // #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h index 6d0aef5bd7de6d308cedb58b3ba7535275d4acfa..3602a4b03e324dcbfc1624fe5613ef73ea1a6a99 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_child_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dc96068ece303c7bc4f767f873ed6f1824985af1$ +// $hash=333a572bf8bb3cde5058ae36410b571d777cd157$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc index c6b62556132ad1554e2039396804c8610de15f0f..607e1b90d65eb5061ed21e211e634f01cdfc79fa 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=003da9325fbc3952e313010e8cd81b83275a6bf1$ +// $hash=f6f6e03a419a412c7c4f15c252fef53c543c5397$ // #include "libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h index f9aec87aa6e90d029f31f45a2ffeaf75af4d96dd..e1c516aa0f178e37c65aeef1c682d40fcaeb5642 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_child_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f8ed1e2a71f35804878c8ed1bb4d692b684a3557$ +// $hash=df48c52988d69bfd94bc4245d1c2069f45512f7a$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc b/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc index 90866974617c6c07f1dc5d025adff8ba43bf32df..4a5c6c996622d6f956c80bfcf6b4dcb3b3048212 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=24e3028866a847cfad5721a3d8c9d45b5834cf92$ +// $hash=6bcea51c7388efe763a5e5e1afe9db461bff777d$ // #include "libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h" diff --git a/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h index 4e8ea6fe768c5719e9c0677c9c2c01dfdbf8931f..f03840613b6c191509ba7c7d30cb0024024707e2 100644 --- a/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_scoped_library_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=87669cc73983a3cfe09135ab70516b48934bef05$ +// $hash=029af2aa3f312b751ca30b039f22e5c4fbd42295$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/thread_cpptoc.cc b/libcef_dll/cpptoc/thread_cpptoc.cc index 830f9414a6422bf5f599829770ece2332c79f4fc..19061146018764c5ac73d740093097ed2d25110d 100644 --- a/libcef_dll/cpptoc/thread_cpptoc.cc +++ b/libcef_dll/cpptoc/thread_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0b5a3e60da4a7db7f2e7589e0e6e78d6a26500ee$ +// $hash=f7d9700dd9445bf363712c5ccafdcbcb438d7917$ // #include "libcef_dll/cpptoc/thread_cpptoc.h" diff --git a/libcef_dll/cpptoc/thread_cpptoc.h b/libcef_dll/cpptoc/thread_cpptoc.h index 5e6508ec28f6319f05c384e2799fdc5aafb528a5..37f0be30ccfa2f4d86792c3e1cd3ff38d4a65efa 100644 --- a/libcef_dll/cpptoc/thread_cpptoc.h +++ b/libcef_dll/cpptoc/thread_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bd6c11eac0480993a48af73a6c2d52289c81e918$ +// $hash=684bc72317e634d7357bdea53bf7dfe81d9d536b$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_THREAD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc index c44e674459feff4eeb23c922a1ee5695ddd8ecba..41908fee7efffc7cfcad0561ad24c28c93e133f5 100644 --- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7ee61cca0dca0dbb4619e6a6f69f69788f7dfae3$ +// $hash=06e8730f31f20b05a030d315593ab982c32539b6$ // #include "libcef_dll/cpptoc/urlrequest_client_cpptoc.h" diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.h b/libcef_dll/cpptoc/urlrequest_client_cpptoc.h index 957c9cb7798335a25204e863996b14f2c7760b4d..551f69c51b8c1d4f6fcfca475ff1f66688161125 100644 --- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.h +++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=48e80ce80b8eedb153cda09bccf75e01ec73524b$ +// $hash=da593bcc58bec4b7dc1159fdc2fd2b8f472a6c93$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CLIENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.cc b/libcef_dll/cpptoc/urlrequest_cpptoc.cc index 7d59e734d13c9b03d6df1d4c6ddfda91708ab949..5b73db4cb698162b3e27cc7747bc28a90aefb18f 100644 --- a/libcef_dll/cpptoc/urlrequest_cpptoc.cc +++ b/libcef_dll/cpptoc/urlrequest_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1174de1145f767bbca13aad70c31e321613b96d3$ +// $hash=ec163d8f228ca2c347b8c6a76b814e45d0d46d28$ // #include "libcef_dll/cpptoc/urlrequest_cpptoc.h" diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.h b/libcef_dll/cpptoc/urlrequest_cpptoc.h index d315d2fed79ce39d6359d3b8df7e6d77453fa3e6..3ed15df73fd55073a5cd68dde6c1b5b607f20001 100644 --- a/libcef_dll/cpptoc/urlrequest_cpptoc.h +++ b/libcef_dll/cpptoc/urlrequest_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f2ab64a1245633de5bec62bd5d11efafae579f86$ +// $hash=f870036a626bd6ba126425b586b0a3116030c8d6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.cc b/libcef_dll/cpptoc/v8accessor_cpptoc.cc index c8cb48c61cec188f40c61c575c1238003c01b6e7..72fdd26d6514cc148a4903350281e20ef28321ad 100644 --- a/libcef_dll/cpptoc/v8accessor_cpptoc.cc +++ b/libcef_dll/cpptoc/v8accessor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=87d455840a793c74499a138f2a9e75e047620c2e$ +// $hash=a6bbf97ac7f70e325509631a3bbdbf4b8b860d0c$ // #include "libcef_dll/cpptoc/v8accessor_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.h b/libcef_dll/cpptoc/v8accessor_cpptoc.h index 75b6dce31d5bc72499de71ae360ed49912fd2fe8..fb40f8632a3a8331f1dd55090506a0940232baae 100644 --- a/libcef_dll/cpptoc/v8accessor_cpptoc.h +++ b/libcef_dll/cpptoc/v8accessor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b0c6fa74efe722fe222be22c7b171e368afb292c$ +// $hash=b8975b107d5912bdcc3e66229119fed6316d269c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8ACCESSOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.cc b/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.cc index fcdad363b73a68876bd0235d841f9515a01e38a0..9093115548261166889c2904f2c120c318b5026e 100644 --- a/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.cc +++ b/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=21a1fe189ed3ee668a6896112f00423d2c997f34$ +// $hash=44561e34afa6d45b0c6c324e345bef6c0e9f31b8$ // #include "libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h b/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h index f5107169184126874f8fec76382775fd7096a375..650881c3262d155fb58a323db4adf4a571333956 100644 --- a/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h +++ b/libcef_dll/cpptoc/v8array_buffer_release_callback_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5dc59d22946409ab85a0fc551fc20a82edf0f956$ +// $hash=f3cb7f220bf24ad178eed9b14d8b6e3d1baed6d5$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8ARRAY_BUFFER_RELEASE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8context_cpptoc.cc b/libcef_dll/cpptoc/v8context_cpptoc.cc index c697c3a4db244ed4a8d318e48917e844c68922bc..5c8f6252e6a166ab5bd0d8b34f088136d8e468be 100644 --- a/libcef_dll/cpptoc/v8context_cpptoc.cc +++ b/libcef_dll/cpptoc/v8context_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e7ddd2796d7f817f1eedea93cdfdf94a8d824363$ +// $hash=06e55741773f12f9804a5f981f94a010e5293e14$ // #include "libcef_dll/cpptoc/v8context_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8context_cpptoc.h b/libcef_dll/cpptoc/v8context_cpptoc.h index 2cff90659c2050c4690885bf0bac3ddcc00aef8b..5b7746d2b41f833d05c6635293d97fc3096f4c5c 100644 --- a/libcef_dll/cpptoc/v8context_cpptoc.h +++ b/libcef_dll/cpptoc/v8context_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ef7ff518e93d80459187bf0ba5ec9ba084167686$ +// $hash=251051522f71e61a56b0844596a6ca2d858915c8$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8CONTEXT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.cc b/libcef_dll/cpptoc/v8exception_cpptoc.cc index a2ee0bf507309af328d1370fa77449faa1fc915a..2e4964a229d0501d0226d2c98ef0e2b716106e5c 100644 --- a/libcef_dll/cpptoc/v8exception_cpptoc.cc +++ b/libcef_dll/cpptoc/v8exception_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2f33a5a19c575a31777ed26f35737d721dc95176$ +// $hash=049d20ef13c88453fffe0e5ed7648096b92073cb$ // #include "libcef_dll/cpptoc/v8exception_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.h b/libcef_dll/cpptoc/v8exception_cpptoc.h index ced34bc81ca7539f6bc2523ce0ca1ee224685279..d9f8725b58953229f70548d76e1dbd8fd4aaba2c 100644 --- a/libcef_dll/cpptoc/v8exception_cpptoc.h +++ b/libcef_dll/cpptoc/v8exception_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1002654596cae2dc820ed812af7b2f15fb464894$ +// $hash=438f4efa56776c515c7c42c6a7dae68937729fef$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8EXCEPTION_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.cc b/libcef_dll/cpptoc/v8handler_cpptoc.cc index 1b2bda3f6754f84a211aa2346b44560bc2ae2346..0d26b87659a02fb9bbba701e4bbd9515b401c0d8 100644 --- a/libcef_dll/cpptoc/v8handler_cpptoc.cc +++ b/libcef_dll/cpptoc/v8handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=39f6fa253c177c735048523acbe98898b67cd93a$ +// $hash=9b1ad32d9167bdaaeee14834a82b13927ac71c82$ // #include "libcef_dll/cpptoc/v8handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.h b/libcef_dll/cpptoc/v8handler_cpptoc.h index da5f95a2b9ce9d86bc9d7994aaf0f3321d85c543..f3122ffc622aa8891939515082d45d67f851d2bb 100644 --- a/libcef_dll/cpptoc/v8handler_cpptoc.h +++ b/libcef_dll/cpptoc/v8handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c5e8b694593189fb511cf71ed4b672514ed5dec6$ +// $hash=25ab4ee4f4c72c6be2e4df28dfaa8bbe5ec522d6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8interceptor_cpptoc.cc b/libcef_dll/cpptoc/v8interceptor_cpptoc.cc index 2ab35d79f8aaeb724443e4cfda6020d7f85f00c1..e0f3cdd1dd90128276c06a4c5de47cbb1c91eeb9 100644 --- a/libcef_dll/cpptoc/v8interceptor_cpptoc.cc +++ b/libcef_dll/cpptoc/v8interceptor_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=20201be0dcd9450928eac08e56796591406904cb$ +// $hash=c8d0d84851df03db685c0a87a53780d64ce425db$ // #include "libcef_dll/cpptoc/v8interceptor_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8interceptor_cpptoc.h b/libcef_dll/cpptoc/v8interceptor_cpptoc.h index 81d86c57ac710584cd6825be77b120f2ecaccfb8..07f4a629dc3f0fbfbff9d86355192e8d9a252efb 100644 --- a/libcef_dll/cpptoc/v8interceptor_cpptoc.h +++ b/libcef_dll/cpptoc/v8interceptor_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5b41a9c261d08adc1d1ec977ecda7cf11cd9faa4$ +// $hash=17704763b12cf8c125a358d2db96037f13613b17$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8INTERCEPTOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc b/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc index 5b1cdaf430f585c70946c7332aa55a463922d746..7345c8044f714165fcf8879e1a6ab6a194b1c57c 100644 --- a/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc +++ b/libcef_dll/cpptoc/v8stack_frame_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d75add6c9ae8ea866e9827ad1c3f89b46dfc7d1d$ +// $hash=0f0803623b8296300984dd5f93802b32f536a604$ // #include "libcef_dll/cpptoc/v8stack_frame_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8stack_frame_cpptoc.h b/libcef_dll/cpptoc/v8stack_frame_cpptoc.h index de61eced7bc6fe8382930571291c34dec9eb1292..fabdf222e3fb2de7b92ffa9aa28f9a6e530f786f 100644 --- a/libcef_dll/cpptoc/v8stack_frame_cpptoc.h +++ b/libcef_dll/cpptoc/v8stack_frame_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8495d853de649bf38e31ba006e7db69ed54b4a20$ +// $hash=a804ebb160de9a40b1e8ce65e1dfca67e5ffb658$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8STACK_FRAME_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc b/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc index 7595c07eb3fd87ba69f15c4b4e87b7428a4d7e85..8e88dfeb31427c32f8630f45f3580223449bfb6e 100644 --- a/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc +++ b/libcef_dll/cpptoc/v8stack_trace_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7f989d53aec9eb26f05fc0233e03f47948ec756e$ +// $hash=994446939847e01ee1c2ce3b3c3f1988bbe97a10$ // #include "libcef_dll/cpptoc/v8stack_trace_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8stack_trace_cpptoc.h b/libcef_dll/cpptoc/v8stack_trace_cpptoc.h index 092f2fd2cf164d24915a5a23c8daf01229c7da73..c0374479ea34fc16056ede730af0c053844413ee 100644 --- a/libcef_dll/cpptoc/v8stack_trace_cpptoc.h +++ b/libcef_dll/cpptoc/v8stack_trace_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=202abb2d5286d16147ebf6804a7a0c612a5c9bcf$ +// $hash=7d064189557bf22631a1daf8a757128680743960$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8STACK_TRACE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8value_cpptoc.cc b/libcef_dll/cpptoc/v8value_cpptoc.cc index 3fa06d44c4493b133dcc8b833d9a80cf4146f5e7..a322c771e0fc40e91c9f8c9c4ee9e15e0c7c61aa 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.cc +++ b/libcef_dll/cpptoc/v8value_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a5616f2ac175ce772cea9b336a9418fc38650a38$ +// $hash=5f99f370a236b8cb01a0a5818860efe285d20060$ // #include "libcef_dll/cpptoc/v8value_cpptoc.h" diff --git a/libcef_dll/cpptoc/v8value_cpptoc.h b/libcef_dll/cpptoc/v8value_cpptoc.h index 5cafe20cd8d65fb72e5f883357c69413c825e136..87862ae754c8e96cd18c95acd02d085467d0c4c3 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.h +++ b/libcef_dll/cpptoc/v8value_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6f4e890ba3d2e68eba2b2c5ab9f81a0f5e4395dc$ +// $hash=5b314dd35111aa303aa5d695e75839076f874c90$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_V8VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/value_cpptoc.cc b/libcef_dll/cpptoc/value_cpptoc.cc index 6bc2c567a668bc84cd410f4e932cddebc178c524..1c80ff2aa24006a3893207869bb9ee8d69eedde6 100644 --- a/libcef_dll/cpptoc/value_cpptoc.cc +++ b/libcef_dll/cpptoc/value_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0e910c14d2e4bbb0730acca5bd4b70efdef8938b$ +// $hash=356224055a712a772976ab1166fe101f98228827$ // #include "libcef_dll/cpptoc/value_cpptoc.h" diff --git a/libcef_dll/cpptoc/value_cpptoc.h b/libcef_dll/cpptoc/value_cpptoc.h index fefbca97c0a69aac05034851a93d5bbe21701a9b..512155e5c6a0b4f81d5a82128886e448bb5c3446 100644 --- a/libcef_dll/cpptoc/value_cpptoc.h +++ b/libcef_dll/cpptoc/value_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d04d19d7a81dfc91a56114cb8cb99415709dbbd3$ +// $hash=19a491010366c91259449297ea4fb37414ae2a8e$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc index 2b8b2a1ac8725a8d6ec4275dee1423981bba9c7a..ee432575e58fda5d23bcc30bae4bf45173344884 100644 --- a/libcef_dll/cpptoc/views/box_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/box_layout_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fa488e22c4a198d4b6a69363ae0fe6296b1f3656$ +// $hash=909f89cc8243a1438a31bc2d5e0957c18b65a9b0$ // #include "libcef_dll/cpptoc/views/box_layout_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/box_layout_cpptoc.h b/libcef_dll/cpptoc/views/box_layout_cpptoc.h index 2a186ab597c9c84a57741e382a9416c0d2c77cd1..fc41243e66b16e8543a3995a7ea238c3cff170fe 100644 --- a/libcef_dll/cpptoc/views/box_layout_cpptoc.h +++ b/libcef_dll/cpptoc/views/box_layout_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2ec63a98b6a407982ef363a68fcbfc4c1b0b1e51$ +// $hash=3f9e4984c1e1eff7e51ab13f9f7fe2ab249657ec$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_BOX_LAYOUT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/browser_view_cpptoc.cc b/libcef_dll/cpptoc/views/browser_view_cpptoc.cc index bf7fa8abdb78cd91191e95990c46f7398b5cfd4c..f550e827c00eedb7d4ea1a21db782e83b2b52c33 100644 --- a/libcef_dll/cpptoc/views/browser_view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/browser_view_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f0759e132185f8e6f0ee9e947f7e5ece3dddd5e7$ +// $hash=8ed7a2cd363a38cde65551fa5366085d9fa5b919$ // #include "libcef_dll/cpptoc/views/browser_view_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/browser_view_cpptoc.h b/libcef_dll/cpptoc/views/browser_view_cpptoc.h index 742b180ad9751cc015e4d5f3c51e8405f74ccbff..2f9fd838f8df488115d5619dce5e8b96a541ea39 100644 --- a/libcef_dll/cpptoc/views/browser_view_cpptoc.h +++ b/libcef_dll/cpptoc/views/browser_view_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=22ebbe21bda46166396aba9cecde5ba12fb24e3f$ +// $hash=f981c5f7247ec57926549c145c47a7cdcbdd80a0$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_BROWSER_VIEW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc index ab54588d1bd39628de3fed807d3d772bf72e9c89..03df391abcbac3ece6fa4a5aeb52ca6ba1bc3951 100644 --- a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f25f5dbf62483eed5c3480f3de0d0067801c9dc4$ +// $hash=4bffd98075025b4d02063698dbec87e9b9a31597$ // #include "libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h index 2016de4a4fd9059b434cb945527874be4fe70deb..f0761f3bbc572d5e2fe009e19382d6fd17fb4da9 100644 --- a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c72b4ba5aa80924d791583eb4060be20c982f919$ +// $hash=b091e620040d148171ce5c99d5376cb00356eb37$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_BROWSER_VIEW_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/button_cpptoc.cc b/libcef_dll/cpptoc/views/button_cpptoc.cc index 6fce948aed3ea7857de8184960c0a00dcbc87c7b..0bb9e8b8c37b8ce1ef95bd75f8c2766b89278595 100644 --- a/libcef_dll/cpptoc/views/button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3c4cb278397e9a07c8e5754650fe6944dd2a20ed$ +// $hash=a6162679f74abe571ba59ff3811704fdb186a414$ // #include "libcef_dll/cpptoc/views/button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/button_cpptoc.h b/libcef_dll/cpptoc/views/button_cpptoc.h index bceb67fe1ebd718cd8dc79a09a79dd56d605c46b..ed70f485bb601dfd08cc8cd241d53faa267bbeac 100644 --- a/libcef_dll/cpptoc/views/button_cpptoc.h +++ b/libcef_dll/cpptoc/views/button_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fb05d2a90a1e1c2a443777f5ddbf34161baafe6d$ +// $hash=3fc906cb8937c58418501c33ba81462806b26860$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_BUTTON_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc index e7cec05c96568edbcbda931c410c6fc4f159cab3..def1dd541d9a2f18dac65c4575922fca66ed0da4 100644 --- a/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/button_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4dce379ea37fb6976b0af5f46fc1eeccf2e8606d$ +// $hash=6c1d9cfcafa7425bf5530eba7be024d9d07c466b$ // #include "libcef_dll/cpptoc/views/button_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/button_delegate_cpptoc.h b/libcef_dll/cpptoc/views/button_delegate_cpptoc.h index 8d6fe803eca86c914efc52f5403c50e5b20d9b96..b342d8c50d4fe505d09078cb948c61f00332da22 100644 --- a/libcef_dll/cpptoc/views/button_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/button_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0a32af6e7e34c77a6ceeb4821f9f27e9e41643c0$ +// $hash=455b4eb400cc642cfb4cf0089b12059b8be31af6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_BUTTON_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/display_cpptoc.cc b/libcef_dll/cpptoc/views/display_cpptoc.cc index a73659b8b163044e5af0ee4811c80ee40c7ac1ae..326a0d44946c07bfb39e23606cfdeca3b1dcb33e 100644 --- a/libcef_dll/cpptoc/views/display_cpptoc.cc +++ b/libcef_dll/cpptoc/views/display_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=94e96ba6408659e52498c98a5d92faf6daf2b143$ +// $hash=5c179b70eb51a62fd00780eaea1be9c96e3ce3b3$ // #include "libcef_dll/cpptoc/views/display_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/display_cpptoc.h b/libcef_dll/cpptoc/views/display_cpptoc.h index 8dfcee2af29447e96ac6eb28dcf38d434d5a0b9d..13eb6a6591302995789afd1fb2860ff5d4c0b238 100644 --- a/libcef_dll/cpptoc/views/display_cpptoc.h +++ b/libcef_dll/cpptoc/views/display_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=33cb42763323e6221e5963d9095af98df2fc33b1$ +// $hash=73811073aeb490787e777b5e7f8e41ef34cd6369$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_DISPLAY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc b/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc index 72630acf1ae655af2ce52a57e931510af36f1a9a..99cc9dd9078a1d6cf22b189474b9055e3b24faa7 100644 --- a/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/fill_layout_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=738c63644c3f800cc91801e67175224da80721aa$ +// $hash=3107bde9f33663e0141afa3fef9051c53eac11d8$ // #include "libcef_dll/cpptoc/views/fill_layout_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/fill_layout_cpptoc.h b/libcef_dll/cpptoc/views/fill_layout_cpptoc.h index 7e37170398a9d67db18329bf4b580c7357721023..a695842261622aed3cc250c695afb7a180968f0f 100644 --- a/libcef_dll/cpptoc/views/fill_layout_cpptoc.h +++ b/libcef_dll/cpptoc/views/fill_layout_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d3435c5df0d987268a515e93a7743c5cede73224$ +// $hash=88b95199af576610e6ce7e71603fb3c8b1426046$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_FILL_LAYOUT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/label_button_cpptoc.cc b/libcef_dll/cpptoc/views/label_button_cpptoc.cc index 18f67a92e14ff6b558a8c56633033d1ef14e4af4..dfb6fc314c8865ee23cb1e6d813e81cfc7880ff2 100644 --- a/libcef_dll/cpptoc/views/label_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/label_button_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cc05a9116adf2a98d4b6169a86052a14e299cfeb$ +// $hash=44c962ffbc0ae5b8e7870d5e1845fd339196fbac$ // #include "libcef_dll/cpptoc/views/label_button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/label_button_cpptoc.h b/libcef_dll/cpptoc/views/label_button_cpptoc.h index afce8fda3665fffa52381517cc934b954f08b33f..dad5d89582a656295bfbbcf8a933be00893cebc0 100644 --- a/libcef_dll/cpptoc/views/label_button_cpptoc.h +++ b/libcef_dll/cpptoc/views/label_button_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a4e3e0d6aa3f04f21803f220b8f9b1c9d8a58d6a$ +// $hash=8e86fa292ee6e5debd2525e71eaa3ae8e42c8e55$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_LABEL_BUTTON_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/layout_cpptoc.cc b/libcef_dll/cpptoc/views/layout_cpptoc.cc index 92a8ea40feac57f2fafdba0b924e46fced679009..40a7e37b53e1e023defa6549b55a767699821979 100644 --- a/libcef_dll/cpptoc/views/layout_cpptoc.cc +++ b/libcef_dll/cpptoc/views/layout_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cbcf0e7d98c80fd2d8abd606bb2cef4e2cbf7b2e$ +// $hash=6369dff04489cebf256d28015e676f2a5c09f48e$ // #include "libcef_dll/cpptoc/views/layout_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/layout_cpptoc.h b/libcef_dll/cpptoc/views/layout_cpptoc.h index e9f88dc63026b1317116079f6fb4048365916761..76c9930eef23f8bc46725c9145f0b9dae85bc913 100644 --- a/libcef_dll/cpptoc/views/layout_cpptoc.h +++ b/libcef_dll/cpptoc/views/layout_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5adbf583c52e628e19cbfe8a99e10cc2b605f639$ +// $hash=d0adda3ed7bbb825b0c9959960f832d23f75ccdc$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_LAYOUT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc index 3e284474cc4c25313c56c1238aed37f0d79dfeaa..84b51b456c076338ad5e3df32c63c4390e0a943b 100644 --- a/libcef_dll/cpptoc/views/menu_button_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=82aaa681d0ed57446e54a2c04a62adf18c284677$ +// $hash=c386e6143a554182ff6e4beb9e8dd813a5753a55$ // #include "libcef_dll/cpptoc/views/menu_button_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/menu_button_cpptoc.h b/libcef_dll/cpptoc/views/menu_button_cpptoc.h index a602ecf25627d006596ba840c499000583df42fa..52f93e09a71c724218ef21a1bebc02b4be9973b4 100644 --- a/libcef_dll/cpptoc/views/menu_button_cpptoc.h +++ b/libcef_dll/cpptoc/views/menu_button_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=09a4dbb7c7feed9f1464722fc05748829fd94cb4$ +// $hash=f2f44594e4cbcb3ef1ee3eb39d3d498f7a6cafbc$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc index f4a25cbd5f8a97704c1ecdeac825e665cf5619aa..7aba939400f7d283ed92b6cde08424a5f2a96356 100644 --- a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5e0418c416ecd0c23cb7fcc9d6a52ef06ba86686$ +// $hash=bc673e6ca9a0a67ef0ac5b95a6618575ed79daf5$ // #include "libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h index 0710718422ac424f6191f233d1e13b8d494df569..5f70f5a485c48e1c765a66f6e1147bab9099a68f 100644 --- a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a85cc93b5fb4746a3d5892922e73c090b8a11233$ +// $hash=9178b58c1b03965fc20636f3efd97c2385618574$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc b/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc index ff76b110905d1e2c3e7efaf7aa5c365771d6cf7c..e35fc0e0e62a917d20b97b018afb0dd5500417e3 100644 --- a/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc +++ b/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8c2e3f5f6f4c0aabb3f86836bee3d1d84cc4f563$ +// $hash=b0777f496f71e5770150561ce6bbb37caff94182$ // #include "libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h b/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h index 87154aca08927f2b7388b07072c9bab378244ae5..79a8566ee59ac1ea554b17f189d9f674545fa37e 100644 --- a/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h +++ b/libcef_dll/cpptoc/views/menu_button_pressed_lock_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7c99d523bab3fd5cff066ead562e4802e0d72bf7$ +// $hash=5d7f30f1265294fc8617b444bd35bee3da172746$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_PRESSED_LOCK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc b/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc index fa68604ce7f44b75f32364d16b70a08ec43dabc0..b0007eeaa83806a8454beda07521eaf873fdc542 100644 --- a/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc +++ b/libcef_dll/cpptoc/views/overlay_controller_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1d0b78750d1740b835758d54e8d48758e3d3595f$ +// $hash=714f6a3397b0c294cf77f23061d07c3e9b548989$ // #include "libcef_dll/cpptoc/views/overlay_controller_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/overlay_controller_cpptoc.h b/libcef_dll/cpptoc/views/overlay_controller_cpptoc.h index 8592950b74f75c0e7126d0de670aea998b9078cf..b89f8b4b273c07fd865d2f6a347c25e0cb64085c 100644 --- a/libcef_dll/cpptoc/views/overlay_controller_cpptoc.h +++ b/libcef_dll/cpptoc/views/overlay_controller_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=884e7abf21e48308a2386c57312b800dfd5e22a3$ +// $hash=8d50609d2e79539752a8118f831e853b845892f4$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_OVERLAY_CONTROLLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/panel_cpptoc.cc b/libcef_dll/cpptoc/views/panel_cpptoc.cc index 6e044d9db33d5b67d983560a949e462032f694e8..ac3cda7ddd9958173c7a39cd6976a85f3fbab4fb 100644 --- a/libcef_dll/cpptoc/views/panel_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9ec8f43a509317ec1eead47556f83ce953f041b8$ +// $hash=fba634e939f8074f3a5ddc6717ac93dd9d5d502f$ // #include "libcef_dll/cpptoc/views/panel_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/panel_cpptoc.h b/libcef_dll/cpptoc/views/panel_cpptoc.h index b64e0b417ad8113e95ff705e6d20dc8a6111d657..7411c0d35d823daa2b305eee3315169f4573569a 100644 --- a/libcef_dll/cpptoc/views/panel_cpptoc.h +++ b/libcef_dll/cpptoc/views/panel_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d46d66025b18e76e5e79e8797146e06c7cd346ce$ +// $hash=2c4b5c88fc2a00039dc5eb01aaa90ecd7c2ea0ad$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_PANEL_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc index 257fa8457842a8bfcc613dfbb67f8a9a25812cf5..8110fdc9780623ca480822dbdabee432c72d7cc7 100644 --- a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cb28c29eeb68707fb9b164f539804a6d8a7e61be$ +// $hash=66de178d38a1c9b72867b1eac9ff3c1f7b301c89$ // #include "libcef_dll/cpptoc/views/panel_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h index 1bd024658df6ff9157c258465b7240ab4c966545..578ce7c78238e233831c4df6baddba11b7c302dd 100644 --- a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=34ff5c8e65a795c9e23d4c3a831a58081a9e534e$ +// $hash=1eedf21b5a9e1edb24e6c24de55c991388b50c7c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_PANEL_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc b/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc index b24d2b0ce6947f56088b6b246832efcfb4ae65dc..5ba3a638c186a0ee67b275c6b56f96039210942b 100644 --- a/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/scroll_view_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2ac2ff6e231398755ea6f2748985d21c0b4b1510$ +// $hash=171b3ef450c160ece605980988dd80af9dd97958$ // #include "libcef_dll/cpptoc/views/scroll_view_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/scroll_view_cpptoc.h b/libcef_dll/cpptoc/views/scroll_view_cpptoc.h index bbd08e6c1a068925cd455fa8d527a0bc242cc6d8..1861706c60cf34925984ad4f36ee7f93ca515ff1 100644 --- a/libcef_dll/cpptoc/views/scroll_view_cpptoc.h +++ b/libcef_dll/cpptoc/views/scroll_view_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7c41f3e0d1af5380e7551c7d765b55796ba67ef6$ +// $hash=f0b7e40e7ec1e3870dbc7f25430978c46eb1a51f$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_SCROLL_VIEW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/textfield_cpptoc.cc b/libcef_dll/cpptoc/views/textfield_cpptoc.cc index 34588e1d8e9ed2a8b2d75711c7d196c7d753c231..c41aad0109a7c927ad3f6b0bde6cb39ce1e75687 100644 --- a/libcef_dll/cpptoc/views/textfield_cpptoc.cc +++ b/libcef_dll/cpptoc/views/textfield_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f8d63e2a2ba174b0f7ffb1ae66052288c28b6c43$ +// $hash=d974792994decce11fe5d5feedc9041203c6c3c1$ // #include "libcef_dll/cpptoc/views/textfield_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/textfield_cpptoc.h b/libcef_dll/cpptoc/views/textfield_cpptoc.h index 7c2f006f8b9cb85f0e03c1e4889a5f6bb95d4f7b..790835306ec36d9609044a0ed799e8ec18fac5b1 100644 --- a/libcef_dll/cpptoc/views/textfield_cpptoc.h +++ b/libcef_dll/cpptoc/views/textfield_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=962cb144e6668205769a1b271bb7ba425a1c447c$ +// $hash=0b5018c0b9d42f4ee100098365c46e0ea723ea29$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_TEXTFIELD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc index d54cad1bbb8f6831b73376ff1bfcfb012f09bc4a..edd954462692c71f4ab160e1d64a0282f4a52efc 100644 --- a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e0a80958b419a73b1f57655ef19f4aa7064bd19d$ +// $hash=6af00869e573d59adf07c86ba895ee13db7131e7$ // #include "libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h index de40470293744b2a334736712eabbc1997f8b5c4..2ad4735f35999b679283bc41d2575156f3f30adf 100644 --- a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=75499d26cc306567cc0a4fb6b4b17c7d5cc24477$ +// $hash=33ba2bd44c946bf204f2f7a929b8d208768ca3dd$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_TEXTFIELD_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/view_cpptoc.cc b/libcef_dll/cpptoc/views/view_cpptoc.cc index cb304e4207fbca380049992f07f51929c8ef8086..7368e54900d625ad7d5d01c5047bca281f19630b 100644 --- a/libcef_dll/cpptoc/views/view_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a543a7ac4053e15e97e84a87f4275c23e9a35477$ +// $hash=8ea7eff414ea832334a4b3cb92a3efe8a44e9653$ // #include "libcef_dll/cpptoc/views/view_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/view_cpptoc.h b/libcef_dll/cpptoc/views/view_cpptoc.h index b60e697d7c99f93c4e6851530f2536feed48546b..efb597517ef8dab310ddb3b926dcb0cdfd4adb53 100644 --- a/libcef_dll/cpptoc/views/view_cpptoc.h +++ b/libcef_dll/cpptoc/views/view_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8a3b570ca022683545b288ba1cb1e0f75006cf47$ +// $hash=0d24d12448e97907667f8347a38818e0a4d713ed$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_VIEW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc index fdcb75d3854d3420660eac9b1f76414350ef4f4d..40bbcea45e756598572ea328337399f4f0e80d51 100644 --- a/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/view_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a73bcac096d32c3a63cca3f3006d70a803c00626$ +// $hash=a5ca3a4f1b8c666eee1a198e455dab6ca623650c$ // #include "libcef_dll/cpptoc/views/view_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/view_delegate_cpptoc.h b/libcef_dll/cpptoc/views/view_delegate_cpptoc.h index 2b378311d8c7ce51e206b4030ba6a8ea644e5d20..a6903ef4f71e5063a2054d2a0a61fb6a83738d17 100644 --- a/libcef_dll/cpptoc/views/view_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/view_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8c668e0928ec4b2f11ae37a5ea270f92aa4ac055$ +// $hash=384b7d1f2df446d35d6ba46e62d89976d88fef7c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_VIEW_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/window_cpptoc.cc b/libcef_dll/cpptoc/views/window_cpptoc.cc index e8d8e95a2fd76dbed062c423996b17e352b18f85..cc124daadafc5606e00848ddb78666e737d712d8 100644 --- a/libcef_dll/cpptoc/views/window_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=401b3ac9474679f691de5145d88598c37cd5f313$ +// $hash=94b9ddc326e4b71aefa8488594a3a6f481624254$ // #include "libcef_dll/cpptoc/views/window_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/window_cpptoc.h b/libcef_dll/cpptoc/views/window_cpptoc.h index 8cc3846bf5ae2c2807ac48c5cdb85483d8875a26..e02be4494da846c6d49431f5a2b4aea6083b4969 100644 --- a/libcef_dll/cpptoc/views/window_cpptoc.h +++ b/libcef_dll/cpptoc/views/window_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c36c773b504c53688918ad7717be30a2b420247a$ +// $hash=12ff3d7d14f9977ff1f62e9a35b04b153a135480$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_WINDOW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc index a19b24fa7825b594d183fdeb4d1e92db2e699124..ca15fcb4394a5ef704426e334346f772d9575ae5 100644 --- a/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc +++ b/libcef_dll/cpptoc/views/window_delegate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=197193e5cbc502c18ef809ce5ca3b254af69d229$ +// $hash=c84eb9772fc902904ccbd0cebe2c2105d06a8164$ // #include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h" diff --git a/libcef_dll/cpptoc/views/window_delegate_cpptoc.h b/libcef_dll/cpptoc/views/window_delegate_cpptoc.h index 21e14a0cf66898f1b75cad44acceb49c0b142b1f..441a2ca239b812613697c6c1f67e4c8e5094d3b5 100644 --- a/libcef_dll/cpptoc/views/window_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/window_delegate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7856644b67818018c4de143a9fc8ef0de67a4089$ +// $hash=b4d82958ac79ac843f904c4aa8010a6909ca06fa$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_VIEWS_WINDOW_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/waitable_event_cpptoc.cc b/libcef_dll/cpptoc/waitable_event_cpptoc.cc index 288cc8f26fba41f6839bbf71f3697b6f652ea1be..94d5365a50bd5a8ee42e80b8dc360c15bbe83851 100644 --- a/libcef_dll/cpptoc/waitable_event_cpptoc.cc +++ b/libcef_dll/cpptoc/waitable_event_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0859dcf32bf7353beb949f4b6252966ec799084c$ +// $hash=41aeb9ab533c916fe5a226735fd0fc8a43e6492b$ // #include "libcef_dll/cpptoc/waitable_event_cpptoc.h" diff --git a/libcef_dll/cpptoc/waitable_event_cpptoc.h b/libcef_dll/cpptoc/waitable_event_cpptoc.h index 8bc8b9aa92cba82422657788988ddc9b8aabe2c3..1e1ba61868eaffb2d912bb3c9162216efc79e107 100644 --- a/libcef_dll/cpptoc/waitable_event_cpptoc.h +++ b/libcef_dll/cpptoc/waitable_event_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=23a451fb60d06da6f93cfe45197b255fd91b5679$ +// $hash=c3d08738052ecc67921493df15ea0df38c040314$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_WAITABLE_EVENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_extension_api_handler_cpptoc.cc b/libcef_dll/cpptoc/web_extension_api_handler_cpptoc.cc new file mode 100644 index 0000000000000000000000000000000000000000..58d0c60f46e1b17964c7807d5e28c39eefff884d --- /dev/null +++ b/libcef_dll/cpptoc/web_extension_api_handler_cpptoc.cc @@ -0,0 +1,74 @@ +// Copyright (c) 2024 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. +// +// $hash=bbb4771d4dc3c083cfd75f43213cda47111b5e0f$ +// + +#include "libcef_dll/cpptoc/web_extension_api_handler_cpptoc.h" +#include "libcef_dll/shutdown_checker.h" + +namespace { + +// MEMBER FUNCTIONS - Body may be edited by hand. + +void CEF_CALLBACK web_extension_api_handler_on_tab_update_url( + struct _cef_web_extension_api_handler_t* self, + int tab_id, + const cef_string_t* url) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return; + } + // Verify param: url; type: string_byref_const + DCHECK(url); + if (!url) { + return; + } + + // Execute + CefWebExtensionApiHandlerCppToC::Get(self)->OnUpdateTabUrl(tab_id, + CefString(url)); +} + +} // namespace + +// CONSTRUCTOR - Do not edit by hand. + +CefWebExtensionApiHandlerCppToC::CefWebExtensionApiHandlerCppToC() { + GetStruct()->on_tab_update_url = web_extension_api_handler_on_tab_update_url; +} + +// DESTRUCTOR - Do not edit by hand. + +CefWebExtensionApiHandlerCppToC::~CefWebExtensionApiHandlerCppToC() { + shutdown_checker::AssertNotShutdown(); +} + +template <> +CefRefPtr +CefCppToCRefCounted:: + UnwrapDerived(CefWrapperType type, cef_web_extension_api_handler_t* s) { + DCHECK(false) << "Unexpected class type: " << type; + return nullptr; +} + +template <> +CefWrapperType + CefCppToCRefCounted::kWrapperType = + WT_WEB_EXTENSION_API_HANDLER; diff --git a/libcef_dll/cpptoc/web_extension_api_handler_cpptoc.h b/libcef_dll/cpptoc/web_extension_api_handler_cpptoc.h new file mode 100644 index 0000000000000000000000000000000000000000..f0781397bedc76e8a7b64edc696f6e54036eec84 --- /dev/null +++ b/libcef_dll/cpptoc/web_extension_api_handler_cpptoc.h @@ -0,0 +1,38 @@ +// Copyright (c) 2024 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. +// +// $hash=01016cbe151d008557775ca0d07e4dfa865c0094$ +// + +#ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_EXTENSION_API_HANDLER_CPPTOC_H_ +#define CEF_LIBCEF_DLL_CPPTOC_WEB_EXTENSION_API_HANDLER_CPPTOC_H_ +#pragma once + +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif + +#include "include/capi/cef_web_extension_api_handler_capi.h" +#include "include/cef_web_extension_api_handler.h" +#include "libcef_dll/cpptoc/cpptoc_ref_counted.h" + +// Wrap a C++ class with a C structure. +// This class may be instantiated and accessed wrapper-side only. +class CefWebExtensionApiHandlerCppToC + : public CefCppToCRefCounted { + public: + CefWebExtensionApiHandlerCppToC(); + virtual ~CefWebExtensionApiHandlerCppToC(); +}; + +#endif // CEF_LIBCEF_DLL_CPPTOC_WEB_EXTENSION_API_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_message_receiver_cpptoc.cc b/libcef_dll/cpptoc/web_message_receiver_cpptoc.cc index 678b7af4460df8a7cf3b2d8844a18bf92978b58f..f4d3acfd8e588e8a0a0111a5bb95cf356f619397 100644 --- a/libcef_dll/cpptoc/web_message_receiver_cpptoc.cc +++ b/libcef_dll/cpptoc/web_message_receiver_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec39ac275cf279faf1056b8ec45fc17031663a0e$ +// $hash=3c8ad723d8efd0975398aa07f0f08171104fbe86$ // #include "libcef_dll/cpptoc/web_message_receiver_cpptoc.h" @@ -42,12 +42,40 @@ web_message_receiver_on_message(struct _cef_web_message_receiver_t* self, CefValueCToCpp::Wrap(message)); } +int CEF_CALLBACK web_message_receiver_on_message_with_bool_result( + struct _cef_web_message_receiver_t* self, + struct _cef_value_t* message) { + shutdown_checker::AssertNotShutdown(); + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + DCHECK(self); + if (!self) { + return 0; + } + // Verify param: message; type: refptr_diff + DCHECK(message); + if (!message) { + return 0; + } + + // Execute + bool _retval = + CefWebMessageReceiverCppToC::Get(self)->OnMessageWithBoolResult( + CefValueCToCpp::Wrap(message)); + + // Return type: bool + return _retval; +} + } // namespace // CONSTRUCTOR - Do not edit by hand. CefWebMessageReceiverCppToC::CefWebMessageReceiverCppToC() { GetStruct()->on_message = web_message_receiver_on_message; + GetStruct()->on_message_with_bool_result = + web_message_receiver_on_message_with_bool_result; } // DESTRUCTOR - Do not edit by hand. diff --git a/libcef_dll/cpptoc/web_message_receiver_cpptoc.h b/libcef_dll/cpptoc/web_message_receiver_cpptoc.h index e6e40f31b52d749d793b920b4ba4a2c0d2d6dcee..9846b0985a9bf80639d202e2250c7761516a0ac4 100644 --- a/libcef_dll/cpptoc/web_message_receiver_cpptoc.h +++ b/libcef_dll/cpptoc/web_message_receiver_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c4fc46969a34c536a41670abb60d2af277e54584$ +// $hash=849fd01178757316d7b9a87fcc89d7a862186798$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_MESSAGE_RECEIVER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_storage_cpptoc.cc b/libcef_dll/cpptoc/web_storage_cpptoc.cc index 5daf58f84aa38f96095444dd24688ae8822afc1a..9e088e66d2e80dd8d833dcabea53b55388551001 100644 --- a/libcef_dll/cpptoc/web_storage_cpptoc.cc +++ b/libcef_dll/cpptoc/web_storage_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d052ce735693ddac2692675d95bc300bead6463d$ +// $hash=6bb85ff25a5ab82e81e2f52c4b02988365d87cc4$ // #include "libcef_dll/cpptoc/web_storage_cpptoc.h" diff --git a/libcef_dll/cpptoc/web_storage_cpptoc.h b/libcef_dll/cpptoc/web_storage_cpptoc.h index 5c91ff627439313077899ec9c2037b25b1ea42e4..6c3ea996fbd0e5936a2e20c77d1336a4ce98b6c1 100644 --- a/libcef_dll/cpptoc/web_storage_cpptoc.h +++ b/libcef_dll/cpptoc/web_storage_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7a745ff6996b8234ebda92ed43624a65293b6e27$ +// $hash=811b936281434fdc17bbb33dc50640bfc8d5dd33$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_WEB_STORAGE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.cc b/libcef_dll/cpptoc/write_handler_cpptoc.cc index 04ca6247198d3c94150c54a8a895da7216213799..0c16c72ffb707d9a7450a15dbba1c7dd6f099762 100644 --- a/libcef_dll/cpptoc/write_handler_cpptoc.cc +++ b/libcef_dll/cpptoc/write_handler_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7056ac5b8b078c1446c94c1003cc7217ab825c72$ +// $hash=9e4ec003479af870824a7b7609bc45e4f40fc52a$ // #include "libcef_dll/cpptoc/write_handler_cpptoc.h" diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.h b/libcef_dll/cpptoc/write_handler_cpptoc.h index 26702791a2fb2231247b46067a7d2223d6bc149c..60a0ba7924f85ce3f7d5e71c1726fb65aa0abacf 100644 --- a/libcef_dll/cpptoc/write_handler_cpptoc.h +++ b/libcef_dll/cpptoc/write_handler_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=78a03de1dc60be952251d3d8b992e971ab0fa096$ +// $hash=94c67ea9a0a7a44b92ef2d322f7dd34490f5b8e6$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_WRITE_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc b/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc index a36b2fd8f65eea9e116a0d1237ff28d7c0887e50..b24fdc536ef02c9662ba13954656d3fb5de448b0 100644 --- a/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc +++ b/libcef_dll/cpptoc/x509cert_principal_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=976810a5208d56c0ab159371e5d670f312aa144b$ +// $hash=00565554ad76306eea416264a355273d72af7820$ // #include "libcef_dll/cpptoc/x509cert_principal_cpptoc.h" diff --git a/libcef_dll/cpptoc/x509cert_principal_cpptoc.h b/libcef_dll/cpptoc/x509cert_principal_cpptoc.h index 01fee1ccdb7f5ad6f78bea9b178d6c8b0c4e7406..8aba2d611d8363a920f8462ed6e0f0237fbd0818 100644 --- a/libcef_dll/cpptoc/x509cert_principal_cpptoc.h +++ b/libcef_dll/cpptoc/x509cert_principal_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0a9214b6eb2f14ff51fb3ce225abb51cd19fc314$ +// $hash=6e97a51d6d111d04e88c67e98eff127d7ca09dc1$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_X509CERT_PRINCIPAL_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/x509certificate_cpptoc.cc b/libcef_dll/cpptoc/x509certificate_cpptoc.cc index 2ee7b4bf90960cce9be3c026e412fa3869572b27..e9e1793637bec9f71eb9966dbb2405f56ea6c017 100644 --- a/libcef_dll/cpptoc/x509certificate_cpptoc.cc +++ b/libcef_dll/cpptoc/x509certificate_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1a50beef526a8f4e42a102b59e6caf9953b400d6$ +// $hash=e9f8f124502684b0e814730ea52aed7c87fef3b3$ // #include "libcef_dll/cpptoc/x509certificate_cpptoc.h" diff --git a/libcef_dll/cpptoc/x509certificate_cpptoc.h b/libcef_dll/cpptoc/x509certificate_cpptoc.h index c60715188d51bf5ec771d912e53ee16ae95ab497..6ef90271fca96c818b6f905f38bbb6c24a1eda5b 100644 --- a/libcef_dll/cpptoc/x509certificate_cpptoc.h +++ b/libcef_dll/cpptoc/x509certificate_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1fd85c32e18431f2a0ca1e434308c915649dfd1f$ +// $hash=11090b23faf77d87bde0a603e74a0697be58fa7c$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_X509CERTIFICATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.cc b/libcef_dll/cpptoc/xml_reader_cpptoc.cc index dd2db7d314e0ad352924b57c5aec4843da30afff..a258cfc4d5c24622bc131ab131ba06cd09538f10 100644 --- a/libcef_dll/cpptoc/xml_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/xml_reader_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e72d9c0157e58d5c46a5979b11daf7692b6d0bee$ +// $hash=438fff1d95401704336388ff2b971403e4074ad1$ // #include "libcef_dll/cpptoc/xml_reader_cpptoc.h" diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.h b/libcef_dll/cpptoc/xml_reader_cpptoc.h index 5af70561ee0a30763f37050d83cb786b1f9ac9b5..0a69e23f147a2a9376314d56a7b3dcbbbf6d3946 100644 --- a/libcef_dll/cpptoc/xml_reader_cpptoc.h +++ b/libcef_dll/cpptoc/xml_reader_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e57bb11b47a7a2189421ce40491e7c206bc4970c$ +// $hash=1305b95acf584a0a0e5fd412e948f195233f476b$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_XML_READER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.cc b/libcef_dll/cpptoc/zip_reader_cpptoc.cc index 60a371ba5f2265ecb8a6348455101123755a84ab..e8b3c265b7fa10e98d213aa91b61f8face204917 100644 --- a/libcef_dll/cpptoc/zip_reader_cpptoc.cc +++ b/libcef_dll/cpptoc/zip_reader_cpptoc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4e75a0d089e5459be1216fe35e34632b0401e95d$ +// $hash=5867942bc6c9feb3f989d6797cef9777ad85d284$ // #include "libcef_dll/cpptoc/zip_reader_cpptoc.h" diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.h b/libcef_dll/cpptoc/zip_reader_cpptoc.h index 60b91a050d9040c60bcb081bad1e6e4ef7a0b751..06233d39eae09634fb69c371c151fb1b136f8366 100644 --- a/libcef_dll/cpptoc/zip_reader_cpptoc.h +++ b/libcef_dll/cpptoc/zip_reader_cpptoc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=190af8d8a9ce2a751b50c6ae1573d1d1338797ee$ +// $hash=488ca93df16ff22fdd9d397aab117990f01f3331$ // #ifndef CEF_LIBCEF_DLL_CPPTOC_ZIP_READER_CPPTOC_H_ diff --git a/libcef_dll/ctocpp/access_request_ctocpp.cc b/libcef_dll/ctocpp/access_request_ctocpp.cc index f6058329cbaad133260a8ea98df148f9dc24a59e..f924d26aa4df7b1658b18123df248c7c9d88df52 100644 --- a/libcef_dll/ctocpp/access_request_ctocpp.cc +++ b/libcef_dll/ctocpp/access_request_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ce96b6db0db161cf73bfca38e418f263043275b8$ +// $hash=cf010ac8ab5153056888d2596286efc8afadc3d3$ // #include "libcef_dll/ctocpp/access_request_ctocpp.h" diff --git a/libcef_dll/ctocpp/access_request_ctocpp.h b/libcef_dll/ctocpp/access_request_ctocpp.h index c0acf2b7f6296b78995a5a0bc8f4905b45f0d85d..5eb1d7f759de992f884242b0c146168d81f27a92 100644 --- a/libcef_dll/ctocpp/access_request_ctocpp.h +++ b/libcef_dll/ctocpp/access_request_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0cc233e37a00bd669b6a3344368dccdf0f4b729e$ +// $hash=08c6bc8913ed7dcf8134fe99745d8f9a4fbc7fa4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_ACCESS_REQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc b/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc index 9dc90108893b853284f1d2789e336fa3f5ac6f52..3d09c48777da19bb2f8da409dfb888c0e5a88125 100644 --- a/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/accessibility_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f1a00c2677b5a02b46ab3a18ac34c85de32e1dcc$ +// $hash=1833e824ccf9b8b5aa8a22ab4f0e731b3296603c$ // #include "libcef_dll/ctocpp/accessibility_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/accessibility_handler_ctocpp.h b/libcef_dll/ctocpp/accessibility_handler_ctocpp.h index 86976e6f461d937c4a8be39b446c38f97d2bed10..0a94e2ead1e4e442d22e8c298fed84e969f284b6 100644 --- a/libcef_dll/ctocpp/accessibility_handler_ctocpp.h +++ b/libcef_dll/ctocpp/accessibility_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ceb1370f1667375be596831bb8b2935ef0458649$ +// $hash=3bfebc6542251128247e89a55fba8cbb3bc7061d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_ACCESSIBILITY_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/app_ctocpp.cc b/libcef_dll/ctocpp/app_ctocpp.cc index 317e4933d414355017aa4e68008e706bc031350e..30d0fb166b2b0dc2d432867cc6c0a6df22fac512 100644 --- a/libcef_dll/ctocpp/app_ctocpp.cc +++ b/libcef_dll/ctocpp/app_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1fa0a5d615b37103c18c40b8fcdb7a78f6f4b625$ +// $hash=fb2f03e369354152db16f5a6b6c6b93e87c42fa5$ // #include "libcef_dll/ctocpp/app_ctocpp.h" diff --git a/libcef_dll/ctocpp/app_ctocpp.h b/libcef_dll/ctocpp/app_ctocpp.h index b3f424f83bbfbadb12a6184402fdb1eddd0dbda0..80424a306c27b2f92b72ecfa87a0ac3a1f086ed6 100644 --- a/libcef_dll/ctocpp/app_ctocpp.h +++ b/libcef_dll/ctocpp/app_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0a888470de76a25470054666096f28a2c4e51d07$ +// $hash=ea433c4f09f9cc1c432e3406dacfe27ec81c20cb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_APP_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/audio_handler_ctocpp.cc b/libcef_dll/ctocpp/audio_handler_ctocpp.cc index e778f5d569bf169ffc8c7d8725c7ca05700546c6..8f72e7cbec46a1864ff2df7b5192b88f541903bb 100644 --- a/libcef_dll/ctocpp/audio_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/audio_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b58a09c2dabadf34934f18f780a74f0f62a8ddfa$ +// $hash=add4d2a56f890fe5c868ebd23a03a4da4d8d6727$ // #include "libcef_dll/ctocpp/audio_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/audio_handler_ctocpp.h b/libcef_dll/ctocpp/audio_handler_ctocpp.h index 13e2dbe50dbf3019330a549593bdf65c68783eed..07bf46b6327a1b2bb0cafe6747c63f54f42b7b02 100644 --- a/libcef_dll/ctocpp/audio_handler_ctocpp.h +++ b/libcef_dll/ctocpp/audio_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=68ad002880cd84a2085ccc934ac5ae6a00acfbc1$ +// $hash=761b05f6a7cd2f0cfc1968a3902bd874060ad79b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_AUDIO_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.cc b/libcef_dll/ctocpp/auth_callback_ctocpp.cc index 01198884e96b5cfb18fbd0c2752a76a6b52fc9ec..b6e52896c8f448a9421a435c7ddaae7852a3f4a5 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d080bf20c1ba6a0e7ea6950ef6c390a68ca06021$ +// $hash=0d4d61d7be11cafb203389bd31b083127b0c70b7$ // #include "libcef_dll/ctocpp/auth_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.h b/libcef_dll/ctocpp/auth_callback_ctocpp.h index 5b2e714111079b66d0210cefd03e1a1daa589d04..aba08fadedf4e025b5e2d9cebe0482eeac8be4f1 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.h +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a3fa649b0b872108508872cc97c9547374d573ca$ +// $hash=b21ded769da39fdf3e0ae7991bdc6a2175a4113d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_AUTH_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc b/libcef_dll/ctocpp/before_download_callback_ctocpp.cc index c6de27aa618306ef54897b9015e967dc05f9298a..29a5bb07550cbaa86c9a601e6d92bbfed25599a9 100644 --- a/libcef_dll/ctocpp/before_download_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/before_download_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d54d34d8cbd575067a0dc54bd966955b217b0aa9$ +// $hash=5fee76af45a3305b58bd6a58455fb3e834368077$ // #include "libcef_dll/ctocpp/before_download_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.h b/libcef_dll/ctocpp/before_download_callback_ctocpp.h index 89a891da36892663ee72484041f137fa0be90e20..46730e6e93213e208303055b71e5c039726ecc4a 100644 --- a/libcef_dll/ctocpp/before_download_callback_ctocpp.h +++ b/libcef_dll/ctocpp/before_download_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f6598c0d6d45c8084ad88997afebdf891880ccd8$ +// $hash=743f5b5893055b96eb373b93368c727b3d36d3c6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BEFORE_DOWNLOAD_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.cc b/libcef_dll/ctocpp/binary_value_ctocpp.cc index 4631ca68014e9ff69e841d9283b3e4f2f11a5b63..d60844ab44247db41df87c9b4f60374967a7b3c0 100644 --- a/libcef_dll/ctocpp/binary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/binary_value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=021ef4ddfd78217e988aae2535f78672de9dad04$ +// $hash=caaf5dfe8d56c784e213b1590c21194f08084b70$ // #include "libcef_dll/ctocpp/binary_value_ctocpp.h" diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.h b/libcef_dll/ctocpp/binary_value_ctocpp.h index 4f595a11bba4a2869107dbe8dc74493f93f8eba5..414f70260ccf9f8a543f6c89f8ab7ea7c1eb6a59 100644 --- a/libcef_dll/ctocpp/binary_value_ctocpp.h +++ b/libcef_dll/ctocpp/binary_value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a8726690daa66312339dba374461c87eea230d44$ +// $hash=b6f011a6c26b4264084eb68dae0d63032c07013c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BINARY_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_ctocpp.cc b/libcef_dll/ctocpp/browser_ctocpp.cc index 7e08a3669dfbbabd83fdf1271b676479a53b7ad1..9f9596097e7e7d5bb20f9a6ce458155da9c40e4a 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=359bac132f6ec31b8d06616809e23cec83a19688$ +// $hash=81a0cbfce72d3e54ec02b35a9f3dac785be06dbc$ // #include "libcef_dll/ctocpp/browser_ctocpp.h" @@ -498,32 +498,32 @@ NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::DeleteHistory() { _struct->delete_history(_struct); } -NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::SelectAndCopy() { +NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::ShowFreeCopyMenu() { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, select_and_copy)) { + if (CEF_MEMBER_MISSING(_struct, show_free_copy_menu)) { return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->select_and_copy(_struct); + _struct->show_free_copy_menu(_struct); } -NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::ShouldShowFreeCopy() { +NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::ShouldShowFreeCopyMenu() { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, should_show_free_copy)) { + if (CEF_MEMBER_MISSING(_struct, should_show_free_copy_menu)) { return false; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int _retval = _struct->should_show_free_copy(_struct); + int _retval = _struct->should_show_free_copy_menu(_struct); // Return type: bool return _retval ? true : false; @@ -712,21 +712,52 @@ NO_SANITIZE("cfi-icall") int CefBrowserCToCpp::GetNWebId() { return _retval; } -NO_SANITIZE("cfi-icall") -void CefBrowserCToCpp::SetEnableBlankTargetPopupIntercept( - bool enableBlankTargetPopup) { +NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::IsAdsBlockEnabled() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, is_ads_block_enabled)) { + return false; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = _struct->is_ads_block_enabled(_struct); + + // Return type: bool + return _retval ? true : false; +} + +NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::IsAdsBlockEnabledForCurPage() { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, set_enable_blank_target_popup_intercept)) { + if (CEF_MEMBER_MISSING(_struct, is_ads_block_enabled_for_cur_page)) { + return false; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = _struct->is_ads_block_enabled_for_cur_page(_struct); + + // Return type: bool + return _retval ? true : false; +} + +NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::EnableAdsBlock(bool enable) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, enable_ads_block)) { return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->set_enable_blank_target_popup_intercept(_struct, - enableBlankTargetPopup); + _struct->enable_ads_block(_struct, enable); } NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::GetSavePasswordAutomatically() { @@ -807,23 +838,6 @@ NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::SetSavePassword(bool enable) { _struct->set_save_password(_struct, enable); } -NO_SANITIZE("cfi-icall") int CefBrowserCToCpp::GetSecurityLevel() { - shutdown_checker::AssertNotShutdown(); - - cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_security_level)) { - return 0; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - int _retval = _struct->get_security_level(_struct); - - // Return type: simple - return _retval; -} - NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::EnableSafeBrowsing(bool enable) { shutdown_checker::AssertNotShutdown(); @@ -856,98 +870,120 @@ NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::IsSafeBrowsingEnabled() { return _retval ? true : false; } +NO_SANITIZE("cfi-icall") int CefBrowserCToCpp::GetSecurityLevel() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, get_security_level)) { + return 0; + } + int _retval = _struct->get_security_level(_struct); + + // Return type: simple + return _retval; +} + NO_SANITIZE("cfi-icall") -void CefBrowserCToCpp::EnableIntelligentTrackingPrevention(bool enable) { +int CefBrowserCToCpp::InsertBackForwardEntry(int index, const CefString& url) { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, enable_intelligent_tracking_prevention)) { - return; + if (CEF_MEMBER_MISSING(_struct, insert_back_forward_entry)) { + return 0; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return 0; + } + // Execute - _struct->enable_intelligent_tracking_prevention(_struct, enable); + int _retval = + _struct->insert_back_forward_entry(_struct, index, url.GetStruct()); + + // Return type: simple + return _retval; } NO_SANITIZE("cfi-icall") -bool CefBrowserCToCpp::IsIntelligentTrackingPreventionEnabled() { +int CefBrowserCToCpp::UpdateNavigationEntryUrl(int index, + const CefString& url) { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, is_intelligent_tracking_prevention_enabled)) { - return false; + if (CEF_MEMBER_MISSING(_struct, update_navigation_entry_url)) { + return 0; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return 0; + } + // Execute - int _retval = _struct->is_intelligent_tracking_prevention_enabled(_struct); + int _retval = + _struct->update_navigation_entry_url(_struct, index, url.GetStruct()); - // Return type: bool - return _retval ? true : false; + // Return type: simple + return _retval; } -NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::IsAdsBlockEnabled() { +NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::ClearForwardList() { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, is_ads_block_enabled)) { - return false; + if (CEF_MEMBER_MISSING(_struct, clear_forward_list)) { + return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int _retval = _struct->is_ads_block_enabled(_struct); - - // Return type: bool - return _retval ? true : false; + _struct->clear_forward_list(_struct); } -NO_SANITIZE("cfi-icall") bool CefBrowserCToCpp::IsAdsBlockEnabledForCurPage() { +NO_SANITIZE("cfi-icall") +void CefBrowserCToCpp::EnableIntelligentTrackingPrevention(bool enable) { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, is_ads_block_enabled_for_cur_page)) { - return false; + if (CEF_MEMBER_MISSING(_struct, enable_intelligent_tracking_prevention)) { + return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int _retval = _struct->is_ads_block_enabled_for_cur_page(_struct); - - // Return type: bool - return _retval ? true : false; + _struct->enable_intelligent_tracking_prevention(_struct, enable); } -NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::EnableAdsBlock(bool enable) { +NO_SANITIZE("cfi-icall") +bool CefBrowserCToCpp::IsIntelligentTrackingPreventionEnabled() { shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, enable_ads_block)) { - return; + if (CEF_MEMBER_MISSING(_struct, is_intelligent_tracking_prevention_enabled)) { + return false; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->enable_ads_block(_struct, enable); + int _retval = _struct->is_intelligent_tracking_prevention_enabled(_struct); + + // Return type: bool + return _retval ? true : false; } NO_SANITIZE("cfi-icall") int CefBrowserCToCpp::SetUrlTrustListWithErrMsg(const CefString& urlTrustList, CefString& detailErrMsg) { -// WARNING - CHANGED ATTRIBUTES -// REMOVED: CefString &detailErrMsg -// REMOVED: const CefString &urlTrustList -// ADDED: const CefString& urlTrustList -// ADDED: CefString& detailErrMsg -#pragma message("Warning: " __FILE__ \ - ": SetUrlTrustListWithErrMsg prototype has changed") - shutdown_checker::AssertNotShutdown(); cef_browser_t* _struct = GetStruct(); @@ -960,6 +996,37 @@ int CefBrowserCToCpp::SetUrlTrustListWithErrMsg(const CefString& urlTrustList, _struct, urlTrustList.GetStruct(), detailErrMsg.GetWritableStruct()); } +NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::SetTabId(int tab_id) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, set_tab_id)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->set_tab_id(_struct, tab_id); +} + +NO_SANITIZE("cfi-icall") int CefBrowserCToCpp::GetTabId() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, get_tab_id)) { + return 0; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = _struct->get_tab_id(_struct); + + // Return type: simple + return _retval; +} + NO_SANITIZE("cfi-icall") void CefBrowserCToCpp::SetBackForwardCacheOptions(int32_t size, int32_t timeToLive) { diff --git a/libcef_dll/ctocpp/browser_ctocpp.h b/libcef_dll/ctocpp/browser_ctocpp.h index 52826b8f041b40123097542fc278c58d241fdc0b..9103148ebad5891783589ea2dd60ac8a595f90cd 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.h +++ b/libcef_dll/ctocpp/browser_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8a0b504f15221d41e27692fe04e9dd8126a42bb5$ +// $hash=e470f6244c3cd890850dac33c1d971174a6218a0$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ @@ -20,18 +20,18 @@ #error This file can be included wrapper-side only #endif +#include #include "include/capi/cef_browser_capi.h" #include "include/capi/cef_client_capi.h" #include "include/cef_browser.h" #include "include/cef_client.h" #include "libcef_dll/ctocpp/ctocpp_ref_counted.h" -#include // Wrap a C structure with a C++ class. // This class may be instantiated and accessed wrapper-side only. class CefBrowserCToCpp : public CefCToCppRefCounted { -public: + public: CefBrowserCToCpp(); virtual ~CefBrowserCToCpp(); @@ -53,47 +53,52 @@ public: CefRefPtr GetMainFrame() override; CefRefPtr GetFocusedFrame() override; CefRefPtr GetFrame(int64 identifier) override; - CefRefPtr GetFrame(const CefString &name) override; + CefRefPtr GetFrame(const CefString& name) override; size_t GetFrameCount() override; - void GetFrameIdentifiers(std::vector &identifiers) override; - void GetFrameNames(std::vector &names) override; - CefRefPtr - GetPermissionRequestDelegate() override; + void GetFrameIdentifiers(std::vector& identifiers) override; + void GetFrameNames(std::vector& names) override; + CefRefPtr GetPermissionRequestDelegate() + override; CefRefPtr GetGeolocationPermissions() override; bool CanGoBackOrForward(int num_steps) override; void GoBackOrForward(int num_steps) override; void DeleteHistory() override; - void SelectAndCopy() override; - bool ShouldShowFreeCopy() override; + void ShowFreeCopyMenu() override; + bool ShouldShowFreeCopyMenu() override; void PasswordSuggestionSelected(int list_index) override; - void UpdateBrowserControlsState(int constraints, int current, + void UpdateBrowserControlsState(int constraints, + int current, bool animate) override; void UpdateBrowserControlsHeight(int height, bool animate) override; - void PrefetchPage(CefString &url, CefString &additionalHttpHeaders) override; + void PrefetchPage(CefString& url, CefString& additionalHttpHeaders) override; void ReloadOriginalUrl() override; bool CanStoreWebArchive() override; - void SetBrowserUserAgentString(const CefString &user_agent) override; + void SetBrowserUserAgentString(const CefString& user_agent) override; bool ShouldShowLoadingUI() override; void SetForceEnableZoom(bool forceEnableZoom) override; bool GetForceEnableZoom() override; int GetNWebId() override; - void SetEnableBlankTargetPopupIntercept(bool enableBlankTargetPopup) override; + bool IsAdsBlockEnabled() override; + bool IsAdsBlockEnabledForCurPage() override; + void EnableAdsBlock(bool enable) override; bool GetSavePasswordAutomatically() override; void SetSavePasswordAutomatically(bool enable) override; void SaveOrUpdatePassword(bool is_update) override; bool GetSavePassword() override; void SetSavePassword(bool enable) override; - int GetSecurityLevel() override; void EnableSafeBrowsing(bool enable) override; bool IsSafeBrowsingEnabled() override; + int GetSecurityLevel() override; + int InsertBackForwardEntry(int index, const CefString& url) override; + int UpdateNavigationEntryUrl(int index, const CefString& url) override; + void ClearForwardList() override; void EnableIntelligentTrackingPrevention(bool enable) override; bool IsIntelligentTrackingPreventionEnabled() override; - bool IsAdsBlockEnabled() override; - bool IsAdsBlockEnabledForCurPage() override; - void EnableAdsBlock(bool enable) override; - int SetUrlTrustListWithErrMsg(const CefString &urlTrustList, - CefString &detailErrMsg) override; + int SetUrlTrustListWithErrMsg(const CefString& urlTrustList, + CefString& detailErrMsg) override; + void SetTabId(int tab_id) override; + int GetTabId() override; void SetBackForwardCacheOptions(int32_t size, int32_t timeToLive) override; }; -#endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ \ No newline at end of file +#endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.cc b/libcef_dll/ctocpp/browser_host_ctocpp.cc index 4405f8e03746090c6244dd4d497796918d8338be..920e0c411f606f404ee4f723e2169650925e0999 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_host_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=35d7e55964c4ab84e2945b5abc122d806d90741b$ +// $hash=6cf26029d20b8cf51da3dc14815a7e85cd6f796a$ // #include "libcef_dll/ctocpp/browser_host_ctocpp.h" @@ -1408,7 +1408,8 @@ NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::GetWebDebuggingAccess() { return _retval ? true : false; } -NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::GetImageForContextNode() { +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::GetImageForContextNode(int command_id) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); @@ -1419,11 +1420,12 @@ NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::GetImageForContextNode() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->get_image_for_context_node(_struct); + _struct->get_image_for_context_node(_struct, command_id); } NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::GetImageFromCache(const CefString& url) { +void CefBrowserHostCToCpp::GetImageFromCache(const CefString& url, + int command_id) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); @@ -1440,7 +1442,7 @@ void CefBrowserHostCToCpp::GetImageFromCache(const CefString& url) { } // Execute - _struct->get_image_from_cache(_struct, url.GetStruct()); + _struct->get_image_from_cache(_struct, url.GetStruct(), command_id); } NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::ExitFullScreen() { @@ -1975,7 +1977,7 @@ void CefBrowserHostCToCpp::DestroyAllWebMessagePorts() { } NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::PostPortMessage(CefString& port_handle, +void CefBrowserHostCToCpp::PostPortMessage(const CefString& port_handle, CefRefPtr message) { shutdown_checker::AssertNotShutdown(); @@ -1993,13 +1995,13 @@ void CefBrowserHostCToCpp::PostPortMessage(CefString& port_handle, } // Execute - _struct->post_port_message(_struct, port_handle.GetWritableStruct(), + _struct->post_port_message(_struct, port_handle.GetStruct(), CefValueCToCpp::Unwrap(message)); } NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::SetPortMessageCallback( - CefString& port_handle, + const CefString& port_handle, CefRefPtr callback) { shutdown_checker::AssertNotShutdown(); @@ -2018,7 +2020,7 @@ void CefBrowserHostCToCpp::SetPortMessageCallback( // Execute _struct->set_port_message_callback( - _struct, port_handle.GetWritableStruct(), + _struct, port_handle.GetStruct(), CefWebMessageReceiverCppToC::Wrap(callback)); } @@ -2726,6 +2728,21 @@ void CefBrowserHostCToCpp::SetOverscrollMode(int mode) { _struct->set_overscroll_mode(_struct, mode); } +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::SetBrowserZoomLevel(double zoomFactor) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, set_browser_zoom_level)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->set_browser_zoom_level(_struct, zoomFactor); +} + NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::Discard() { shutdown_checker::AssertNotShutdown(); @@ -2760,55 +2777,106 @@ NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::Restore() { return _retval ? true : false; } -NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::SetBrowserZoomLevel(double zoomFactor) { +NO_SANITIZE("cfi-icall") int CefBrowserHostCToCpp::GetTopControlsOffset() { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, set_browser_zoom_level)) { - return; + if (CEF_MEMBER_MISSING(_struct, get_top_controls_offset)) { + return 0; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->set_browser_zoom_level(_struct, zoomFactor); + int _retval = _struct->get_top_controls_offset(_struct); + + // Return type: simple + return _retval; } -NO_SANITIZE("cfi-icall") int CefBrowserHostCToCpp::GetTopControlsOffset() { +NO_SANITIZE("cfi-icall") int CefBrowserHostCToCpp::GetShrinkViewportHeight() { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_top_controls_offset)) { + if (CEF_MEMBER_MISSING(_struct, get_shrink_viewport_height)) { return 0; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int _retval = _struct->get_top_controls_offset(_struct); + int _retval = _struct->get_shrink_viewport_height(_struct); // Return type: simple return _retval; } -NO_SANITIZE("cfi-icall") int CefBrowserHostCToCpp::GetShrinkViewportHeight() { +NO_SANITIZE("cfi-icall") +int CefBrowserHostCToCpp::InsertBackForwardEntry(int index, + const CefString& url) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_shrink_viewport_height)) { + if (CEF_MEMBER_MISSING(_struct, insert_back_forward_entry)) { + return 0; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return 0; + } + + // Execute + int _retval = + _struct->insert_back_forward_entry(_struct, index, url.GetStruct()); + + // Return type: simple + return _retval; +} + +NO_SANITIZE("cfi-icall") +int CefBrowserHostCToCpp::UpdateNavigationEntryUrl(int index, + const CefString& url) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, update_navigation_entry_url)) { return 0; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return 0; + } + // Execute - int _retval = _struct->get_shrink_viewport_height(_struct); + int _retval = + _struct->update_navigation_entry_url(_struct, index, url.GetStruct()); // Return type: simple return _retval; } +NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::ClearForwardList() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, clear_forward_list)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->clear_forward_list(_struct); +} + NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::SetPrintBackground(bool enable) { shutdown_checker::AssertNotShutdown(); @@ -2856,6 +2924,28 @@ void CefBrowserHostCToCpp::SetScrollable(bool enable, int scrollType) { _struct->set_scrollable(_struct, enable, scrollType); } +NO_SANITIZE("cfi-icall") +CefString CefBrowserHostCToCpp::GetLastJavascriptProxyCallingFrameUrl() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, + get_last_javascript_proxy_calling_frame_url)) { + return CefString(); + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + cef_string_userfree_t _retval = + _struct->get_last_javascript_proxy_calling_frame_url(_struct); + + // Return type: string + CefString _retvalStr; + _retvalStr.AttachToUserFree(_retval); + return _retvalStr; +} + NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::StartCamera() { shutdown_checker::AssertNotShutdown(); @@ -2898,54 +2988,103 @@ NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::CloseCamera() { _struct->close_camera(_struct); } +NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::SetNWebId(int nWebId) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, set_nweb_id)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->set_nweb_id(_struct, nWebId); +} + +NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::GetPendingSizeStatus() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, get_pending_size_status)) { + return false; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + int _retval = _struct->get_pending_size_status(_struct); + + // Return type: bool + return _retval ? true : false; +} + NO_SANITIZE("cfi-icall") -CefString CefBrowserHostCToCpp::GetLastJavascriptProxyCallingFrameUrl() { +CefRefPtr CefBrowserHostCToCpp::GetDownloadItem( + uint32 item_id) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, - get_last_javascript_proxy_calling_frame_url)) { - return CefString(); + if (CEF_MEMBER_MISSING(_struct, get_download_item)) { + return nullptr; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - cef_string_userfree_t _retval = - _struct->get_last_javascript_proxy_calling_frame_url(_struct); + cef_download_item_t* _retval = _struct->get_download_item(_struct, item_id); - // Return type: string - CefString _retvalStr; - _retvalStr.AttachToUserFree(_retval); - return _retvalStr; + // Return type: refptr_same + return CefDownloadItemCToCpp::Wrap(_retval); } -NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::SetNWebId(int nWebId) { +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::SetWakeLockHandler( + int32_t windowId, + CefRefPtr callback) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, set_nweb_id)) { + if (CEF_MEMBER_MISSING(_struct, set_wake_lock_handler)) { return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + // Unverified params: callback + // Execute - _struct->set_nweb_id(_struct, nWebId); + _struct->set_wake_lock_handler(_struct, windowId, + CefSetLockCallbackCppToC::Wrap(callback)); } -NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::GetPendingSizeStatus() { +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::SetNeedsReload(bool needs_reload) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_pending_size_status)) { + if (CEF_MEMBER_MISSING(_struct, set_needs_reload)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->set_needs_reload(_struct, needs_reload); +} + +NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::NeedsReload() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, needs_reload)) { return false; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int _retval = _struct->get_pending_size_status(_struct); + int _retval = _struct->needs_reload(_struct); // Return type: bool return _retval ? true : false; @@ -2993,75 +3132,50 @@ void CefBrowserHostCToCpp::PrecompileJavaScript( CefPrecompileCallbackCppToC::Wrap(callback)); } -NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::SetWakeLockHandler( - int32_t windowId, - CefRefPtr callback) { +NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::UpdateDrawRect() { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, set_wake_lock_handler)) { + if (CEF_MEMBER_MISSING(_struct, update_draw_rect)) { return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - // Unverified params: callback - // Execute - _struct->set_wake_lock_handler(_struct, windowId, - CefSetLockCallbackCppToC::Wrap(callback)); + _struct->update_draw_rect(_struct); } NO_SANITIZE("cfi-icall") -CefRefPtr CefBrowserHostCToCpp::GetDownloadItem( - uint32 item_id) { +void CefBrowserHostCToCpp::SendTouchpadFlingEvent(const CefMouseEvent& event, + double vx, + double vy) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, get_download_item)) { - return nullptr; + if (CEF_MEMBER_MISSING(_struct, send_touchpad_fling_event)) { + return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - cef_download_item_t* _retval = _struct->get_download_item(_struct, item_id); - - // Return type: refptr_same - return CefDownloadItemCToCpp::Wrap(_retval); + _struct->send_touchpad_fling_event(_struct, &event, vx, vy); } NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::NotifyNeedsReload(bool needs_reload) { +void CefBrowserHostCToCpp::SetFitContentMode(int mode) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, notify_needs_reload)) { + if (CEF_MEMBER_MISSING(_struct, set_fit_content_mode)) { return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->notify_needs_reload(_struct, needs_reload); -} - -NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::NeedsReload() { - shutdown_checker::AssertNotShutdown(); - - cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, needs_reload)) { - return false; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - int _retval = _struct->needs_reload(_struct); - - // Return type: bool - return _retval ? true : false; + _struct->set_fit_content_mode(_struct, mode); } NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::TerminateRenderProcess() { @@ -3126,52 +3240,6 @@ void CefBrowserHostCToCpp::RegisterNativeJSProxy( } } -NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::SendTouchpadFlingEvent(const CefMouseEvent& event, - double vx, - double vy) { - shutdown_checker::AssertNotShutdown(); - - cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, send_touchpad_fling_event)) { - return; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - _struct->send_touchpad_fling_event(_struct, &event, vx, vy); -} - -NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::SetFitContentMode(int mode) { - shutdown_checker::AssertNotShutdown(); - - cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, set_fit_content_mode)) { - return; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - _struct->set_fit_content_mode(_struct, mode); -} - -NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::UpdateDrawRect() { - shutdown_checker::AssertNotShutdown(); - - cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, update_draw_rect)) { - return; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - _struct->update_draw_rect(_struct); -} - NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::OnTextSelected(bool flag) { shutdown_checker::AssertNotShutdown(); @@ -3247,6 +3315,21 @@ void CefBrowserHostCToCpp::AdvanceFocusForIME(int focusType) { _struct->advance_focus_for_ime(_struct, focusType); } +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::OnDestroyImageAnalyzerOverlay() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_destroy_image_analyzer_overlay)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->on_destroy_image_analyzer_overlay(_struct); +} + NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::OnSafeInsetsChange(int left, int top, @@ -3307,6 +3390,59 @@ void CefBrowserHostCToCpp::SetGrantFileAccessDirs( } } +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::WebExtensionTabUpdated( + int tab_id, + const std::vector& changed_property_names, + const CefString& url) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, web_extension_tab_updated)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return; + } + + // Translate param: changed_property_names; type: string_vec_byref_const + cef_string_list_t changed_property_namesList = cef_string_list_alloc(); + DCHECK(changed_property_namesList); + if (changed_property_namesList) { + transfer_string_list_contents(changed_property_names, + changed_property_namesList); + } + + // Execute + _struct->web_extension_tab_updated( + _struct, tab_id, changed_property_namesList, url.GetStruct()); + + // Restore param:changed_property_names; type: string_vec_byref_const + if (changed_property_namesList) { + cef_string_list_free(changed_property_namesList); + } +} + +NO_SANITIZE("cfi-icall") +void CefBrowserHostCToCpp::ScrollFocusedEditableNodeIntoView() { + shutdown_checker::AssertNotShutdown(); + + cef_browser_host_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, scroll_focused_editable_node_into_view)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->scroll_focused_editable_node_into_view(_struct); +} + NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::SetAutofillCallback( CefRefPtr callback) { @@ -3351,21 +3487,6 @@ void CefBrowserHostCToCpp::FillAutofillData(CefRefPtr message) { _struct->fill_autofill_data(_struct, CefValueCToCpp::Unwrap(message)); } -NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::ScrollFocusedEditableNodeIntoView() { - shutdown_checker::AssertNotShutdown(); - - cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, scroll_focused_editable_node_into_view)) { - return; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - _struct->scroll_focused_editable_node_into_view(_struct); -} - NO_SANITIZE("cfi-icall") void CefBrowserHostCToCpp::ProcessAutofillCancel( const std::string& fillContent) { diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.h b/libcef_dll/ctocpp/browser_host_ctocpp.h index 30e948f878b20f284e7411645b14c09f3865e15a..0333cd3020737e23621ba77603185ef06b622b0f 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.h +++ b/libcef_dll/ctocpp/browser_host_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=90a4f565796337a6d7f4a72eec97e3fb91db8f2d$ +// $hash=9982ef3843a2cd20051896a48c751f0a921e5f08$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_HOST_CTOCPP_H_ @@ -149,8 +149,8 @@ class CefBrowserHostCToCpp : public CefCToCppRefCounted message) override; void SetPortMessageCallback( - CefString& port_handle, + const CefString& port_handle, CefRefPtr callback) override; void GetHitData(int& type, CefString& extra_data) override; void SetInitialScale(float scale) override; @@ -252,40 +252,43 @@ class CefBrowserHostCToCpp : public CefCToCppRefCounted GetDownloadItem(uint32 item_id) override; + void SetWakeLockHandler(int32_t windowId, + CefRefPtr callback) override; + void SetNeedsReload(bool needs_reload) override; + bool NeedsReload() override; void PrecompileJavaScript(const std::string& url, const std::string& script, CefRefPtr cacheOptions, CefRefPtr callback) override; - void SetWakeLockHandler(int32_t windowId, - CefRefPtr callback) override; - CefRefPtr GetDownloadItem(uint32 item_id) override; - void NotifyNeedsReload(bool needs_reload) override; - bool NeedsReload() override; + void UpdateDrawRect() override; + void SendTouchpadFlingEvent(const CefMouseEvent& event, + double vx, + double vy) override; + void SetFitContentMode(int mode) override; bool TerminateRenderProcess() override; void RegisterNativeJSProxy(const CefString& object_name, const std::vector& method_list, const int32_t object_id, bool is_async, const CefString& permission) override; - void SendTouchpadFlingEvent(const CefMouseEvent& event, - double vx, - double vy) override; - void SetFitContentMode(int mode) override; - void UpdateDrawRect() override; void OnTextSelected(bool flag) override; float GetPageScaleFactor() override; bool WebPageSnapshot(const char* id, @@ -293,12 +296,17 @@ class CefBrowserHostCToCpp : public CefCToCppRefCounted& dir_list) override; + void WebExtensionTabUpdated( + int tab_id, + const std::vector& changed_property_names, + const CefString& url) override; + void ScrollFocusedEditableNodeIntoView() override; void SetAutofillCallback(CefRefPtr callback) override; void FillAutofillData(CefRefPtr message) override; - void ScrollFocusedEditableNodeIntoView() override; void ProcessAutofillCancel(const std::string& fillContent) override; void AutoFillWithIMFEvent(bool is_username, bool is_other_account, diff --git a/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.cc b/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.cc index dc3b0701a952b3ccad836dc3932c69081b1985e2..25d28d87b842dfe2805fc9e1a21e940543f23eb6 100644 --- a/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b77510df636c5b9c4ed124918ea3a348d5a59579$ +// $hash=ae79e0f4ec733e6005a53fd2b973a4227fcc59cb$ // #include "libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.h" @@ -271,6 +271,144 @@ void CefBrowserPermissionRequestDelegateCToCpp::NotifyGeolocationPermission( _struct->notify_geolocation_permission(_struct, value, origin.GetStruct()); } +NO_SANITIZE("cfi-icall") +void CefBrowserPermissionRequestDelegateCToCpp::AskAudioCapturePermission( + const CefString& origin, + cef_permission_callback_t callback) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_permission_request_delegate_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, ask_audio_capture_permission)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: origin; type: string_byref_const + DCHECK(!origin.empty()); + if (origin.empty()) { + return; + } + + // Execute + _struct->ask_audio_capture_permission(_struct, origin.GetStruct(), callback); +} + +NO_SANITIZE("cfi-icall") +void CefBrowserPermissionRequestDelegateCToCpp::AbortAskAudioCapturePermission( + const CefString& origin) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_permission_request_delegate_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, abort_ask_audio_capture_permission)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: origin; type: string_byref_const + DCHECK(!origin.empty()); + if (origin.empty()) { + return; + } + + // Execute + _struct->abort_ask_audio_capture_permission(_struct, origin.GetStruct()); +} + +NO_SANITIZE("cfi-icall") +void CefBrowserPermissionRequestDelegateCToCpp::AskVideoCapturePermission( + const CefString& origin, + cef_permission_callback_t callback) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_permission_request_delegate_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, ask_video_capture_permission)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: origin; type: string_byref_const + DCHECK(!origin.empty()); + if (origin.empty()) { + return; + } + + // Execute + _struct->ask_video_capture_permission(_struct, origin.GetStruct(), callback); +} + +NO_SANITIZE("cfi-icall") +void CefBrowserPermissionRequestDelegateCToCpp::AbortAskVideoCapturePermission( + const CefString& origin) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_permission_request_delegate_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, abort_ask_video_capture_permission)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: origin; type: string_byref_const + DCHECK(!origin.empty()); + if (origin.empty()) { + return; + } + + // Execute + _struct->abort_ask_video_capture_permission(_struct, origin.GetStruct()); +} + +NO_SANITIZE("cfi-icall") +void CefBrowserPermissionRequestDelegateCToCpp:: + AskClipboardSanitizedWritePermission(const CefString& origin, + cef_permission_callback_t callback) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_permission_request_delegate_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, ask_clipboard_sanitized_write_permission)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: origin; type: string_byref_const + DCHECK(!origin.empty()); + if (origin.empty()) { + return; + } + + // Execute + _struct->ask_clipboard_sanitized_write_permission(_struct, origin.GetStruct(), + callback); +} + +NO_SANITIZE("cfi-icall") +void CefBrowserPermissionRequestDelegateCToCpp:: + AbortAskClipboardSanitizedWritePermission(const CefString& origin) { + shutdown_checker::AssertNotShutdown(); + + cef_browser_permission_request_delegate_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, + abort_ask_clipboard_sanitized_write_permission)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: origin; type: string_byref_const + DCHECK(!origin.empty()); + if (origin.empty()) { + return; + } + + // Execute + _struct->abort_ask_clipboard_sanitized_write_permission(_struct, + origin.GetStruct()); +} + // CONSTRUCTOR - Do not edit by hand. CefBrowserPermissionRequestDelegateCToCpp:: diff --git a/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.h b/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.h index 63b32fe5370e17269a93f09fcd142e98e3a4743a..95b5e1d253dc8a93a5b429ea17b043791c87c4e0 100644 --- a/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/browser_permission_request_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6fe6a53ffc2d2fa20908b49862fea1a1c5fe9f2a$ +// $hash=7b02bac8fd24e69b831a73d8022f9c6b16802099$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_PERMISSION_REQUEST_DELEGATE_CTOCPP_H_ @@ -57,6 +57,17 @@ class CefBrowserPermissionRequestDelegateCToCpp void AbortAskClipboardReadWritePermission(const CefString& origin) override; void NotifyGeolocationPermission(bool value, const CefString& origin) override; + void AskAudioCapturePermission(const CefString& origin, + cef_permission_callback_t callback) override; + void AbortAskAudioCapturePermission(const CefString& origin) override; + void AskVideoCapturePermission(const CefString& origin, + cef_permission_callback_t callback) override; + void AbortAskVideoCapturePermission(const CefString& origin) override; + void AskClipboardSanitizedWritePermission( + const CefString& origin, + cef_permission_callback_t callback) override; + void AbortAskClipboardSanitizedWritePermission( + const CefString& origin) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_PERMISSION_REQUEST_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc b/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc index 9c8027b3773ad390ce5fdf83ce6112ad8d7fc6da..b635543fd297d09ce23cfe890c07cbfc9b6e8c32 100644 --- a/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_process_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bdb469cac07bcb8da2d15c1f5acfdba52c584d85$ +// $hash=b50bcb909c855cb4bfabe2f2acde8997e15d3db3$ // #include "libcef_dll/ctocpp/browser_process_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.h b/libcef_dll/ctocpp/browser_process_handler_ctocpp.h index 3e0d11228ebc36ccfff3a3dd4c4661e5f75c4b33..0d858d362bf1fba12b1f7ca47f056dac39d0b5d3 100644 --- a/libcef_dll/ctocpp/browser_process_handler_ctocpp.h +++ b/libcef_dll/ctocpp/browser_process_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=65d47b1b0f255e2059db8833b70aa89e84b2b742$ +// $hash=0863831d899f0388604e013eff6d64090311f154$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_PROCESS_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/callback_ctocpp.cc b/libcef_dll/ctocpp/callback_ctocpp.cc index 2a6047671f577344327ed71d5a5e94d84460e216..dd316320524158a0fb874de9461f37f2fda7cef7 100644 --- a/libcef_dll/ctocpp/callback_ctocpp.cc +++ b/libcef_dll/ctocpp/callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a5a3ef8142897fc16c907f405a9c1edecaafa02a$ +// $hash=a41feff4617bc9beb0512a1350f3ac700b18ea2e$ // #include "libcef_dll/ctocpp/callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/callback_ctocpp.h b/libcef_dll/ctocpp/callback_ctocpp.h index aa892dec2fe73549dd113a0f8e0c13d0b4cfc1ff..1e5965149416792dc527134e957f8219ec3ad935 100644 --- a/libcef_dll/ctocpp/callback_ctocpp.h +++ b/libcef_dll/ctocpp/callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=01d495f898863d61cec87f500ed129bac6b33d7b$ +// $hash=33a36c40703e1a794c2d8365f0ed692bad529e4b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/client_ctocpp.cc b/libcef_dll/ctocpp/client_ctocpp.cc index 799052045461282e641a85ca3105208073107d6a..b487f7834a7d1372322f9ce03105b3f894f6c676 100644 --- a/libcef_dll/ctocpp/client_ctocpp.cc +++ b/libcef_dll/ctocpp/client_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=27270f7160816afd79ad03d79666bb9081c36d69$ +// $hash=436a0caddb3462984212dac75c032567a9ed3b8f$ // #include "libcef_dll/ctocpp/client_ctocpp.h" diff --git a/libcef_dll/ctocpp/client_ctocpp.h b/libcef_dll/ctocpp/client_ctocpp.h index ac5432fbdedbb84278db9caf63ac8208c67c5562..f11c286ed286627490f5802cc2e239afa577aa12 100644 --- a/libcef_dll/ctocpp/client_ctocpp.h +++ b/libcef_dll/ctocpp/client_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7ad6d7e9d42490e37b36f90c8d81e20279d08a02$ +// $hash=54d655f962cd0456df1e5b9cbdff3379bc1b48d3$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_CLIENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/command_handler_ctocpp.cc b/libcef_dll/ctocpp/command_handler_ctocpp.cc index a1d2fc79dad3f31f9ace5f5fb05bd81d949e4ab2..049999068e87a6aab68e2401c29bb14b82b535b1 100644 --- a/libcef_dll/ctocpp/command_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/command_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=33ab5abc650f7d7397591247fc9db2a96437128b$ +// $hash=f2eb90b2952e6958a01be325567b35d83c0643e6$ // #include "libcef_dll/ctocpp/command_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/command_handler_ctocpp.h b/libcef_dll/ctocpp/command_handler_ctocpp.h index edee979e261d1e033a19dcde008894781364550a..c5bf82300ea42383c9b2e7f94dc6876a4f3f23a3 100644 --- a/libcef_dll/ctocpp/command_handler_ctocpp.h +++ b/libcef_dll/ctocpp/command_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1b2964d26fd06e862a4ef69f6c29ab50adcae27f$ +// $hash=ad0096887a1662a2cc3804248365e56fc20d6eaa$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COMMAND_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/command_line_ctocpp.cc b/libcef_dll/ctocpp/command_line_ctocpp.cc index f7e6d6e6796ed2e391cbe8f5e052d13d22ea2540..4ff4159e50de680ab810732c89970ff696e5811e 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.cc +++ b/libcef_dll/ctocpp/command_line_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=897f6479484a1cebcf3d18b8785940ba6eec5c40$ +// $hash=aeb30347dcf0a11ee20524f07fe7eb980c2163f2$ // #include "libcef_dll/ctocpp/command_line_ctocpp.h" diff --git a/libcef_dll/ctocpp/command_line_ctocpp.h b/libcef_dll/ctocpp/command_line_ctocpp.h index 333ebf9b99bd39e4f553231e9dfdd7ce9c6f8a5c..7beaa99e038c6254e7c844ec3f6afffe2ea64722 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.h +++ b/libcef_dll/ctocpp/command_line_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9640cfd33eee4b9298e2c2c9a34c6e3b4dbf7070$ +// $hash=c91f76be5a60016fa78afe2813b0d4df3bb422e7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/completion_callback_ctocpp.cc b/libcef_dll/ctocpp/completion_callback_ctocpp.cc index be12dd528dba0674304de38a9f6e68dfbcf076da..930ef04b3ab716393746c83889c5bf936154eb6b 100644 --- a/libcef_dll/ctocpp/completion_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/completion_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=19d9b318c5dedf4f003999db22441a2d19f8bbd5$ +// $hash=3c645623a6fdcc8eb1dc721fc84ca63a85cdbe3c$ // #include "libcef_dll/ctocpp/completion_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/completion_callback_ctocpp.h b/libcef_dll/ctocpp/completion_callback_ctocpp.h index 1277c126f9f0373e077c18d2133a2d04089d0724..37956aadac1fb647f17d1a0860560defe4c56e61 100644 --- a/libcef_dll/ctocpp/completion_callback_ctocpp.h +++ b/libcef_dll/ctocpp/completion_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=defba201c83247b4e41952558ee8dc260c3c3cae$ +// $hash=bbdf6c23d87122deb5d3100430547b2c608497a9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COMPLETION_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc b/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc index 7cf06720e65db324273e736967345588cfe0b5b0..6ec39b5e9f7303b2f3f3f19d0ca9bc61f3757508 100644 --- a/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/context_menu_handler_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a74c5b939b0e9b587206cdd2e6c30d50127b3858$ +// $hash=43f566dcca4917092738d6b4b33a7886ba081955$ // #include "libcef_dll/ctocpp/context_menu_handler_ctocpp.h" @@ -331,13 +331,15 @@ void CefContextMenuHandlerCToCpp::OnQuickMenuDismissed( // Execute _struct->on_quick_menu_dismissed(_struct, CefBrowserCppToC::Wrap(browser), - CefFrameCppToC::Wrap(frame), is_mouse_trigger); + CefFrameCppToC::Wrap(frame), + is_mouse_trigger); } NO_SANITIZE("cfi-icall") void CefContextMenuHandlerCToCpp::OnGetImageForContextNode( CefRefPtr browser, - CefRefPtr image) { + CefRefPtr image, + int command_id) { shutdown_checker::AssertNotShutdown(); cef_context_menu_handler_t* _struct = GetStruct(); @@ -360,12 +362,13 @@ void CefContextMenuHandlerCToCpp::OnGetImageForContextNode( // Execute _struct->on_get_image_for_context_node( - _struct, CefBrowserCppToC::Wrap(browser), CefImageCppToC::Wrap(image)); + _struct, CefBrowserCppToC::Wrap(browser), CefImageCppToC::Wrap(image), + command_id); } NO_SANITIZE("cfi-icall") -void CefContextMenuHandlerCToCpp::OnGetImageFromCache( - CefRefPtr image) { +void CefContextMenuHandlerCToCpp::OnGetImageFromCache(CefRefPtr image, + int command_id) { shutdown_checker::AssertNotShutdown(); cef_context_menu_handler_t* _struct = GetStruct(); @@ -382,12 +385,12 @@ void CefContextMenuHandlerCToCpp::OnGetImageFromCache( } // Execute - _struct->on_get_image_from_cache(_struct, CefImageCppToC::Wrap(image)); + _struct->on_get_image_from_cache(_struct, CefImageCppToC::Wrap(image), + command_id); } NO_SANITIZE("cfi-icall") -void CefContextMenuHandlerCToCpp::HideHandleAndQuickMenuIfNecessary( - bool hide) { +void CefContextMenuHandlerCToCpp::HideHandleAndQuickMenuIfNecessary(bool hide) { shutdown_checker::AssertNotShutdown(); cef_context_menu_handler_t* _struct = GetStruct(); @@ -401,6 +404,21 @@ void CefContextMenuHandlerCToCpp::HideHandleAndQuickMenuIfNecessary( _struct->hide_handle_and_quick_menu_if_necessary(_struct, hide); } +NO_SANITIZE("cfi-icall") +void CefContextMenuHandlerCToCpp::ChangeVisibilityOfQuickMenu() { + shutdown_checker::AssertNotShutdown(); + + cef_context_menu_handler_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, change_visibility_of_quick_menu)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->change_visibility_of_quick_menu(_struct); +} + // CONSTRUCTOR - Do not edit by hand. CefContextMenuHandlerCToCpp::CefContextMenuHandlerCToCpp() {} diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.h b/libcef_dll/ctocpp/context_menu_handler_ctocpp.h index ad25a19f7cb173ee54362a44802642233f51f4f9..87eec8caf0166bc9c84d6f8f464259185744d2f1 100644 --- a/libcef_dll/ctocpp/context_menu_handler_ctocpp.h +++ b/libcef_dll/ctocpp/context_menu_handler_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=daa7f5e7ef35f3b104fc5d8a1990aa44dbd8c0a6$ +// $hash=5504d46b7d4abdb3c6bb3f749f3e4e37747a0b41$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_HANDLER_CTOCPP_H_ @@ -71,9 +71,11 @@ class CefContextMenuHandlerCToCpp CefRefPtr frame, bool is_mouse_trigger) override; void OnGetImageForContextNode(CefRefPtr browser, - CefRefPtr image) override; - void OnGetImageFromCache(CefRefPtr image) override; + CefRefPtr image, + int command_id) override; + void OnGetImageFromCache(CefRefPtr image, int command_id) override; void HideHandleAndQuickMenuIfNecessary(bool hide) override; + void ChangeVisibilityOfQuickMenu() override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc b/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc index a72261cbc7789931b2af455c31714166b5dcbe10..c1fc1616fc23e8a8b877357dad827c07f9435cb1 100644 --- a/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_access_filter_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0f35c2a953b54bdf237feaa74a8ff38769bbc39a$ +// $hash=2982f6957159b86ce039dfe9e67726a30bb98636$ // #include "libcef_dll/ctocpp/cookie_access_filter_ctocpp.h" diff --git a/libcef_dll/ctocpp/cookie_access_filter_ctocpp.h b/libcef_dll/ctocpp/cookie_access_filter_ctocpp.h index 60f100a689d7bde306511fe2e390975559881165..0da831215c084a79c2f2e6a78cd5152ed314c3bf 100644 --- a/libcef_dll/ctocpp/cookie_access_filter_ctocpp.h +++ b/libcef_dll/ctocpp/cookie_access_filter_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e4f137861ddc8f57bdbf50661d3c2a88a3a65008$ +// $hash=b325a81a438e8e510eb826bc4e6acf5df04281c8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COOKIE_ACCESS_FILTER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc b/libcef_dll/ctocpp/cookie_manager_ctocpp.cc index bdb22faa8acaaa996c4683a29c3814b302fec292..92f2cb8ef910bb7fa93ff2f25bbbf7b1fbfae7fd 100644 --- a/libcef_dll/ctocpp/cookie_manager_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_manager_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5c57059464bb94fa6aef835e9bfa26eaf6b53991$ +// $hash=71436c164c500fbd34fef8a5b1161df9a8c904a4$ // #include "libcef_dll/ctocpp/cookie_manager_ctocpp.h" @@ -108,7 +108,8 @@ bool CefCookieManagerCToCpp::VisitUrlCookies( const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) { + bool is_sync, + bool is_from_ndk) { cef_cookie_manager_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, visit_url_cookies)) { return false; @@ -130,7 +131,7 @@ bool CefCookieManagerCToCpp::VisitUrlCookies( // Execute int _retval = _struct->visit_url_cookies( _struct, url.GetStruct(), includeHttpOnly, - CefCookieVisitorCppToC::Wrap(visitor), is_sync); + CefCookieVisitorCppToC::Wrap(visitor), is_sync, is_from_ndk); // Return type: bool return _retval ? true : false; @@ -141,7 +142,8 @@ bool CefCookieManagerCToCpp::SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) { + const CefString& str_cookie, + bool includeHttpOnly) { cef_cookie_manager_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, set_cookie)) { return false; @@ -162,9 +164,10 @@ bool CefCookieManagerCToCpp::SetCookie(const CefString& url, // Unverified params: callback // Execute - int _retval = _struct->set_cookie(_struct, url.GetStruct(), &cookie, - CefSetCookieCallbackCppToC::Wrap(callback), - is_sync, str_cookie.GetStruct()); + int _retval = + _struct->set_cookie(_struct, url.GetStruct(), &cookie, + CefSetCookieCallbackCppToC::Wrap(callback), is_sync, + str_cookie.GetStruct(), includeHttpOnly); // Return type: bool return _retval ? true : false; diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.h b/libcef_dll/ctocpp/cookie_manager_ctocpp.h index 9f200e7512e92c440f963a4a52c50b7143283d65..229d1e59eac4db0cae0966d2e4539e861fb92e17 100644 --- a/libcef_dll/ctocpp/cookie_manager_ctocpp.h +++ b/libcef_dll/ctocpp/cookie_manager_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7460fa1f38e0e6d4296dba0deadc50a7ca5ef639$ +// $hash=ec16167eae0a7b60526d88c20a864e3227e8971d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COOKIE_MANAGER_CTOCPP_H_ @@ -40,12 +40,14 @@ class CefCookieManagerCToCpp bool VisitUrlCookies(const CefString& url, bool includeHttpOnly, CefRefPtr visitor, - bool is_sync) override; + bool is_sync, + bool is_from_ndk) override; bool SetCookie(const CefString& url, const CefCookie& cookie, CefRefPtr callback, bool is_sync, - const CefString& str_cookie) override; + const CefString& str_cookie, + bool includeHttpOnly) override; bool DeleteCookies(const CefString& url, const CefString& cookie_name, bool is_session, diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc b/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc index 38ce7ac614ff4e366e58e1174e2eea77ab615d58..0c66457a4d2494d5b97fe93b58a1c82836ef0676 100644 --- a/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/cookie_visitor_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7086a574e6be9cd974ea2b72cec10e4e56cbcc67$ +// $hash=0282442c3d4466075de2330f35d3c4338ca7fe29$ // #include "libcef_dll/ctocpp/cookie_visitor_ctocpp.h" diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.h b/libcef_dll/ctocpp/cookie_visitor_ctocpp.h index 1101eff4d0b5f92fa80dcfb3a6028ffac5181246..25aae27f205f1919195f8dc46d074e8e15ce121d 100644 --- a/libcef_dll/ctocpp/cookie_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/cookie_visitor_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=34d19a4a01ce752e71103744d044f7a3520a2aee$ +// $hash=1824342f14e23ea975b7faed0406036568d88ba8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_COOKIE_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/data_base_ctocpp.cc b/libcef_dll/ctocpp/data_base_ctocpp.cc index 7703e4ba18b026c6a7a75fc50bb39def4ae5f965..d90a1d4b7eb505f12b9fe10d33da3cbc7576ad09 100644 --- a/libcef_dll/ctocpp/data_base_ctocpp.cc +++ b/libcef_dll/ctocpp/data_base_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=807222313dbae295b1dc998ba1d6681a4051b2e1$ +// $hash=bd44ecfe823d9be5bec4d1b9d05d0b23dbba8ab4$ // #include "libcef_dll/ctocpp/data_base_ctocpp.h" diff --git a/libcef_dll/ctocpp/data_base_ctocpp.h b/libcef_dll/ctocpp/data_base_ctocpp.h index 4afc64ce3e8c9da61c7087d3c759fb63c47170d8..41b9a15b369a7e4b518bfd4e9f61e74a1be3ef2e 100644 --- a/libcef_dll/ctocpp/data_base_ctocpp.h +++ b/libcef_dll/ctocpp/data_base_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=38b7e850e3a8969fcd3644753eab122e3ffc58d5$ +// $hash=0a76a650645cbe773c0109fd95ce88ff4c0841e5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DATA_BASE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.cc b/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.cc index 07c32974ff717e57e9dfdaf1c0a39c40f169dcb8..5f0eefd18d8e052279af39d954efbbd70ca99a55 100644 --- a/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c733a7bd666f64150488d271ade42b067f984f34$ +// $hash=1eb378f0ca052928783ffcef7b015f41b523169b$ // #include "libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.h b/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.h index 864de14a617b3d2c7ea78e8245bbf3a77f90fe5c..7b77ee270b30bf6c818f0c6e079b3faf3ea28154 100644 --- a/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.h +++ b/libcef_dll/ctocpp/date_time_chooser_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bfe8106426082897d7ad83ab98563b1cb99e1d2f$ +// $hash=55768915d02a51b9793ac7913d6e381ec6889197$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DATE_TIME_CHOOSER_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc index 8f7341f6ccdb779f46febd2201d1ee69804ac6a9..51ab2d3f16bcd9cdc460e7d8a1545ab228bf9cc7 100644 --- a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=63a897235aee0b6509c0c760b305bb1bfbe37972$ +// $hash=26d697d88a0312f47a3fe212b4c77cdb4e8b5800$ // #include "libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h index f3399892d9c1a32ece9fa8262483d47ce5aae5e4..7e7bdaf33bc110268d7a523903fba58376a0a842 100644 --- a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h +++ b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=93d9d221ae3a8d38676d3b1935d000a2dcfce28b$ +// $hash=e064baa776ef2fb9b70d51ec556613859a222067$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DELETE_COOKIES_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc b/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc index 3e15a27dc6f803d320be6bbbab7bdc67acc2f38a..994ae24c7d7c4d1944bcd17f41d2667210d33df0 100644 --- a/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc +++ b/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=81d479e702a6e9b010938e10f8bc16e505ac0fc9$ +// $hash=145f7445eb4094e268b6a135a61535fdd780507e$ // #include "libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h" diff --git a/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h b/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h index b5874692e963c2274328a63ea0a65f79e669042b..c328e21fdbccbd7cd8736e08f5343384f4767f28 100644 --- a/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h +++ b/libcef_dll/ctocpp/dev_tools_message_observer_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bfe6c76838433981b91f7288a1f053b7af1f5ed3$ +// $hash=13f5ab113bea9ee958f3d92e1c10898fd182c14e$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DEV_TOOLS_MESSAGE_OBSERVER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc index a3296635b99feaf01e4e5c2b8b62bfe9f76fe334..18300783639c657a83cd9fdfd58b7424e3aab384 100644 --- a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f141018cb91f13b379e6bc51e714ae6059fda99e$ +// $hash=e4b272e7bc1871b41914120227dd6b96ee3844f4$ // #include "libcef_dll/ctocpp/dialog_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/dialog_handler_ctocpp.h b/libcef_dll/ctocpp/dialog_handler_ctocpp.h index 7a542f97c215935e6c87a7275707f8da8171492d..457b7c61dc57c9188cec2a3dfad10d05357a13b4 100644 --- a/libcef_dll/ctocpp/dialog_handler_ctocpp.h +++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ef0e2e93340e25211668b8a3391a2aee735d2727$ +// $hash=4d9ff892b5e6683d3efef64bfdaad6a50513cddc$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DIALOG_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc b/libcef_dll/ctocpp/dictionary_value_ctocpp.cc index a132f841b79ed30d912bbf17b747e2599a08c5b5..1937d21f77ae7d981702dae2e4d62c67d64a8944 100644 --- a/libcef_dll/ctocpp/dictionary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/dictionary_value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b495bbe7a2721bdf22569007aa10183948819dc8$ +// $hash=21357f7bdec9fe05f50147f4605572ed795e6bcc$ // #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h" diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.h b/libcef_dll/ctocpp/dictionary_value_ctocpp.h index 586915e9724baef9ccc0e2311f652afd97ee5daa..ba9843f84957a528240f6129c7c2dfa6e7221063 100644 --- a/libcef_dll/ctocpp/dictionary_value_ctocpp.h +++ b/libcef_dll/ctocpp/dictionary_value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a0138ac9f22ed820ed95e9edea315914793040d3$ +// $hash=68a7aff9f01e57edaeaa53bfbbc4c6121ebb3a1b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DICTIONARY_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.cc b/libcef_dll/ctocpp/display_handler_ctocpp.cc index ae61df8ddeac7d471103b752f4e46405f2f387f9..30ca1b94c6d0aec8dbab8bfb2bdd27c0b022957b 100644 --- a/libcef_dll/ctocpp/display_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/display_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.h b/libcef_dll/ctocpp/display_handler_ctocpp.h index 96062b50aac43b7d04af4f8c604e65033bec951c..5f29d0f35ebcdb9464c544801741beb890c3bb3f 100644 --- a/libcef_dll/ctocpp/display_handler_ctocpp.h +++ b/libcef_dll/ctocpp/display_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.cc b/libcef_dll/ctocpp/domdocument_ctocpp.cc index dbc1724f7af520161df2ecad08ceaeba6e710ebd..be759bba9acabb63008b6ad2d377a604a4700f82 100644 --- a/libcef_dll/ctocpp/domdocument_ctocpp.cc +++ b/libcef_dll/ctocpp/domdocument_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8b75c3c7e31574cd02f52b30d748f7e13070594c$ +// $hash=7605dec503f07e4490341d3b60d2a4c0179a3d53$ // #include "libcef_dll/ctocpp/domdocument_ctocpp.h" diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.h b/libcef_dll/ctocpp/domdocument_ctocpp.h index c4bf36fd9c5463903a502232426453a8d758d4ec..29fe326f855a3e518a86321ae575efd8b6dca869 100644 --- a/libcef_dll/ctocpp/domdocument_ctocpp.h +++ b/libcef_dll/ctocpp/domdocument_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6fad9f28ab4f63ae0b96fac0806b23b73a492211$ +// $hash=987816a9b106341068d08f3cd9254c98cf77f6ad$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domnode_ctocpp.cc b/libcef_dll/ctocpp/domnode_ctocpp.cc index 43ff111a154431793e887501f975f5e504ec4657..4b820aaf5675e3c52e70af42a265b52da531d1c1 100644 --- a/libcef_dll/ctocpp/domnode_ctocpp.cc +++ b/libcef_dll/ctocpp/domnode_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9d05302b1f9dab5329b319134ed196a779dcd7f7$ +// $hash=84848cc9affe98814d49ff6a27854b61bec42992$ // #include "libcef_dll/ctocpp/domnode_ctocpp.h" diff --git a/libcef_dll/ctocpp/domnode_ctocpp.h b/libcef_dll/ctocpp/domnode_ctocpp.h index db3ce6d940c9eab6c38274ba8194aa1e1e80135b..a16b3109a57885382f13a6701810f66312037117 100644 --- a/libcef_dll/ctocpp/domnode_ctocpp.h +++ b/libcef_dll/ctocpp/domnode_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a07d115868477fbf1e43b3fa9fbd5e6be2788daf$ +// $hash=343a5f84d09a6933f005c3915582c73c43bda406$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.cc b/libcef_dll/ctocpp/domvisitor_ctocpp.cc index 2b975908c20209afb821c7bba4d546e9ff71e328..af3a78a6da20abb53d0f66a409a672cddc3d1fb8 100644 --- a/libcef_dll/ctocpp/domvisitor_ctocpp.cc +++ b/libcef_dll/ctocpp/domvisitor_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=318aa17fd227ce261d357eb4850b5cd1cb7ab97f$ +// $hash=8418f3ac65c441630719aa8f6f44dfcbaf778f2f$ // #include "libcef_dll/ctocpp/domvisitor_ctocpp.h" diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.h b/libcef_dll/ctocpp/domvisitor_ctocpp.h index 04bb33b92eef74585eb199c3d6b90d51344ab6b2..0504b52266adebfe5fb6f3bbcc19e961738e3b06 100644 --- a/libcef_dll/ctocpp/domvisitor_ctocpp.h +++ b/libcef_dll/ctocpp/domvisitor_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=00048905ffef8534bd09afd23937b700887f490a$ +// $hash=9f8a534b9feef5b972259d972bf30ad838e1a788$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOMVISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.cc b/libcef_dll/ctocpp/download_handler_ctocpp.cc index 0fcf8d31864a65a86cc2cd8850b51a2f93e9f70b..8d77c59a7163db111facb0232326d9d467a502ae 100644 --- a/libcef_dll/ctocpp/download_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/download_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=690401fe62e7a96ea1c2d72b48144f789207e204$ +// $hash=23264ad881e05de87c12279841ec0f8c071c5503$ // #include "libcef_dll/ctocpp/download_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.h b/libcef_dll/ctocpp/download_handler_ctocpp.h index e41ccc64848f4aa09c8c7e166cc536728817c089..d8253204980687b03fa7aa76973ac7af18906a06 100644 --- a/libcef_dll/ctocpp/download_handler_ctocpp.h +++ b/libcef_dll/ctocpp/download_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=13fc7d443a6c044598f0683e235f682d91798042$ +// $hash=486d31ad20241c84c224f0b8c90fe0c0f915ad18$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_image_callback_ctocpp.cc b/libcef_dll/ctocpp/download_image_callback_ctocpp.cc index 78df406304052a2ecea593c637c65af61aa33006..d26719d742645eddc48ddf35e8c86ef154a5e71c 100644 --- a/libcef_dll/ctocpp/download_image_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/download_image_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=aadd98d24c5a0e57a832fd4c6334a71e7723996f$ +// $hash=c23c4882077e50ffcf64425b3a5476ad3cfb9cb8$ // #include "libcef_dll/ctocpp/download_image_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/download_image_callback_ctocpp.h b/libcef_dll/ctocpp/download_image_callback_ctocpp.h index 265997899f7dab4a5c2de5d2e0fbad440ab4169d..5c7b7ccb064e25af6e4d8c1be1a79cdd858cc698 100644 --- a/libcef_dll/ctocpp/download_image_callback_ctocpp.h +++ b/libcef_dll/ctocpp/download_image_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7ce089e8f7789e5a260579d143f90201e55e61fb$ +// $hash=c281c09951a9b4f85556d0a9008b2524326254dd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_IMAGE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc b/libcef_dll/ctocpp/download_item_callback_ctocpp.cc index a8b30979dfa0930377e3fc83675611f384ffe9d9..557b2c65a8a2fc270c1ac223fec6087abb81892f 100644 --- a/libcef_dll/ctocpp/download_item_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/download_item_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7045db87f55761534c3d1b32895626a652693c7c$ +// $hash=12c936fbf246741f64131f68557538017701298c$ // #include "libcef_dll/ctocpp/download_item_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.h b/libcef_dll/ctocpp/download_item_callback_ctocpp.h index 09a247e92c81c362abbff9abc2d837c161c38b3a..0f52a4120b1daa59b634babaebb76768748b4665 100644 --- a/libcef_dll/ctocpp/download_item_callback_ctocpp.h +++ b/libcef_dll/ctocpp/download_item_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=42867265f52e0e591f7257783fbf431c10c4f003$ +// $hash=013ef6edbf734cdf4e6d00ba5b8be6c46284e2ca$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_item_ctocpp.cc b/libcef_dll/ctocpp/download_item_ctocpp.cc index 190ded772c9371614d946ba04b8143ff05f9551c..bd4b604c999eab46a17181f9a550a7e11b52bbf5 100644 --- a/libcef_dll/ctocpp/download_item_ctocpp.cc +++ b/libcef_dll/ctocpp/download_item_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9856586d219a5b1ddc6d26c51049599569ba4234$ +// $hash=4e1a4826a5fc77e2d81cbd8f4d1d721fe416d3d6$ // #include "libcef_dll/ctocpp/download_item_ctocpp.h" diff --git a/libcef_dll/ctocpp/download_item_ctocpp.h b/libcef_dll/ctocpp/download_item_ctocpp.h index b1dd135b25430e65af7cab04c298b08c129b8a8a..68ef45f32302c2aec59d81c24172515e086c18d9 100644 --- a/libcef_dll/ctocpp/download_item_ctocpp.h +++ b/libcef_dll/ctocpp/download_item_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a8764ac5ba0126a6ebf5cfa008ed0fa62fa90a96$ +// $hash=1fe7226c96b62b2e91dda051fe89ab47077c80e4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/drag_data_ctocpp.cc b/libcef_dll/ctocpp/drag_data_ctocpp.cc index b87e585fd79a662905c6df869e829e60a7e36324..432dcf2a4d72f1dea0fe37ea467bb1940353abed 100644 --- a/libcef_dll/ctocpp/drag_data_ctocpp.cc +++ b/libcef_dll/ctocpp/drag_data_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=987d78dab5462e7102ca48dad04744c3e765abd8$ +// $hash=b50887c132221b732b8e8ccf3f1e87c18698107c$ // #include "libcef_dll/ctocpp/drag_data_ctocpp.h" diff --git a/libcef_dll/ctocpp/drag_data_ctocpp.h b/libcef_dll/ctocpp/drag_data_ctocpp.h index df025242d73fa73864d0d3e70a86833d69d1e127..39f029c1bd1fc7e31a2f014209794febdca50511 100644 --- a/libcef_dll/ctocpp/drag_data_ctocpp.h +++ b/libcef_dll/ctocpp/drag_data_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bafc8deaf25ff4b957cd9717ba50816075246f0f$ +// $hash=36c609fd7ccbac82b420554040d43651e23a1c73$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.cc b/libcef_dll/ctocpp/drag_handler_ctocpp.cc index 3c9de9381601a09c99ae75dd0c1aa1aff708931a..a440d49e55540340b0a7759b16e5bf807981a207 100644 --- a/libcef_dll/ctocpp/drag_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/drag_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=65cf0fa1f2308c7e20327c4e91c75f1365f38d5c$ +// $hash=de7454fdcb2d48f43bb22d95d989050c3dce0f16$ // #include "libcef_dll/ctocpp/drag_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.h b/libcef_dll/ctocpp/drag_handler_ctocpp.h index c664720dce846b641fe35aa6a3ca95421b9e584b..153cf4982e17d0c5510f1251742885e373310b5e 100644 --- a/libcef_dll/ctocpp/drag_handler_ctocpp.h +++ b/libcef_dll/ctocpp/drag_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9a94ba84248d15d2fe6f55e7c89f0b887d93b5c7$ +// $hash=a8523e82439b30828b0774d2eff240ea215b96d6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_DRAG_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc index 71b8ccbeac9399d1c8091002e218900a275c831a..49154338bf9babf8d043674699f2dcc28ae6fe63 100644 --- a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=897dd09938630982f5ebd158d9edd86df6b8ae0e$ +// $hash=870f78147369bc35912730714caef7559fa41c99$ // #include "libcef_dll/ctocpp/end_tracing_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h index 3176fd3dddadb2fb478e46fb8d6b2d2ebd1cce93..c915803e6a90bcf92a6a3c2291e4fbb905c93a9e 100644 --- a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h +++ b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=678fd2c391bf355894dffd7e0c8b00c68924dcb1$ +// $hash=d798b3255a8ad2aea9d4afbe3492eaad538d8d0a$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_END_TRACING_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/extension_ctocpp.cc b/libcef_dll/ctocpp/extension_ctocpp.cc index 28a189b8ea357271ee0bf099a60a52d51a72d2dd..4533afb130cf21a0ef50fa15ce5c6f3f60919d5f 100644 --- a/libcef_dll/ctocpp/extension_ctocpp.cc +++ b/libcef_dll/ctocpp/extension_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3ad14a232fc9ce8d18ef29f145973353bea42c2c$ +// $hash=dd6eb9dad8ce6a01307fb48ec0fc4f9a2a61e4ee$ // #include "libcef_dll/ctocpp/extension_ctocpp.h" diff --git a/libcef_dll/ctocpp/extension_ctocpp.h b/libcef_dll/ctocpp/extension_ctocpp.h index ab7916a0ce21f5d7bfb5916df3e1c4edaa3c11a9..b186810837867c181867041731d294155ac15a21 100644 --- a/libcef_dll/ctocpp/extension_ctocpp.h +++ b/libcef_dll/ctocpp/extension_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7de473e208a22e02a0b8f731e34833de5fcd9fc8$ +// $hash=07a08b9dd260059e77dfb433f43686cbc5569bea$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_EXTENSION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/extension_handler_ctocpp.cc b/libcef_dll/ctocpp/extension_handler_ctocpp.cc index a57276f2106440cad6af9bc9e3d3aac2eb72a843..ea0ab8e9877c7dcb3dab8022e455b8b3d17f6e7a 100644 --- a/libcef_dll/ctocpp/extension_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/extension_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e0625dda013caffe26eb30ba95e522cfff014c7b$ +// $hash=b1961c4ff6c203edef2f48bdbb5ac773815a15c7$ // #include "libcef_dll/ctocpp/extension_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/extension_handler_ctocpp.h b/libcef_dll/ctocpp/extension_handler_ctocpp.h index 6e500075557496c34d46fb34b869eba6592e8ef8..eab84e7d05997fc44446b5a00ded8174cdb96083 100644 --- a/libcef_dll/ctocpp/extension_handler_ctocpp.h +++ b/libcef_dll/ctocpp/extension_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f46472a2e69f2ae063eb5f518c0b9c260bc84c95$ +// $hash=5e432e7dd8e10b681b96bad3694ba2d0bf79fad6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_EXTENSION_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc index 02a36e51670497137bd179a239e24fbe6480ea9c..46ad4e2408d64d0131d0e6377fe89419049778b1 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0c23b927c44e3a77ea75818e1a87ba44c66853b3$ +// $hash=01a59b2a4850603dcb6df74f33431d13bcf2c5c9$ // #include "libcef_dll/ctocpp/file_dialog_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h index 3f8fed4b4496645ee4af6c1c5d89384ef6fe1bce..266a8b7c0e788089c22e71af3d3f425c74f454ea 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e52994f07675386d2ef6ff53cdde6364ae205f0c$ +// $hash=75544d28b1d0f0cdfc2f8cb1bd3f521cfe676bce$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FILE_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/find_handler_ctocpp.cc b/libcef_dll/ctocpp/find_handler_ctocpp.cc index 6fc960f235dff15ccab6f60e97ba36dd5aad5d7e..89b9b6bae8412b0f2d4df5cefa08931efa74cfcc 100644 --- a/libcef_dll/ctocpp/find_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/find_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=79a46545b8076ffef894853c9cb5f886b69df3f4$ +// $hash=f39b33835f8368cc507c189fd54f63740b338f43$ // #include "libcef_dll/ctocpp/find_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/find_handler_ctocpp.h b/libcef_dll/ctocpp/find_handler_ctocpp.h index 9b13fbf0cf0fa8c1c8f045d3e98aefbb4844fa14..98f75b2d511853248e840ec9fc90a0d022801231 100644 --- a/libcef_dll/ctocpp/find_handler_ctocpp.h +++ b/libcef_dll/ctocpp/find_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d6c41551dd56b228d6f3015ffbc047bd68b8cb2e$ +// $hash=8b86bd425ab5e9283d8fc8ac96b54740bf495cbb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FIND_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.cc b/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.cc index 11a2f9f4042e75dfe06aff47c8a49e81c1c2f32c..00829e9261fab0693b3eca8b4f97f63dffa6848e 100644 --- a/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.cc +++ b/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.cc @@ -78,4 +78,4 @@ CefWrapperType CefCToCppRefCounted::kWrapperType = - WT_FIRST_MEANINGFUL_PAINT_DETAILS; + WT_FIRST_MEANINGFUL_PAINT_DETAILS; \ No newline at end of file diff --git a/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.h b/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.h index 4bfc891f455eac27722ef9a28fd06c0ae8c115c7..4c83e44abd79ac35d0f9564cacaf1d92da51d5bb 100644 --- a/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.h +++ b/libcef_dll/ctocpp/first_meaningful_paint_details_ctocpp.h @@ -39,4 +39,4 @@ class CefFirstMeaningfulPaintDetailsCToCpp int64_t GetFirstMeaningfulPaintTime() override; }; -#endif // CEF_LIBCEF_DLL_CTOCPP_FIRST_MEANINGFUL_PAINT_DETAILS_CTOCPP_H_ +#endif // CEF_LIBCEF_DLL_CTOCPP_FIRST_MEANINGFUL_PAINT_DETAILS_CTOCPP_H_ \ No newline at end of file diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.cc b/libcef_dll/ctocpp/focus_handler_ctocpp.cc index e8e788f0f960c760cdec339c2ab6351906d86800..5e6eacc47d3be506b6fb4351568ef2256fb62504 100644 --- a/libcef_dll/ctocpp/focus_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/focus_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5a88a1b3cf33cb6e6cfedd6c73293ed47b3de492$ +// $hash=0fa4cd5767bcd31e0629bd625fb7e97811265fba$ // #include "libcef_dll/ctocpp/focus_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.h b/libcef_dll/ctocpp/focus_handler_ctocpp.h index ffa9a201774d36c8b22c9e7dd7aebacc43b10b06..6c0f92203cfd823d51f198b2be87c412bb500e95 100644 --- a/libcef_dll/ctocpp/focus_handler_ctocpp.h +++ b/libcef_dll/ctocpp/focus_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c224f0ecf481f11c404a3de77c8ae581f7c4f21a$ +// $hash=6a454cd9846e772380a72c5429d114f73cc3c1f5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FOCUS_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/form_handler_ctocpp.cc b/libcef_dll/ctocpp/form_handler_ctocpp.cc index 7f994157c9f76b07aa7f7700c8aebe783d9c6c89..cea9986448b647f37b8d9ade730f5bb61380e6db 100644 --- a/libcef_dll/ctocpp/form_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/form_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fc1a9a7c33451ef149ba4131bd3859215189a492$ +// $hash=ee9e218c297f1b9a283ef530ded392f0754e5ee0$ // #include "libcef_dll/ctocpp/form_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/form_handler_ctocpp.h b/libcef_dll/ctocpp/form_handler_ctocpp.h index 02ae745c867113ebd48ff48bdcda875af9b8dda6..9254a3c4a243d89d6b69b1123ff532514974eae2 100644 --- a/libcef_dll/ctocpp/form_handler_ctocpp.h +++ b/libcef_dll/ctocpp/form_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=286556f3b96cd687bf17b48c0f9648e15109f997$ +// $hash=badfd56e41853f80eb0b92fed2afcac1dfab570e$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FORM_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/frame_ctocpp.cc b/libcef_dll/ctocpp/frame_ctocpp.cc index 7ebbb6d9c387bd3a237efa604cdcb0120c97aebc..e745ce7a7907f9cd2faef74fd53c18af20dc3623 100644 --- a/libcef_dll/ctocpp/frame_ctocpp.cc +++ b/libcef_dll/ctocpp/frame_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // diff --git a/libcef_dll/ctocpp/frame_ctocpp.h b/libcef_dll/ctocpp/frame_ctocpp.h index 13a3917a39012e32ed841b0b30697749bd346a8f..c394219af0367517429a4687b3215e2539b3ca62 100644 --- a/libcef_dll/ctocpp/frame_ctocpp.h +++ b/libcef_dll/ctocpp/frame_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // diff --git a/libcef_dll/ctocpp/frame_handler_ctocpp.cc b/libcef_dll/ctocpp/frame_handler_ctocpp.cc index 42c0b408060f24ee420bbb7bf85a23c797c88236..eb2a809ec4e966672bf8954a728881aa3e92f6bd 100644 --- a/libcef_dll/ctocpp/frame_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/frame_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0074492ed580ccc06962a05b6c72bdabae182a51$ +// $hash=7556f5356f91f554c88cadd534f2260081b23e39$ // #include "libcef_dll/ctocpp/frame_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/frame_handler_ctocpp.h b/libcef_dll/ctocpp/frame_handler_ctocpp.h index 3a0459cc1c5ab63357021d7c4a7ebeca299fb96a..be28fb88ae3ed14e9bf304b73ef8f721fcdc7fe5 100644 --- a/libcef_dll/ctocpp/frame_handler_ctocpp.h +++ b/libcef_dll/ctocpp/frame_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a571fa8b3c173d78cfb67eb3e44c8f2c3fb2e089$ +// $hash=a1366f78329888eadf9121d7df819687d82a40c7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_FRAME_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/geolocation_acess_ctocpp.cc b/libcef_dll/ctocpp/geolocation_acess_ctocpp.cc index d8588c6f0bc2b724c6f33e36c26a805cddceeb28..7ac6881eca1310e0e4d1ac3233438a2fb7b43295 100644 --- a/libcef_dll/ctocpp/geolocation_acess_ctocpp.cc +++ b/libcef_dll/ctocpp/geolocation_acess_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=46e10785699fd3c2864cb543f714b0bd0a19c629$ +// $hash=033b41129570d40d13fcbbd6a45cae967fdee86b$ // #include "libcef_dll/ctocpp/geolocation_acess_ctocpp.h" diff --git a/libcef_dll/ctocpp/geolocation_acess_ctocpp.h b/libcef_dll/ctocpp/geolocation_acess_ctocpp.h index 13fa5edc10073021f172b4fedf2df4c3a13e4fcf..337512679d1fa387fc7d0eec0e268a1401060dd5 100644 --- a/libcef_dll/ctocpp/geolocation_acess_ctocpp.h +++ b/libcef_dll/ctocpp/geolocation_acess_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=676f9a27e6f2665faa8ca72b5ed29fb78480eebb$ +// $hash=55dba640c3e02667053652c612e6e3c1c56aeed8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GEOLOCATION_ACESS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc index 6bece7c583017618a58648d7d2d3f925259b8188..d0129a1925e16581742de9cfddd99227ba9a4a45 100644 --- a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a2e2a6947189c20bb2ffb52a8b38c19126065b9c$ +// $hash=5327e7e6f275416ba3e88025691c75dedcee72ef$ // #include "libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h index 5e22c9c639d1949099a5b6dd9c341adfbfa3b466..afebabd4ca88018ba98cba9a77b576a3893a4d3d 100644 --- a/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_extension_resource_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=facc9372db06b4de1a4c77389757e2c9f00ce744$ +// $hash=fd92d3650c1f3f04b84d9a0847631463b9e9ca2c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_EXTENSION_RESOURCE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_images_callback_ctocpp.cc b/libcef_dll/ctocpp/get_images_callback_ctocpp.cc index 21c1a77223b7f0e577fac6b628350484ddbf8ccf..81c809d0431f67d876989352b81587aac8c2ebe9 100644 --- a/libcef_dll/ctocpp/get_images_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_images_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cbd0a6c267f4bd6c255c32e5b91953aae49c7faa$ +// $hash=c88a5b2554f1179f87d38492fde5d6a34c23a6e0$ // #include "libcef_dll/ctocpp/get_images_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/get_images_callback_ctocpp.h b/libcef_dll/ctocpp/get_images_callback_ctocpp.h index 4dcdb0b0aebb27bf2c8323f768271d1348c912df..8d2c93af6fff1692b046d05726e2821f5f0349fc 100644 --- a/libcef_dll/ctocpp/get_images_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_images_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c7b915341136fef59c9b6f0f6a7f076c83ed7a79$ +// $hash=5569d10c20b8f19c8907133c7b21e293ebe9a2bd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_IMAGES_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.cc b/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.cc index 7d5e6b2e6aa37abe542e6edb3423e8b610956907..0db4817d107a380f7a6b4b3e088563fc6f885d1d 100644 --- a/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=30899000e6f3499f760a5c107c77c5dfca3827b2$ +// $hash=8aa47a45ff93e3b9da148ec8a30217d7093aeb20$ // #include "libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.h b/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.h index 90d556fdd59a4bf00a0cc9689b262068383b5aa0..beab5ac78b35bde9d2f0547c4539363450b66944 100644 --- a/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_origin_usage_or_quota_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=185a7c230ee16ea0671a99bb623bf4220c975c2a$ +// $hash=5a32e1b78e328e377d937e5f3d53afb869e153d9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_ORIGIN_USAGE_OR_QUOTA_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_origins_callback_ctocpp.cc b/libcef_dll/ctocpp/get_origins_callback_ctocpp.cc index 904161b9d0261dd5b0b6db40bf5d57653c267ab6..52813ab4e10de659075429c21a5d675c302ad2e5 100644 --- a/libcef_dll/ctocpp/get_origins_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_origins_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fd76e8edb5ba4ca734f286c875444d44c84b8982$ +// $hash=7658a31d7b0cf81c930bcdcd3294a8b37f5eeee1$ // #include "libcef_dll/ctocpp/get_origins_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/get_origins_callback_ctocpp.h b/libcef_dll/ctocpp/get_origins_callback_ctocpp.h index 463c29d4c4b3700a09f3ed50e1681549491fb629..0b85d91656698c9f6c51c60b1974c2e06e9606b8 100644 --- a/libcef_dll/ctocpp/get_origins_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_origins_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=100757d85fc2c7dbdc8687d5291e2f4f83e1cb15$ +// $hash=feb219add5c02bf679128a2abdf6817ba47c1b25$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_ORIGINS_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_password_callback_ctocpp.cc b/libcef_dll/ctocpp/get_password_callback_ctocpp.cc index 26ea445cc1b32b633daaad00b0094c1a80235896..8bdc872d406ce052dfc7e1a838061cb92e21f27c 100644 --- a/libcef_dll/ctocpp/get_password_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_password_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=37cf8c72bb8d48b88cec187fb2905b7bdf220424$ +// $hash=805da0cef4df2d9bec251b5a104246c6f8e1ca8b$ // #include "libcef_dll/ctocpp/get_password_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/get_password_callback_ctocpp.h b/libcef_dll/ctocpp/get_password_callback_ctocpp.h index bbc9506054e983b505edcca8c452e4a59393fa58..e6a23c2bf4c2c728b370f1fab2f5a594a9bc2adc 100644 --- a/libcef_dll/ctocpp/get_password_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_password_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=721d3865ead9d859f89ca4deceac55c19adbcfc6$ +// $hash=4c9524ddc867f8c372ac06accbbd0eaf9498ae8c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_PASSWORD_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.cc b/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.cc index 4d4c7579105f8351cdaf5e3ac17257ffa93a1afd..1eada9e11468b9959313b681306a7afe29183cd3 100644 --- a/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=563c05c390d16a0911d5739613a5344b49fb863e$ +// $hash=fe76a385a065d3ac58352d335a93a4f58ad5fa50$ // #include "libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.h b/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.h index 4197ce766987f8b0191fc0cef2a031d1259de738..9b1975aea45992abc2ea6f2f31ae025f9522bee8 100644 --- a/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_saved_passwords_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7ac4458cd566461402485854203bee53fe02de31$ +// $hash=502b4047783bf803d20962fea229bac108607ada$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_GET_SAVED_PASSWORDS_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/image_ctocpp.cc b/libcef_dll/ctocpp/image_ctocpp.cc index a6f8b61460fbd7b379d5f98501faca92191ef34c..b52d5ca6d89871a2f2df0b803d0588e71cad03a6 100644 --- a/libcef_dll/ctocpp/image_ctocpp.cc +++ b/libcef_dll/ctocpp/image_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=77fab53e4a1b2ed8a428d2fb450ef264d27494c2$ +// $hash=feca0218f8ab6da39dcf3db81d3d3b36fcb7f27d$ // #include "libcef_dll/ctocpp/image_ctocpp.h" diff --git a/libcef_dll/ctocpp/image_ctocpp.h b/libcef_dll/ctocpp/image_ctocpp.h index 948778cecee67409acfa79355f760cf5bc59f473..8d635fddafb5d067732cf8c3ed55bb8371cb0053 100644 --- a/libcef_dll/ctocpp/image_ctocpp.h +++ b/libcef_dll/ctocpp/image_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f02efff0eb2a32aa7696aee57634d69048292d94$ +// $hash=13afe421110fa07e94c1724d21302b018a71a633$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_IMAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/java_script_result_callback_ctocpp.cc b/libcef_dll/ctocpp/java_script_result_callback_ctocpp.cc index f7039c9cd3417297125543fe5b30388a0306272f..012b45042a3828ac25ab30227adac5c397a054d3 100644 --- a/libcef_dll/ctocpp/java_script_result_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/java_script_result_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d39ff8875980f4a404953860d07fa4f563b39609$ +// $hash=7d620001a0fb00bfc9a5d2705f9cf55fed413930$ // #include "libcef_dll/ctocpp/java_script_result_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/java_script_result_callback_ctocpp.h b/libcef_dll/ctocpp/java_script_result_callback_ctocpp.h index a3cc3f46daac2ecd8f16532f00a4f327327d2017..e99022a5df8e2abd8060b5eae1570176f45f0571 100644 --- a/libcef_dll/ctocpp/java_script_result_callback_ctocpp.h +++ b/libcef_dll/ctocpp/java_script_result_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c5a6d26b72a3f00d9421a8d5f2c4694664fc86ba$ +// $hash=3e43b09c02b4c9974c12ea450872d4ce0da42116$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_JAVA_SCRIPT_RESULT_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc index 2cbcab219f67cfcd854ead5de255833288d21ac3..0fd0f34b45e96c893e69456f0f86da182d0a45c6 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=14bd65d5c9c299480c696997858d85db34863653$ +// $hash=28d076cb242561f0c5de9b0274f7af860b152119$ // #include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h index 3265319be247a0fda3a793da6ef94beae0aed3d7..a73df8ad32ea14118a9ad37bdb27ee0bdc0dce37 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dfd98fc6f7480e80dbf5aefea8590977ed45013e$ +// $hash=5e91e201bc50f771d1ded89088fffcb0da8d34d7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc index 0bc40555da2ce8aea553c4babe4a6dfd182f4197..fc9364cbaa8a1da6582e5c7997d05e4f942427ee 100644 --- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a4cc55480d68ae28f9551c78dd9b819d2bcb0186$ +// $hash=672890ecf4a0e6d4c85ddcea39e44f35a7ade0de$ // #include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h index 3448a6dfbac35c1c4cf2235699f7d8b1f43ca75e..6b8741ef19a45388282e38720a0315165a422c99 100644 --- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h +++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d68766f78dfff83e155cf7fb3b91c6a895e8a5f6$ +// $hash=cdfe3bece7137f53e8b00682064f7831617a7b2f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.cc b/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.cc index 9563d71f5f3a044f40d09f9ecacbdca176733e1f..709b8558d0f64d726336d5ceaf3da57bec58cc5b 100644 --- a/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.cc +++ b/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.cc @@ -152,4 +152,4 @@ CefWrapperType CefCToCppRefCounted::kWrapperType = - WT_LARGEST_CONTENTFUL_PAINT_DETAILS; + WT_LARGEST_CONTENTFUL_PAINT_DETAILS; \ No newline at end of file diff --git a/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.h b/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.h index 98a6f42e2665fa4490b1e27ec6e807d7159edeb3..e48daee412e84704409d2e35494bbd9f491f1e59 100644 --- a/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.h +++ b/libcef_dll/ctocpp/largest_contentful_paint_details_ctocpp.h @@ -43,4 +43,4 @@ class CefLargestContentfulPaintDetailsCToCpp double_t GetImageBPP() override; }; -#endif // CEF_LIBCEF_DLL_CTOCPP_LARGEST_CONTENTFUL_PAINT_DETAILS_CTOCPP_H_ +#endif // CEF_LIBCEF_DLL_CTOCPP_LARGEST_CONTENTFUL_PAINT_DETAILS_CTOCPP_H_ \ No newline at end of file diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc b/libcef_dll/ctocpp/life_span_handler_ctocpp.cc index 781d0ee6782dd94c6d09530cd3df18906ebd6930..355378554fb3b01c5a41ade73661ed6fe45d0aa0 100644 --- a/libcef_dll/ctocpp/life_span_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/life_span_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2a81ed8b2bc3e8d5156a516deb085f9eba3f21eb$ +// $hash=2e9d92f7bf7379b464d3156faeed3b16b65052b7$ // #include "libcef_dll/ctocpp/life_span_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.h b/libcef_dll/ctocpp/life_span_handler_ctocpp.h index 741759fe1622c07f11bb840301a7976215aee7cc..ed9d35b6539ddbe55896d44612b740b86f269c56 100644 --- a/libcef_dll/ctocpp/life_span_handler_ctocpp.h +++ b/libcef_dll/ctocpp/life_span_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e1f3bd4c0fabab9ab1afab023115bbddd788c417$ +// $hash=2457e88502b093071d08dc6d2ad045bd5ca1ea79$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_LIFE_SPAN_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/list_value_ctocpp.cc b/libcef_dll/ctocpp/list_value_ctocpp.cc index 762ea0974064ea0d6208f099e76dbfc9f1c82e36..3e43ac93150a11ee37e3cd695cbc3ea8f91fda6a 100644 --- a/libcef_dll/ctocpp/list_value_ctocpp.cc +++ b/libcef_dll/ctocpp/list_value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=10d0c2aea10137a06b9e291e2a340f74595e3087$ +// $hash=5b2b8bab4a1dc4d4f26918156aaad2ee4c3caf4a$ // #include "libcef_dll/ctocpp/list_value_ctocpp.h" diff --git a/libcef_dll/ctocpp/list_value_ctocpp.h b/libcef_dll/ctocpp/list_value_ctocpp.h index 1915d6ac6a6987d0a709ea7193df2ffd5d98e572..d09dfb95d8c36f7e6c88c0c0b30217c381d91d0f 100644 --- a/libcef_dll/ctocpp/list_value_ctocpp.h +++ b/libcef_dll/ctocpp/list_value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e279913ca9bfaec5ae009008ec116661294eafee$ +// $hash=99b478c698261aa2aaf566b283fc938aacf3b2bf$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_LIST_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/load_committed_details_ctocpp.cc b/libcef_dll/ctocpp/load_committed_details_ctocpp.cc index 856b960f339501d907f010d042d90ce8fe7b65e9..229ec8c2b1f083b0394d9f3305ead1bbedd59479 100644 --- a/libcef_dll/ctocpp/load_committed_details_ctocpp.cc +++ b/libcef_dll/ctocpp/load_committed_details_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f36506c2f74c1547b65c03e313a69066e048efbe$ +// $hash=e3bedaf2bd2ef6d7dcf60c1bbd647498af7e543f$ // #include "libcef_dll/ctocpp/load_committed_details_ctocpp.h" diff --git a/libcef_dll/ctocpp/load_committed_details_ctocpp.h b/libcef_dll/ctocpp/load_committed_details_ctocpp.h index b1ffa30f35aedf93964989261183e4bae713d06c..7370984ac602ef10f641fa5d95cbd351215ac972 100644 --- a/libcef_dll/ctocpp/load_committed_details_ctocpp.h +++ b/libcef_dll/ctocpp/load_committed_details_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=75be9f9b1aafa8d158819a9803ba8c352f579f44$ +// $hash=4a7a7b66908062171e3e9e8dc68440c24d188499$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_LOAD_COMMITTED_DETAILS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.cc b/libcef_dll/ctocpp/load_handler_ctocpp.cc index dc6ebc0dd7b8afebed82586192195b62f3bdbcae..be05967dc7f53d899b220caaed3afea33153611f 100644 --- a/libcef_dll/ctocpp/load_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/load_handler_ctocpp.cc @@ -320,6 +320,21 @@ void CefLoadHandlerCToCpp::OnFirstContentfulPaint( firstContentfulPaintMs); } +NO_SANITIZE("cfi-icall") +void CefLoadHandlerCToCpp::OnSafeBrowsingCheckResult(int threat_type) { + shutdown_checker::AssertNotShutdown(); + + cef_load_handler_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_safe_browsing_check_result)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Execute + _struct->on_safe_browsing_check_result(_struct, threat_type); +} + NO_SANITIZE("cfi-icall") void CefLoadHandlerCToCpp::OnFirstMeaningfulPaint( CefRefPtr details) { @@ -389,21 +404,6 @@ void CefLoadHandlerCToCpp::OnNavigationEntryCommitted( _struct, CefLoadCommittedDetailsCppToC::Wrap(details)); } -NO_SANITIZE("cfi-icall") -void CefLoadHandlerCToCpp::OnSafeBrowsingCheckResult(int threat_type) { - shutdown_checker::AssertNotShutdown(); - - cef_load_handler_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, on_safe_browsing_check_result)) { - return; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Execute - _struct->on_safe_browsing_check_result(_struct, threat_type); -} - NO_SANITIZE("cfi-icall") void CefLoadHandlerCToCpp::OnIntelligentTrackingPreventionResult( const CefString& website_host, diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.h b/libcef_dll/ctocpp/load_handler_ctocpp.h index 9865400308cbcc4a13be9a2bcbfdeaacd51f409f..a203cb860ffc8008dd31c2710ac3031c7a99304b 100644 --- a/libcef_dll/ctocpp/load_handler_ctocpp.h +++ b/libcef_dll/ctocpp/load_handler_ctocpp.h @@ -70,13 +70,13 @@ class CefLoadHandlerCToCpp : public CefCToCppRefCounted callback) override; void OnFirstContentfulPaint(int64_t navigationStartTick, int64_t firstContentfulPaintMs) override; + void OnSafeBrowsingCheckResult(int threat_type) override; void OnFirstMeaningfulPaint( CefRefPtr details) override; void OnLargestContentfulPaint( CefRefPtr details) override; void OnNavigationEntryCommitted( CefRefPtr details) override; - void OnSafeBrowsingCheckResult(int threat_type) override; void OnIntelligentTrackingPreventionResult( const CefString& website_host, const CefString& tracker_host) override; diff --git a/libcef_dll/ctocpp/media_access_callback_ctocpp.cc b/libcef_dll/ctocpp/media_access_callback_ctocpp.cc index e80ba90968f4508d85d61ffc9723ff25b7a9703d..43082f3a0cc7c387e16c89ce9f99dba4bd1184f3 100644 --- a/libcef_dll/ctocpp/media_access_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/media_access_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=957c6bf7eebd00d586b99d887a2b0e2bd15b8287$ +// $hash=2525282ec6eb7a1e2f59d464a2136466ecf1aa5b$ // #include "libcef_dll/ctocpp/media_access_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_access_callback_ctocpp.h b/libcef_dll/ctocpp/media_access_callback_ctocpp.h index b7ec80c82baccb638dfa1ccfe6f83ac2b2ecb05f..730c36212cd3c1a582e9c8dabcc236b76caa7dc0 100644 --- a/libcef_dll/ctocpp/media_access_callback_ctocpp.h +++ b/libcef_dll/ctocpp/media_access_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=20260dd4ae027c53e25fec4b9ebbc6dfd890a5d6$ +// $hash=44c5b964bd7f3953354c90ce10979b8612b05ae8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_ACCESS_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_handler_ctocpp.cc b/libcef_dll/ctocpp/media_handler_ctocpp.cc index 38d9f4d65b0d72f75ec507460748cd111adc406f..3fbbe08ae98302a6db51a3c7a8f509c767da8cac 100644 --- a/libcef_dll/ctocpp/media_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/media_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a323ce1896de4a02a42bb781742ffd2c614128da$ +// $hash=fd772c0574bb9267855186aec900946131ee33aa$ // #include "libcef_dll/ctocpp/media_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_handler_ctocpp.h b/libcef_dll/ctocpp/media_handler_ctocpp.h index 5b55784d209fe45051990394af26a256b3486f8e..5ec97c72da1f3cd0e555712e75d14df8ddb3887e 100644 --- a/libcef_dll/ctocpp/media_handler_ctocpp.h +++ b/libcef_dll/ctocpp/media_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=923588ccc820edac34c9a3963d3fd2e4cb83057d$ +// $hash=19ab4c6d715b63d1acb26150828c87d08f2b188e$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_observer_ctocpp.cc b/libcef_dll/ctocpp/media_observer_ctocpp.cc index 59eff03b33cf83b496bcf855bdf03703a7843981..78f7010f53dfab6d65b3938e7145ca8e6182e920 100644 --- a/libcef_dll/ctocpp/media_observer_ctocpp.cc +++ b/libcef_dll/ctocpp/media_observer_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d85f74e8f7d4c2294341c918be0bd60c0d6bf904$ +// $hash=9b1b93f78443553cdf07bf096add8eda430ad13b$ // #include "libcef_dll/ctocpp/media_observer_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_observer_ctocpp.h b/libcef_dll/ctocpp/media_observer_ctocpp.h index 0a1127ee190462953d7041cd7d2eb4a836a7778d..45ded0993d286abe7c21ca6c2d7f5125b7ddcd46 100644 --- a/libcef_dll/ctocpp/media_observer_ctocpp.h +++ b/libcef_dll/ctocpp/media_observer_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a7332641d36798d916baf8eeaa0a35bbe768c2c1$ +// $hash=af2c09e08b7a2c8c89fdbe314c074fe0d7f825cf$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_OBSERVER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc b/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc index a19fc69147dba1d7dd9f3ee35f974e8279e459ba..633da0302cdb71e888f2e7356fa8e648cb4b859b 100644 --- a/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/media_route_create_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bbe495ac59392e461ef85de0369c9745509e48ac$ +// $hash=87e133cdd2e856ab8a9d45d990972e08a7a69fbc$ // #include "libcef_dll/ctocpp/media_route_create_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_route_create_callback_ctocpp.h b/libcef_dll/ctocpp/media_route_create_callback_ctocpp.h index 61d69934bb3de15b189c568978dbf50b08a0d0d4..d590439d063d2a26c69cfbb45efe560098205698 100644 --- a/libcef_dll/ctocpp/media_route_create_callback_ctocpp.h +++ b/libcef_dll/ctocpp/media_route_create_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4d352d797f6158e75a408bb6265693c557cf5def$ +// $hash=ecf8319d38a7ef9e5b5730c55ca299b3a8056018$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTE_CREATE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_route_ctocpp.cc b/libcef_dll/ctocpp/media_route_ctocpp.cc index 68866b4eef002317a3fb284ee62c791e64d60610..1af9764ccaf4a51e6ed1bee5815ec91703caf2de 100644 --- a/libcef_dll/ctocpp/media_route_ctocpp.cc +++ b/libcef_dll/ctocpp/media_route_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=080122c02884d53ce7a158e0b329a40536ea9fe8$ +// $hash=92edc8064b198b90008142f6d839810a498350d1$ // #include "libcef_dll/ctocpp/media_route_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_route_ctocpp.h b/libcef_dll/ctocpp/media_route_ctocpp.h index c4ee6919a9434242bb0d5c07045e85d78d7adc08..a5742664290aec25e0b1eac69a13525b3e3f1c52 100644 --- a/libcef_dll/ctocpp/media_route_ctocpp.h +++ b/libcef_dll/ctocpp/media_route_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6a09ee245cc969c673b2b5db3c9e0b22b2cd97c8$ +// $hash=c8f6db85d4b577c287a587a72aa11d6e10f55d78$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_router_ctocpp.cc b/libcef_dll/ctocpp/media_router_ctocpp.cc index f11fa9e377c031619536798b06877c8c5e4afbd1..ad0c7b8c94643d4c48faf82d06b038c429d076c0 100644 --- a/libcef_dll/ctocpp/media_router_ctocpp.cc +++ b/libcef_dll/ctocpp/media_router_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=de134596eb11df5c41c982332177d8e903fdc9b0$ +// $hash=af200e153fda6b0d33e42d2dfd05346d6e2ae7f4$ // #include "libcef_dll/ctocpp/media_router_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_router_ctocpp.h b/libcef_dll/ctocpp/media_router_ctocpp.h index 336b36d262cb912c3023b6039670b1a608e199b2..c48028daf2e998fdd71ce2d85456b9fa82b80441 100644 --- a/libcef_dll/ctocpp/media_router_ctocpp.h +++ b/libcef_dll/ctocpp/media_router_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5899a43ada910ac6a5241636a9eb9ba59edb653c$ +// $hash=ef079450730cdf1b8720a84d83b361c6423a091a$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_ROUTER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_sink_ctocpp.cc b/libcef_dll/ctocpp/media_sink_ctocpp.cc index ff66885d8a023f309c51c38ce6cfe8855198d527..1e91fc6778864863854d8362bda79cc5658cf6fe 100644 --- a/libcef_dll/ctocpp/media_sink_ctocpp.cc +++ b/libcef_dll/ctocpp/media_sink_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=078188ccffa2470fbc85cfe4760971f8b797cf31$ +// $hash=453d7d2c9ecc4872b77510595ae7bf78e2c39bba$ // #include "libcef_dll/ctocpp/media_sink_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_sink_ctocpp.h b/libcef_dll/ctocpp/media_sink_ctocpp.h index 4891bc29509d00d27e30c4b2805d58d7b4191470..80e039361d81e5a9da6deff4d396aea58bafa2a5 100644 --- a/libcef_dll/ctocpp/media_sink_ctocpp.h +++ b/libcef_dll/ctocpp/media_sink_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7d6f7d025a45cf4b2dcecd5f0e0ad7dff5226228$ +// $hash=f1a192a4341ed6fe0d4b6f8b065b372401e0f055$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_SINK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc b/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc index cd33a955dc2cb5d095cbcc01cd2e444d627527cd..82f8b6733a1853ec9ceecf07cdfdec422fbc09ee 100644 --- a/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=715c6536b7dc9f8342a7c821677347654505b394$ +// $hash=067877a410a4ae9d7d671d5826a5c93eb6cdad37$ // #include "libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h b/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h index 42bc5213b3b8dad3009431c64c2b41034f03500b..06395235907f64322f990411bd4902d33f29fecf 100644 --- a/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h +++ b/libcef_dll/ctocpp/media_sink_device_info_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2962f2ef8960185bb555f7ae765ff9fa5fbb3deb$ +// $hash=4f2660ef656d3041a8b0905855d0149b299d3c7c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_SINK_DEVICE_INFO_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/media_source_ctocpp.cc b/libcef_dll/ctocpp/media_source_ctocpp.cc index 885839037f844bba23da68db5cce7fa2ba6df6b8..b7481a3ec832cb0d83a1d6023b94b72bd2c44295 100644 --- a/libcef_dll/ctocpp/media_source_ctocpp.cc +++ b/libcef_dll/ctocpp/media_source_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5e74e3c8bf986311a2a3e8f48ea5a266e682ac63$ +// $hash=f05652f759e16a6f2a3bc5f640ede99e3e123b4d$ // #include "libcef_dll/ctocpp/media_source_ctocpp.h" diff --git a/libcef_dll/ctocpp/media_source_ctocpp.h b/libcef_dll/ctocpp/media_source_ctocpp.h index 6151e5d22332b88254a5660119462be97e343515..743c8131c50a4a45feab3018bb098a172be94406 100644 --- a/libcef_dll/ctocpp/media_source_ctocpp.h +++ b/libcef_dll/ctocpp/media_source_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6a4f8d278282c0c6c26cd42f4dc5d06dd09c0b7f$ +// $hash=36c26e21479231ade66738aee8f10c01f9d0cd22$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MEDIA_SOURCE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.cc b/libcef_dll/ctocpp/menu_model_ctocpp.cc index 14cf092ecb06d7241869d0419d1bd7be40bd845b..5585499ec0cb53656524472cc148b36c2d53883c 100644 --- a/libcef_dll/ctocpp/menu_model_ctocpp.cc +++ b/libcef_dll/ctocpp/menu_model_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d3ea78e15cdd0a858bd302b4c1c05ddd9970b2ff$ +// $hash=048b61ed29f9db56cba1a55354c367f941a59b14$ // #include "libcef_dll/ctocpp/menu_model_ctocpp.h" diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.h b/libcef_dll/ctocpp/menu_model_ctocpp.h index b8c1def75f135cf4f0d14ce4440056482a122f30..d6ed8d0c4124418d8ad873703987f9dceca7ea72 100644 --- a/libcef_dll/ctocpp/menu_model_ctocpp.h +++ b/libcef_dll/ctocpp/menu_model_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cc93b072d35c6276805f989c234299a83e313f65$ +// $hash=1b1c5e3e3cca0da704d30c6577a0c083c3fb389b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc index 5e104238033d7b5a67e8440b7136fa95ae522aad..fcd8062017872178534d1d64b9b533faa35562d0 100644 --- a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=da369d72b83d0898aa99c2e0e3c0ba11346406d4$ +// $hash=f734e948a17b74234c1b1bc294b8856ce58ff49e$ // #include "libcef_dll/ctocpp/menu_model_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h index 7893d2a77ea7ced23e391cff5026a63f7a3f419c..7762f4e8c32b3014d5800630eb5fe25752c95b0e 100644 --- a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d9b63c55ee5f1297ede6fa0b923d23d530759ec4$ +// $hash=6ac8a9990cf50850d8f8716096094d1180215be9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/navigation_entry_ctocpp.cc b/libcef_dll/ctocpp/navigation_entry_ctocpp.cc index 286279ec00f164cef1b0e2212ed0f82e6b0064d7..8a4b8b6c782f18aa3c9c51877952dfba718ffea6 100644 --- a/libcef_dll/ctocpp/navigation_entry_ctocpp.cc +++ b/libcef_dll/ctocpp/navigation_entry_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ac779ca1d65ae23b1fa5f837d96f4f09afc65ec0$ +// $hash=3e7e9835ba1497baf588a4afa4c46e04cb542cdf$ // #include "libcef_dll/ctocpp/navigation_entry_ctocpp.h" diff --git a/libcef_dll/ctocpp/navigation_entry_ctocpp.h b/libcef_dll/ctocpp/navigation_entry_ctocpp.h index f3b98c3c62e47b4736f09474bb91ed540511a69a..c176b0f706aaf5f67b29d3b4e34b6d92a4436bc4 100644 --- a/libcef_dll/ctocpp/navigation_entry_ctocpp.h +++ b/libcef_dll/ctocpp/navigation_entry_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c6e4887918b9458251cc84dede2d3dd41f6d74b7$ +// $hash=535674cc1e17f11e062b484736fd4619fa26cd27$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc index 2e0bc21b8b8ffaa5d9d35814661659db977c4b30..1f90bf7f8d81b2b3fe262e97a1a5a18e4180a140 100644 --- a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3a5fe202884799a1cf6b0507b4743078fb3976c4$ +// $hash=a9eb25ebb857e3e63d6e261f8e4b2b171c8fcf34$ // #include "libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h" diff --git a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h index 2f69ca3fb65c5ed6c07f4a4a95c0b6ceedb4e8ba..bcaa2c93351c0024468a33d78e11f5b1fce5dcc2 100644 --- a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d751806ac2bc519eb3dbf17ad45c33e68bd686f6$ +// $hash=3dbe29abccbfa1d1cc7014630bbe312d9de42ac8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc index 716df722573297c46d56628c60afb3051ebb9618..d46bb5aa5897b1d3a173e74310a6f42545cc0726 100644 --- a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a08dd0d4f29c64a4f638d70a95cf7b2fb02d6f93$ +// $hash=f235c0f4a088d1b4487af49d98c5d08044b1419c$ // #include "libcef_dll/ctocpp/pdf_print_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h index 1fb4a1f0ac33cb684292c9d535ce75fb9ee408eb..7abf1c11c764490467b7157c9623c4f656dbb8f8 100644 --- a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h +++ b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=97c7b4e4ae697cd7cbf43f692eb8cc62a9b9e554$ +// $hash=0387fbd8f6ad59dac67959eeded82630a2bba935$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PDF_PRINT_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.cc b/libcef_dll/ctocpp/permission_handler_ctocpp.cc index 5375af491ecf4048f71025e105c52ed71e39c10e..792180eb7a982eece3d97aba3a4cec7bed8c8ba4 100644 --- a/libcef_dll/ctocpp/permission_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/permission_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f8a96bfcf15370db796deba31919411f1c09d8e6$ +// $hash=866524abe3d8f0ad9953a6364bbb49f625fe3a38$ // #include "libcef_dll/ctocpp/permission_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/permission_handler_ctocpp.h b/libcef_dll/ctocpp/permission_handler_ctocpp.h index fdb2ed77bb92ef31a88a1f231e77f14331b2dcce..20a9cea1cadc731f7381073860fb5906a1be0ecc 100644 --- a/libcef_dll/ctocpp/permission_handler_ctocpp.h +++ b/libcef_dll/ctocpp/permission_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=aed95b3f0672a32a1d3a33fcd9f89fba5e589bdf$ +// $hash=d04848217552f94ca2bd3647ce973b92a0e62a01$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PERMISSION_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc b/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc index 005a795a86de57fb4c8e0147ad97baf372bb41e5..1e2caedca5c07ebbe619f4c1fbcf0c625994c3c7 100644 --- a/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2a9862aaf02e64b32d50e31fd0e61e17007f53de$ +// $hash=a84aa33807e480e03cc065b3b195d2fcf766cbfb$ // #include "libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h b/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h index 6f64b34b08bb91150d8c2c3a631a05a0732cbaa2..be82ab76f925c3507b69ef187c3be32799c4d3c3 100644 --- a/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h +++ b/libcef_dll/ctocpp/permission_prompt_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a773a231c69f969988c88f10792387d2194d37be$ +// $hash=8b2ed4405822451f9bae6ae35d589611b6c8e0f3$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PERMISSION_PROMPT_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/permission_request_ctocpp.cc b/libcef_dll/ctocpp/permission_request_ctocpp.cc index 19d211055e3d765d7099385c2cfe11f35396fdc8..7379f5946a52620e47110a5f53b818d2eb283903 100644 --- a/libcef_dll/ctocpp/permission_request_ctocpp.cc +++ b/libcef_dll/ctocpp/permission_request_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=eed1a807c707ce0c849e6916edd778f3ab1ee901$ +// $hash=4134fbc68b6b8919be20c3df33fcdb6a94653b0d$ // #include "libcef_dll/ctocpp/permission_request_ctocpp.h" diff --git a/libcef_dll/ctocpp/permission_request_ctocpp.h b/libcef_dll/ctocpp/permission_request_ctocpp.h index 84305bd49c4baa6677aa4b3e704c51e43e399b5e..91cd712066234215d52dd798607e80ae459c9dd8 100644 --- a/libcef_dll/ctocpp/permission_request_ctocpp.h +++ b/libcef_dll/ctocpp/permission_request_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6660d557213d744f9adbc9f78e59780ede608dd5$ +// $hash=bbb72f97a2958e75d4480c042d9b3281341ec672$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PERMISSION_REQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_ctocpp.cc b/libcef_dll/ctocpp/post_data_ctocpp.cc index ea1c38b6933d9f3f25d4c3bea47e4458ae983e25..ac3410c592c3fc90ed001830f5b7cb28e703ced1 100644 --- a/libcef_dll/ctocpp/post_data_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cee3ee17202f68adf6c45be20dbb72cd827a70f8$ +// $hash=35bed657bdfd1e13a8b76b44a0d58d1473663e9d$ // #include "libcef_dll/ctocpp/post_data_ctocpp.h" diff --git a/libcef_dll/ctocpp/post_data_ctocpp.h b/libcef_dll/ctocpp/post_data_ctocpp.h index fee222da0b744b6f3259f937c6d5978b686f1ac3..7666035c6a12d63d3bfc3ae47ee96cd5a5e86f3f 100644 --- a/libcef_dll/ctocpp/post_data_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ed6be71582e41c560329647b7f2fa4bc2d207d41$ +// $hash=e70d58d7c779528d03b49ead50c162ebf0eb0ca7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.cc b/libcef_dll/ctocpp/post_data_element_ctocpp.cc index f0c66f7d65b6c86d24445208a56a48a4957df365..07d71de5fced553ec166471f262dd50bf309bf0a 100644 --- a/libcef_dll/ctocpp/post_data_element_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_element_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=62328e4b5639bcb395d3bdafcb34684ed7777965$ +// $hash=aa7dd08d585fb1c151ac70040266b2cc6daaa8fd$ // #include "libcef_dll/ctocpp/post_data_element_ctocpp.h" diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.h b/libcef_dll/ctocpp/post_data_element_ctocpp.h index b783cf97ecdabb3ef2caed76a1946e8f11116006..e422be541b1a374e00aa63257c939526c27dbf7c 100644 --- a/libcef_dll/ctocpp/post_data_element_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_element_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c25ebbb002edad028c04af156cacb7d289a41062$ +// $hash=a81732545889a9d401edb7f5540e0762bb787526$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_stream_ctocpp.cc b/libcef_dll/ctocpp/post_data_stream_ctocpp.cc index 3f8273e23dbab62b273825019abd51242554f548..3c4d9712cf4b2a7bee2d8dc01f75e2742fa6124c 100644 --- a/libcef_dll/ctocpp/post_data_stream_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_stream_ctocpp.cc @@ -23,7 +23,7 @@ CefRefPtr CefPostDataStream::Create() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - cef_post_data_stream_t *_retval = cef_post_data_stream_create(); + cef_post_data_stream_t* _retval = cef_post_data_stream_create(); // Return type: refptr_same return CefPostDataStreamCToCpp::Wrap(_retval); @@ -34,7 +34,7 @@ CefRefPtr CefPostDataStream::Create() { NO_SANITIZE("cfi-icall") void CefPostDataStreamCToCpp::SetReadCallback( CefRefPtr read_callback) { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, set_read_callback)) { return; } @@ -55,7 +55,7 @@ void CefPostDataStreamCToCpp::SetReadCallback( NO_SANITIZE("cfi-icall") void CefPostDataStreamCToCpp::Init( CefRefPtr init_callback) { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, init)) { return; } @@ -75,9 +75,10 @@ void CefPostDataStreamCToCpp::Init( NO_SANITIZE("cfi-icall") void CefPostDataStreamCToCpp::Read( - void *buffer, int buf_len, + void* buffer, + int buf_len, CefRefPtr read_callback) { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, read)) { return; } @@ -101,7 +102,7 @@ void CefPostDataStreamCToCpp::Read( } NO_SANITIZE("cfi-icall") uint64 CefPostDataStreamCToCpp::GetSize() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_size)) { return 0; } @@ -116,7 +117,7 @@ NO_SANITIZE("cfi-icall") uint64 CefPostDataStreamCToCpp::GetSize() { } NO_SANITIZE("cfi-icall") uint64 CefPostDataStreamCToCpp::GetPosition() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_position)) { return 0; } @@ -131,7 +132,7 @@ NO_SANITIZE("cfi-icall") uint64 CefPostDataStreamCToCpp::GetPosition() { } NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::IsChunked() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, is_chunked)) { return false; } @@ -146,7 +147,7 @@ NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::IsChunked() { } NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::HasNullSource() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, has_null_source)) { return false; } @@ -161,7 +162,7 @@ NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::HasNullSource() { } NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::IsEOF() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, is_eof)) { return false; } @@ -176,7 +177,7 @@ NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::IsEOF() { } NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::IsInMemory() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, is_in_memory)) { return false; } @@ -191,7 +192,7 @@ NO_SANITIZE("cfi-icall") bool CefPostDataStreamCToCpp::IsInMemory() { } NO_SANITIZE("cfi-icall") void CefPostDataStreamCToCpp::Reset() { - cef_post_data_stream_t *_struct = GetStruct(); + cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, reset)) { return; } @@ -211,16 +212,17 @@ CefPostDataStreamCToCpp::CefPostDataStreamCToCpp() {} CefPostDataStreamCToCpp::~CefPostDataStreamCToCpp() {} template <> -cef_post_data_stream_t * -CefCToCppRefCounted::UnwrapDerived(CefWrapperType type, - CefPostDataStream - *c) { +cef_post_data_stream_t* CefCToCppRefCounted< + CefPostDataStreamCToCpp, + CefPostDataStream, + cef_post_data_stream_t>::UnwrapDerived(CefWrapperType type, + CefPostDataStream* c) { DCHECK(false) << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCToCppRefCounted::kWrapperType = WT_POST_DATA_STREAM; diff --git a/libcef_dll/ctocpp/post_data_stream_ctocpp.h b/libcef_dll/ctocpp/post_data_stream_ctocpp.h index 9dd78a1efb1cab2a4988edea826b2e2ea6b0d2cc..c85afe3dcf11b05358e8cce7d08d03d394b26965 100644 --- a/libcef_dll/ctocpp/post_data_stream_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_stream_ctocpp.h @@ -27,9 +27,10 @@ // Wrap a C structure with a C++ class. // This class may be instantiated and accessed wrapper-side only. class CefPostDataStreamCToCpp - : public CefCToCppRefCounted { -public: + public: CefPostDataStreamCToCpp(); virtual ~CefPostDataStreamCToCpp(); @@ -37,7 +38,8 @@ public: void SetReadCallback( CefRefPtr read_callback) override; void Init(CefRefPtr init_callback) override; - void Read(void *buffer, int buf_len, + void Read(void* buffer, + int buf_len, CefRefPtr read_callback) override; uint64 GetSize() override; uint64 GetPosition() override; @@ -48,4 +50,4 @@ public: void Reset() override; }; -#endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_STREAM_CTOCPP_H_ +#endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_STREAM_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/preference_manager_ctocpp.cc b/libcef_dll/ctocpp/preference_manager_ctocpp.cc index e4fd47f2dce5f2c2a165fe253ca6e146b81b7171..ab598f0e20b3376fc26367b2e4a898d7dcdf04b9 100644 --- a/libcef_dll/ctocpp/preference_manager_ctocpp.cc +++ b/libcef_dll/ctocpp/preference_manager_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=927b2017bd8e11cd1dd87ccd56cbfce242e535f7$ +// $hash=b992dc943eedb028a5018c6204aa6ce9a106b367$ // #include "libcef_dll/ctocpp/preference_manager_ctocpp.h" @@ -20,8 +20,8 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefRefPtr< - CefPreferenceManager> CefPreferenceManager::GetGlobalPreferenceManager() { +CefRefPtr +CefPreferenceManager::GetGlobalPreferenceManager() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute diff --git a/libcef_dll/ctocpp/preference_manager_ctocpp.h b/libcef_dll/ctocpp/preference_manager_ctocpp.h index de0d68c5239b93772885069986b6a9bb95bb2d79..585a1be8082c624af46c4d80418147fe653b3efc 100644 --- a/libcef_dll/ctocpp/preference_manager_ctocpp.h +++ b/libcef_dll/ctocpp/preference_manager_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=bc37f7ce16933a6aa2084d2b0f056d284eaf0258$ +// $hash=89ee6916279697654c516137ee56f5cbef07e4c0$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PREFERENCE_MANAGER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/preference_registrar_ctocpp.cc b/libcef_dll/ctocpp/preference_registrar_ctocpp.cc index 80f5fa59afdf185913705c9d9ec17425c0984f40..98c9f7f01dc417dab81169bb3fede7e832c44eac 100644 --- a/libcef_dll/ctocpp/preference_registrar_ctocpp.cc +++ b/libcef_dll/ctocpp/preference_registrar_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=22439b9a3a1b58f756a1729b8fb0fdc8b008271f$ +// $hash=c677cabce869cc187866e07f53fcf235018d8978$ // #include "libcef_dll/ctocpp/preference_registrar_ctocpp.h" diff --git a/libcef_dll/ctocpp/preference_registrar_ctocpp.h b/libcef_dll/ctocpp/preference_registrar_ctocpp.h index 327fc9161e2aa25393d55e328cd7bd8f17bea9ed..b6b10d32eb3ed50938f503390c2b25fdac937066 100644 --- a/libcef_dll/ctocpp/preference_registrar_ctocpp.h +++ b/libcef_dll/ctocpp/preference_registrar_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=39483df5aeb8f541d330cc07dec55ba74454512d$ +// $hash=bcd7981d2a8feae116d3c658f430f9753c11612d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PREFERENCE_REGISTRAR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc index 9ef23514d7a548717e56421b7eafde3852b0b94d..907eafe615c93ac2f9cb8b85ee3119922fb91c19 100644 --- a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fae5e9e76aed000f5009696ef1166b6563d749fe$ +// $hash=0c0a1efb7a6ed661e2947b9b820e1fb5b57e0ad3$ // #include "libcef_dll/ctocpp/print_dialog_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h index b63da8d5c35fe71efbdbbf2e56fb45eafdff73f4..cf5e9cbe36f388c765a4f4b622636a65048b32af 100644 --- a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ba29e439b112c0d604a3c9f85f4fee70b829a9e1$ +// $hash=7c49e07c9ba8bfc8f7620952b19140828a3bf011$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_handler_ctocpp.cc b/libcef_dll/ctocpp/print_handler_ctocpp.cc index 0528d4c336503cc74f4c38363f7d3ebe709de9e9..81b6f725598e65cf13377cf8a20e181b5f31fb74 100644 --- a/libcef_dll/ctocpp/print_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/print_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4447942f121c8f9e4424cde437c1bc859fa3129a$ +// $hash=95827cf69c533ca04e0e49e45d5e36b507378aeb$ // #include "libcef_dll/ctocpp/print_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/print_handler_ctocpp.h b/libcef_dll/ctocpp/print_handler_ctocpp.h index b94062bf9a226586966de5e42f8d7d826ec1c145..5e7722f26575b7021e868cfd1e6ebea095077699 100644 --- a/libcef_dll/ctocpp/print_handler_ctocpp.h +++ b/libcef_dll/ctocpp/print_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d0993533b68a646950f5e373f0ec7e7a38122fc9$ +// $hash=b1d082ab9bea88f46372a371b68b9b4c25a96ca2$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_job_callback_ctocpp.cc b/libcef_dll/ctocpp/print_job_callback_ctocpp.cc index b99e3bb1023d1907fb1a938f8df9673795d4b69b..66d50c9c9b91c0265b5e9af9ab9c995a9bbee4ab 100644 --- a/libcef_dll/ctocpp/print_job_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/print_job_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=95a30459a8c409beef0f72b5301b0ee655240126$ +// $hash=4ceb6cf047750386cd44026b4b3f7a2caa1dac9e$ // #include "libcef_dll/ctocpp/print_job_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/print_job_callback_ctocpp.h b/libcef_dll/ctocpp/print_job_callback_ctocpp.h index 10514db2fd9a054ad73c35b919cd9289fe42cec2..6f7710e1bf53ed97435bbb8f7421a4309840f719 100644 --- a/libcef_dll/ctocpp/print_job_callback_ctocpp.h +++ b/libcef_dll/ctocpp/print_job_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=68d0c97818be421d287f1cee92114c0b809fb9e3$ +// $hash=6ac2e8d5475582b66e40e297b192bdbdc8acbeed$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_JOB_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_settings_ctocpp.cc b/libcef_dll/ctocpp/print_settings_ctocpp.cc index dca09a8eacc058075822685c7b24b615e8522353..9e22a83ec8310cf0d472cb618204b8eb6ef60b72 100644 --- a/libcef_dll/ctocpp/print_settings_ctocpp.cc +++ b/libcef_dll/ctocpp/print_settings_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=25a465591349b3f68e292affc099ad40fa39cb01$ +// $hash=388d22bd24b0e340d9509abec2b654680ac6779d$ // #include "libcef_dll/ctocpp/print_settings_ctocpp.h" diff --git a/libcef_dll/ctocpp/print_settings_ctocpp.h b/libcef_dll/ctocpp/print_settings_ctocpp.h index c30c94e4096276dd0afa47255be563e1141a614b..3c23fc18fd3be08be7df0d47317c5081f3dfeabb 100644 --- a/libcef_dll/ctocpp/print_settings_ctocpp.h +++ b/libcef_dll/ctocpp/print_settings_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6c83c9564156ea5ca28465ad2e13ceedcc3e042c$ +// $hash=75238f577e768438cead970fa7362e4b04856894$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PRINT_SETTINGS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/process_message_ctocpp.cc b/libcef_dll/ctocpp/process_message_ctocpp.cc index 7ae578ac661073b04da7dede51bc8e7a8dff34bd..53226af57b9aed5975c00e20c95ff2b2a78b0d8c 100644 --- a/libcef_dll/ctocpp/process_message_ctocpp.cc +++ b/libcef_dll/ctocpp/process_message_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=033778168503e09a5e3087a886a181e38ce6c674$ +// $hash=f542bb5ffcf0d7543e424741a62e93c58cc2e3ee$ // #include "libcef_dll/ctocpp/process_message_ctocpp.h" @@ -130,8 +130,8 @@ CefRefPtr CefProcessMessageCToCpp::GetArgumentList() { } NO_SANITIZE("cfi-icall") -CefRefPtr< - CefSharedMemoryRegion> CefProcessMessageCToCpp::GetSharedMemoryRegion() { +CefRefPtr +CefProcessMessageCToCpp::GetSharedMemoryRegion() { shutdown_checker::AssertNotShutdown(); cef_process_message_t* _struct = GetStruct(); diff --git a/libcef_dll/ctocpp/process_message_ctocpp.h b/libcef_dll/ctocpp/process_message_ctocpp.h index 0269c05dda7bc8feb7eafc4ffb952a75e5c67f58..87b569c24cb2193ad39e8f4aad864155f822e3b0 100644 --- a/libcef_dll/ctocpp/process_message_ctocpp.h +++ b/libcef_dll/ctocpp/process_message_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dc73e17f4ab4c0f26126b43d6c2015ab45739376$ +// $hash=cf099f71fe1c451ca650912e7ba34ef54f2aa61b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_PROCESS_MESSAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.cc b/libcef_dll/ctocpp/read_handler_ctocpp.cc index a0a987c05819c24ce584a3d13e24b7e9a0edf0d7..52a27357854146085085aa9ffb246efdcba8c1bf 100644 --- a/libcef_dll/ctocpp/read_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/read_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b72889d411dc360a5a19c760cf713c280d11b9fb$ +// $hash=d38e55ad4edf278002de04d58023524d7ce633a8$ // #include "libcef_dll/ctocpp/read_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.h b/libcef_dll/ctocpp/read_handler_ctocpp.h index 5c7cd1f8defd4699b24fd68915fdb546b8da6707..546462a4dcf883392253a59d6602a088d089528f 100644 --- a/libcef_dll/ctocpp/read_handler_ctocpp.h +++ b/libcef_dll/ctocpp/read_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=083b6a7b538fdda0428337220fe7ed135b1a5926$ +// $hash=d4b05ef2f8edd18da8b5ed9c5d4afe8162f81069$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_READ_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/registration_ctocpp.cc b/libcef_dll/ctocpp/registration_ctocpp.cc index 7026f89e8c8c970b14313f04d831efac3ff8ee0c..ae4f3194ccd6a8ff96ed485a105a1481e5646b27 100644 --- a/libcef_dll/ctocpp/registration_ctocpp.cc +++ b/libcef_dll/ctocpp/registration_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7bdb6e790c82ca3c1197d09073761858db30789a$ +// $hash=004bfcbf30ee0b2ecc97828c943d1302c033b7d9$ // #include "libcef_dll/ctocpp/registration_ctocpp.h" diff --git a/libcef_dll/ctocpp/registration_ctocpp.h b/libcef_dll/ctocpp/registration_ctocpp.h index c08f76fe045d0f58141288664abb46a29303ccbb..b60a76fd07dea85ee89005556bf73868c8959939 100644 --- a/libcef_dll/ctocpp/registration_ctocpp.h +++ b/libcef_dll/ctocpp/registration_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8c7150edca855aed35c88b1fdfc6332c947d03fd$ +// $hash=8b9f37f2e0d395e737bc158d7d4bfb5f5e85e5c4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REGISTRATION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.cc b/libcef_dll/ctocpp/render_handler_ctocpp.cc index cbe192443cb175590005cce80fe2b82456310b3c..366e2742d7409076b708ae3fb3fe25519940769f 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_handler_ctocpp.cc @@ -914,38 +914,6 @@ void CefRenderHandlerCToCpp::ReleaseResizeHold(CefRefPtr browser) { _struct->release_resize_hold(_struct, CefBrowserCppToC::Wrap(browser)); } -NO_SANITIZE("cfi-icall") -void CefRenderHandlerCToCpp::OnUpdateTextInputStateCalled( - CefRefPtr browser, - const CefString& text, - const CefRange& selected_range, - const CefRange& compositon_range) { - shutdown_checker::AssertNotShutdown(); - - cef_render_handler_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, on_update_text_input_state_called)) { - return; - } - - // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING - - // Verify param: browser; type: refptr_diff - DCHECK(browser.get()); - if (!browser.get()) { - return; - } - // Verify param: text; type: string_byref_const - DCHECK(!text.empty()); - if (text.empty()) { - return; - } - - // Execute - _struct->on_update_text_input_state_called( - _struct, CefBrowserCppToC::Wrap(browser), text.GetStruct(), - &selected_range, &compositon_range); -} - NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::GetWordSelection(CefRefPtr browser, const CefString& text, @@ -1032,6 +1000,38 @@ void CefRenderHandlerCToCpp::OnOverlayStateChanged( &cef_screen_rect); } +NO_SANITIZE("cfi-icall") +void CefRenderHandlerCToCpp::OnUpdateTextInputStateCalled( + CefRefPtr browser, + const CefString& text, + const CefRange& selected_range, + const CefRange& compositon_range) { + shutdown_checker::AssertNotShutdown(); + + cef_render_handler_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_update_text_input_state_called)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: browser; type: refptr_diff + DCHECK(browser.get()); + if (!browser.get()) { + return; + } + // Verify param: text; type: string_byref_const + DCHECK(!text.empty()); + if (text.empty()) { + return; + } + + // Execute + _struct->on_update_text_input_state_called( + _struct, CefBrowserCppToC::Wrap(browser), text.GetStruct(), + &selected_range, &compositon_range); +} + NO_SANITIZE("cfi-icall") void CefRenderHandlerCToCpp::GetVisibleViewportRect( CefRefPtr browser, diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.h b/libcef_dll/ctocpp/render_handler_ctocpp.h index 8f6519faf8048bf58f4093d0ef2b7fe0fdd0316e..35e31ecb86a5c29774f83a8a4ebcb3ec66078bc8 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.h +++ b/libcef_dll/ctocpp/render_handler_ctocpp.h @@ -123,10 +123,6 @@ class CefRenderHandlerCToCpp bool visibility) override; void NotifySelectAllClicked(bool select_all) override; void ReleaseResizeHold(CefRefPtr browser) override; - void OnUpdateTextInputStateCalled(CefRefPtr browser, - const CefString& text, - const CefRange& selected_range, - const CefRange& compositon_range) override; void GetWordSelection(CefRefPtr browser, const CefString& text, int8_t offset, @@ -138,6 +134,10 @@ class CefRenderHandlerCToCpp const CefRect& cef_screen_rect) override; void OnOverlayStateChanged(CefRefPtr browser, const CefRect& cef_screen_rect) override; + void OnUpdateTextInputStateCalled(CefRefPtr browser, + const CefString& text, + const CefRange& selected_range, + const CefRange& compositon_range) override; void GetVisibleViewportRect(CefRefPtr browser, CefRect& rect) override; void OnResizeScrollableViewport(CefRefPtr browser) override; diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc b/libcef_dll/ctocpp/render_process_handler_ctocpp.cc index 4c4f1ca793362c616e6487c675cc505869f43d2c..dac278465fcaae8985551cc9eb911ffc0ff40a1a 100644 --- a/libcef_dll/ctocpp/render_process_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/render_process_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=62761c1cb9f4b2eaef6995db71cf1cc2cbff666a$ +// $hash=1bb6593092ca6768ea5a4d07cd9afbe23460e612$ // #include "libcef_dll/ctocpp/render_process_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.h b/libcef_dll/ctocpp/render_process_handler_ctocpp.h index 658664d8eb6851b69196771b72c7bef9b73b5a17..dcf49a67e967b37f484e743cbe45e6b6abebac45 100644 --- a/libcef_dll/ctocpp/render_process_handler_ctocpp.h +++ b/libcef_dll/ctocpp/render_process_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=aeaa52fd064f388493c3944f76bd848bca63e377$ +// $hash=1e5030658a4775df8e1eb8bbd54c43cdacf4572a$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RENDER_PROCESS_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_context_ctocpp.cc b/libcef_dll/ctocpp/request_context_ctocpp.cc index 829c23869917636fda332becee375814fbbdd5fc..2ad94cb349953ee2c127d496a3cbeda7bcc8605b 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.cc +++ b/libcef_dll/ctocpp/request_context_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a2c4d2ecd4063bc48474200dfa324348a15089fd$ +// $hash=8c901acdc01d70b467ece13690ad9f16aaf51428$ // #include "libcef_dll/ctocpp/request_context_ctocpp.h" diff --git a/libcef_dll/ctocpp/request_context_ctocpp.h b/libcef_dll/ctocpp/request_context_ctocpp.h index 8aff680806e55c579b4aef8c253f0008d006b285..8cea53b530fcc1b4a88b9ed1cea079f9ac41e861 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.h +++ b/libcef_dll/ctocpp/request_context_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9764aceccf59006b32d3cee6ea419518893474d4$ +// $hash=b240e3bda5b85a0feb4bb12a8102aedbbd4f4bb9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_context_handler_ctocpp.cc b/libcef_dll/ctocpp/request_context_handler_ctocpp.cc index dfc2e53606739d80806bccc533e29b218f7aad4c..c769ff2fd45a1bbdd307b506471d996c22eaec98 100644 --- a/libcef_dll/ctocpp/request_context_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_context_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b07188e179c2576a67babf279673bdd9ac96a7b8$ +// $hash=85cfe06a67d84dde8c980d3c888f88eb382a9f55$ // #include "libcef_dll/ctocpp/request_context_handler_ctocpp.h" @@ -43,14 +43,15 @@ void CefRequestContextHandlerCToCpp::OnRequestContextInitialized( } NO_SANITIZE("cfi-icall") -CefRefPtr CefRequestContextHandlerCToCpp:: - GetResourceRequestHandler(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request, - bool is_navigation, - bool is_download, - const CefString& request_initiator, - bool& disable_default_handling) { +CefRefPtr +CefRequestContextHandlerCToCpp::GetResourceRequestHandler( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + bool is_navigation, + bool is_download, + const CefString& request_initiator, + bool& disable_default_handling) { cef_request_context_handler_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_resource_request_handler)) { return nullptr; diff --git a/libcef_dll/ctocpp/request_context_handler_ctocpp.h b/libcef_dll/ctocpp/request_context_handler_ctocpp.h index 3ed5d9defbdd4723b33de189c6e0aac559d37a4d..004f130ab8a39b104747c05b777a328331a8ae4f 100644 --- a/libcef_dll/ctocpp/request_context_handler_ctocpp.h +++ b/libcef_dll/ctocpp/request_context_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5482f3c23400dadc4aa4dac95e6dc6a8298033e2$ +// $hash=8f4c9ab7910a1497890d9bb3bc7aef80e23b7306$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.cc b/libcef_dll/ctocpp/request_handler_ctocpp.cc index a17de986302829ebe528068a10fc785c99a1b8dc..98931f82552c03f06aa27854488a3dc15f1f3ee9 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/request_handler_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ba3f1cba485d1c29dca30290c91eb83516e1b820$ +// $hash=9002e9e94cad0d5c3f50b77233a137ea9665b1fa$ // #include "libcef_dll/ctocpp/request_handler_ctocpp.h" @@ -568,6 +568,34 @@ void CefRequestHandlerCToCpp::OnRenderProcessResponding( CefBrowserCppToC::Wrap(browser)); } +NO_SANITIZE("cfi-icall") +void CefRequestHandlerCToCpp::OnUpdateTargetURL(CefRefPtr browser, + const CefString& url) { + shutdown_checker::AssertNotShutdown(); + + cef_request_handler_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_update_target_url)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: browser; type: refptr_diff + DCHECK(browser.get()); + if (!browser.get()) { + return; + } + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return; + } + + // Execute + _struct->on_update_target_url(_struct, CefBrowserCppToC::Wrap(browser), + url.GetStruct()); +} + // CONSTRUCTOR - Do not edit by hand. CefRequestHandlerCToCpp::CefRequestHandlerCToCpp() {} diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.h b/libcef_dll/ctocpp/request_handler_ctocpp.h index 1ed2022bee35964f357f0007c33dc5fd913a9e0a..b4da6f661e19f91031df22f99f43e62e1d9c54b3 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.h +++ b/libcef_dll/ctocpp/request_handler_ctocpp.h @@ -100,6 +100,8 @@ class CefRequestHandlerCToCpp int pid, int reason) override; void OnRenderProcessResponding(CefRefPtr browser) override; + void OnUpdateTargetURL(CefRefPtr browser, + const CefString& url) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resolve_callback_ctocpp.cc b/libcef_dll/ctocpp/resolve_callback_ctocpp.cc index 5955b2c39f14e465a8012999f78c807670e1881a..26f802b2b4f2c1b977dd495187c1e419ffa4fe5a 100644 --- a/libcef_dll/ctocpp/resolve_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resolve_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e19707e1d61715d956ebca58a4999daea0d1ef14$ +// $hash=26f0b2cca6c62191dcdc1f70e415cd615a66cee5$ // #include "libcef_dll/ctocpp/resolve_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/resolve_callback_ctocpp.h b/libcef_dll/ctocpp/resolve_callback_ctocpp.h index 92154417d8d150c9055e65de5051187b5befa394..f9e115e76f5283a99ee450d7b410f543da02e3bf 100644 --- a/libcef_dll/ctocpp/resolve_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resolve_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b2fdb307c4fb62827dec208d14c7fe1c2b82f915$ +// $hash=648f3d66272798ab00f7a97d33126aef193d5fa5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOLVE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_bundle_ctocpp.cc b/libcef_dll/ctocpp/resource_bundle_ctocpp.cc index b1f1bb226c23851d64e8f9463fe9cb16161dfd91..bbba4d89d2282e19c14eaf32de184364b9a38262 100644 --- a/libcef_dll/ctocpp/resource_bundle_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_bundle_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5d6ff6a00d9b85cef14d7075c608da74c5e7d9f3$ +// $hash=2351c980bcf0be831b2803207665595003a6ae9b$ // #include "libcef_dll/ctocpp/resource_bundle_ctocpp.h" diff --git a/libcef_dll/ctocpp/resource_bundle_ctocpp.h b/libcef_dll/ctocpp/resource_bundle_ctocpp.h index 1560d663ddd686265b90894a3095cabd8795551b..9d0444e6cea3a214e1e8d10458cdb5403794a204 100644 --- a/libcef_dll/ctocpp/resource_bundle_ctocpp.h +++ b/libcef_dll/ctocpp/resource_bundle_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b2198e1fc7b12570d5f8d872d4b8723f755166f3$ +// $hash=e18e48353500f27c27160812032cadc398fe00f9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc index cf60d5047b1ca838a138e26993a5b775e6d84d48..71b5b8c4cf6b47dacd3b55cd0794838ad13edbb2 100644 --- a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9f02c1b5d9072a03fb898baea48c8a50dad8d9b6$ +// $hash=a89889b633cfe23052e084a41e2bd6dc3abaca78$ // #include "libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h index 1e3fb4f867561f96a939ef3ba926a73a41d0a237..0b427b1fa6b9ee8a41c6db6bc01b9c3deec1d286 100644 --- a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h +++ b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e77d2c1ec96433039d33ca02a4f982b79d185cdb$ +// $hash=52b1821c0ed82e859eddbb113d4a73ba2b178548$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_handler_ctocpp.cc index 0a0260e40cf604066ec7addac2e456e2aed4e153..0bd7850a6c23b7ee61b7fc97d0979dc2cb1c51b6 100644 --- a/libcef_dll/ctocpp/resource_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d70ddb54a99cc08a13b3878ae203fadf1cdccc6c$ +// $hash=e6ff075b94ab1f2196fd4ba112f014da22cfed8f$ // #include "libcef_dll/ctocpp/resource_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.h b/libcef_dll/ctocpp/resource_handler_ctocpp.h index feee1928e590ede2f7cc515bc508d5fa73a1f8cf..da05687c859bb30bad0bb17463c797dcd1665f56 100644 --- a/libcef_dll/ctocpp/resource_handler_ctocpp.h +++ b/libcef_dll/ctocpp/resource_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=aba6780da5c240c3e6e9bb8d00352a5cdaaf3403$ +// $hash=8cf5fea5fc1d33f8268a4608417a75ef6ee9bf51$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc b/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc index b4896a48c4ced0ee4a6133129643effe607bc31b..1c4abb02dd48b4aef325ff913dd415fe688676ff 100644 --- a/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_read_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=64af4aa1671958478e8545ad551e0018472cc1fb$ +// $hash=453b8327acaa3268d910e7bbc14e735b176d8c47$ // #include "libcef_dll/ctocpp/resource_read_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/resource_read_callback_ctocpp.h b/libcef_dll/ctocpp/resource_read_callback_ctocpp.h index 815fc22e49cd3d984d46ec1b0107d7e7f8118655..37b79c96656b91c4e078e7318d5f0918e1407464 100644 --- a/libcef_dll/ctocpp/resource_read_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resource_read_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=aea2fa4975231845d87a638df4d634c3d662ac89$ +// $hash=aeb2eaecc30bb2498b709af0ec45dd6b5dc9b392$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_READ_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc b/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc index 0eab77c3100b9a4ad58a777d1e5aada67df358a9..95d31856595d68355d22e456585381486b7480fb 100644 --- a/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_request_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=55321993af05bcf115174f00b73bab3524207207$ +// $hash=bbb95fcb51fd9200a472d7a35f857750f4f8798b$ // #include "libcef_dll/ctocpp/resource_request_handler_ctocpp.h" @@ -25,10 +25,11 @@ // VIRTUAL METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefRefPtr CefResourceRequestHandlerCToCpp:: - GetCookieAccessFilter(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request) { +CefRefPtr +CefResourceRequestHandlerCToCpp::GetCookieAccessFilter( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request) { cef_resource_request_handler_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_cookie_access_filter)) { return nullptr; @@ -54,11 +55,11 @@ CefRefPtr CefResourceRequestHandlerCToCpp:: NO_SANITIZE("cfi-icall") CefResourceRequestHandler::ReturnValue - CefResourceRequestHandlerCToCpp::OnBeforeResourceLoad( - CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request, - CefRefPtr callback) { +CefResourceRequestHandlerCToCpp::OnBeforeResourceLoad( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + CefRefPtr callback) { cef_resource_request_handler_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, on_before_resource_load)) { return RV_CONTINUE; @@ -88,10 +89,11 @@ CefResourceRequestHandler::ReturnValue } NO_SANITIZE("cfi-icall") -CefRefPtr CefResourceRequestHandlerCToCpp:: - GetResourceHandler(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request) { +CefRefPtr +CefResourceRequestHandlerCToCpp::GetResourceHandler( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request) { cef_resource_request_handler_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_resource_handler)) { return nullptr; @@ -183,11 +185,12 @@ bool CefResourceRequestHandlerCToCpp::OnResourceResponse( } NO_SANITIZE("cfi-icall") -CefRefPtr CefResourceRequestHandlerCToCpp:: - GetResourceResponseFilter(CefRefPtr browser, - CefRefPtr frame, - CefRefPtr request, - CefRefPtr response) { +CefRefPtr +CefResourceRequestHandlerCToCpp::GetResourceResponseFilter( + CefRefPtr browser, + CefRefPtr frame, + CefRefPtr request, + CefRefPtr response) { cef_resource_request_handler_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_resource_response_filter)) { return nullptr; diff --git a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc index 96241c14f174fca71961a089d5098fcdc8c314b0..f859a0b83e324938ac675b2243d50b1a7e22a161 100644 --- a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c139f7c0b5f2be5379bfe32ba3d8b7f5470d8391$ +// $hash=c91c9abe489d40b7841d1de59c7fecf6cf4af362$ // #include "libcef_dll/ctocpp/resource_skip_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h index b442670ef79dc1cd645e0f814ef0bdd5d4f81bea..5d8a347bbb2d93cb6a977d852bdeb9fd1e24e513 100644 --- a/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resource_skip_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7ce68db206f86865bf690f241f08c38277e1e921$ +// $hash=ace627f34f6c16512fb0d7a9a4ebb96e9c00c78d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESOURCE_SKIP_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/response_ctocpp.cc b/libcef_dll/ctocpp/response_ctocpp.cc index 13fcf7d31cfe7153df919b49b8c50f76d0ceaf05..ff72a75e985288b3beee3f76e460d2e42f9ca1e9 100644 --- a/libcef_dll/ctocpp/response_ctocpp.cc +++ b/libcef_dll/ctocpp/response_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f3b33017d7f54c9295df54630a346c7eac7e9102$ +// $hash=4a42afa43cf782789da01e2bc97fe635e530db7b$ // #include "libcef_dll/ctocpp/response_ctocpp.h" diff --git a/libcef_dll/ctocpp/response_ctocpp.h b/libcef_dll/ctocpp/response_ctocpp.h index f3735dd0fc28797bdf2949fdcf3d51363ade0163..00a127929b37c83d35b4ef9e7151899ddb59e636 100644 --- a/libcef_dll/ctocpp/response_ctocpp.h +++ b/libcef_dll/ctocpp/response_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c2fed0bd3755750ab3fcc8a55c5743b70e611994$ +// $hash=3ec4c709bcd18d24997d554134b1b01e17bbd0fb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/response_filter_ctocpp.cc b/libcef_dll/ctocpp/response_filter_ctocpp.cc index 6eb93948c894a59d795a3ab3bb1fb41a94414e4b..9149d602b4d7d03e882eb1e87aab3c859ca79954 100644 --- a/libcef_dll/ctocpp/response_filter_ctocpp.cc +++ b/libcef_dll/ctocpp/response_filter_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0c425f1f6aa4db9682f67d81cc77945e0eb64145$ +// $hash=55cc0e8d94b38923a37942b57ffe26ac9be16ccf$ // #include "libcef_dll/ctocpp/response_filter_ctocpp.h" @@ -35,13 +35,13 @@ NO_SANITIZE("cfi-icall") bool CefResponseFilterCToCpp::InitFilter() { } NO_SANITIZE("cfi-icall") -CefResponseFilter::FilterStatus - CefResponseFilterCToCpp::Filter(void* data_in, - size_t data_in_size, - size_t& data_in_read, - void* data_out, - size_t data_out_size, - size_t& data_out_written) { +CefResponseFilter::FilterStatus CefResponseFilterCToCpp::Filter( + void* data_in, + size_t data_in_size, + size_t& data_in_read, + void* data_out, + size_t data_out_size, + size_t& data_out_written) { shutdown_checker::AssertNotShutdown(); cef_response_filter_t* _struct = GetStruct(); diff --git a/libcef_dll/ctocpp/response_filter_ctocpp.h b/libcef_dll/ctocpp/response_filter_ctocpp.h index 98b0ab919431b763613a155bc993a4a7601926fc..a15d97ff0d32037230e96fb42d0611b277cdd55e 100644 --- a/libcef_dll/ctocpp/response_filter_ctocpp.h +++ b/libcef_dll/ctocpp/response_filter_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a58d0e7e9dc090100fc65dfb7cd3c21a90283b57$ +// $hash=b9ca51a2ee848580b14c1a06b49b2b9e048ab798$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RESPONSE_FILTER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc index 89d9704c02d0cf3d069b144e995cd4f3f0a25dd3..e4e04deb098c3754c31dc657efb8627ff773366d 100644 --- a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e5cdf9dc0adcff4fac00acc2f411b329d79ebedd$ +// $hash=71acbdd04b0d9ed591ec351684b09f1375308cd6$ // #include "libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h index 1efa6cc0fe72c4ea6b1dfb3599194b47d6d4de06..90d9cd66050e099ba728adf0af4c095104ea3c46 100644 --- a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h +++ b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1db674e7c5565654a712bc18e2275f7541daa87b$ +// $hash=7663b13ecb057bba0158685bc34783f37ef2f030$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RUN_CONTEXT_MENU_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc index 39b19d9b07e5696974169e9841da702bce230529..90b3fc085976d838b86dd07bc2debd2ed2148ef9 100644 --- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0d007feef220a98dbf0736b708bba3ec5f7dcbd6$ +// $hash=88c6cc75c33fd04ded84b3a8f99bcb537d462a0d$ // #include "libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h index 79bbd967695ae7779e2b8c2d8c555e9e5c559500..e109d0d5db7aa9f2530902339a63787ab8df2e6d 100644 --- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3bf81a3d9b1f8b3a1b8dd454237fef8d120dc24d$ +// $hash=5793fe937c3f7fb75ee7d79ab6bd6e93411bd954$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RUN_FILE_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc b/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc index c60575cbbfd3d5e7a3ac8900ed8292cec10e7328..5d3da07186e41b7b1b89526b09957c2b6ad3ba9b 100644 --- a/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4a8460c67b3fbb6f13157151ddd28e4e304ffac7$ +// $hash=b1531352b058e448d89cee9e34c9ff512f7b61dc$ // #include "libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h b/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h index 4279e3a3e2e6bae32a781f6b1ef8a343b3a86aea..155b0b937cfb1eecbe253d8bddc4229d959a6835 100644 --- a/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h +++ b/libcef_dll/ctocpp/run_quick_menu_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4bd962b22d97608313ed0e568bd50d6b2de83644$ +// $hash=c079137f43167df4c21e63f38cdd8c33f4423445$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_RUN_QUICK_MENU_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc index ceea8239f1ad5172e4ee3386b07991fad9d9bb1b..ecc14c3f9221ef4cadedf8c2d1afab1bf6364fd8 100644 --- a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc +++ b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b63d58e1233baaddd43a9706f50fbc21a28a9b38$ +// $hash=3e078458c9ec423ac8ea129888485e600896e03f$ // #include "libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h" diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h index 342eea23263ccdceac15780ecc37479c0bc49401..6e20d97da34181d28afb0219004588382fc61c81 100644 --- a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h +++ b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=80d4f216d16784b9ee485be512196700797a91f4$ +// $hash=8553de031f140b9c850e487863fc91b97633314b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SCHEME_HANDLER_FACTORY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc b/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc index 2e553235ae5213e87f23ac495a719eb31077ebe2..d5dc40d7d493d9b7ce2adb0f155e65df1d65ac0c 100644 --- a/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc +++ b/libcef_dll/ctocpp/scheme_registrar_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c7a7dc1b920e038f4af84d306638c5fe78a4f6cb$ +// $hash=d38b1cdd4e0df15235315e9efeb5c4ab3b92930b$ // #include "libcef_dll/ctocpp/scheme_registrar_ctocpp.h" diff --git a/libcef_dll/ctocpp/scheme_registrar_ctocpp.h b/libcef_dll/ctocpp/scheme_registrar_ctocpp.h index 81dad81af41e5d9ca5d5c31f5f991eb7e8aef360..8ac7075b830aabc9059c753c74e46dfbad16793a 100644 --- a/libcef_dll/ctocpp/scheme_registrar_ctocpp.h +++ b/libcef_dll/ctocpp/scheme_registrar_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=208c36b46341af4a95e55ed0528666d71fa87d57$ +// $hash=a30e0b019ab6b34998563c8bf46f7b0c8089c3ba$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SCHEME_REGISTRAR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.cc b/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.cc index 390e189e0965dfe07db8f4f3baac164fa19696a7..015ad73c58875e484e5d759d9f9ea7b13a1e57fb 100644 --- a/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.cc +++ b/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c58701156264ef5d336fa5f7fd1f1f45f1706f60$ +// $hash=70fb012872c322f0343e863fed8849befd72ff0b$ // #include "libcef_dll/ctocpp/screen_capture_access_request_ctocpp.h" diff --git a/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.h b/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.h index 9fad59a79413f02172527ec5d630955bbb9112c2..209b5daa5141049b08b7044cd8d54343e1162268 100644 --- a/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.h +++ b/libcef_dll/ctocpp/screen_capture_access_request_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3a54e5a339772748e71903492068353ec6534721$ +// $hash=1d61b206fb2419578bace59d02c629c608847467$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SCREEN_CAPTURE_ACCESS_REQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc index 8a66699284f7d68e88d2f0eff64ea4d7764ea4b9..9f5769c5fc32ee53af244fa48a08b6946201ac29 100644 --- a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9b357fa442ff1172f5559b6a5d0055dc43e3dac0$ +// $hash=d43e3f71b758ada5a65a6dc0dd2a32e5792c741a$ // #include "libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h index 4f3fad253afe57cb50346404beccc093b8e27dac..318fa12d74e73fa849d151f33d3eb77619157035 100644 --- a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h +++ b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ca8e4ac1da530383e99d7ffd5aade230b72a1d20$ +// $hash=3ab940de86fd7e4fd434758c7064f4eea9a3de47$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SELECT_CLIENT_CERTIFICATE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/select_popup_callback_ctocpp.cc b/libcef_dll/ctocpp/select_popup_callback_ctocpp.cc index 8a0fe9a5acfc73e1d73a47b9b763c4982399533e..cc8839c084045bb7f7a1a08b786c815ba66607c0 100644 --- a/libcef_dll/ctocpp/select_popup_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/select_popup_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=37746c77aa2fdaefef4d1fa3a8dcde7b7a6b8cba$ +// $hash=51aad8e43f3934e9df61ad3f9bde4364a18d3e2a$ // #include "libcef_dll/ctocpp/select_popup_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/select_popup_callback_ctocpp.h b/libcef_dll/ctocpp/select_popup_callback_ctocpp.h index c9cf8453a38a3eca6c67993b0e862b342cfb7b7c..aa46a0ef6f8e8c70332f20f05c156af123f3fc33 100644 --- a/libcef_dll/ctocpp/select_popup_callback_ctocpp.h +++ b/libcef_dll/ctocpp/select_popup_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ae276c2a522c254a89c409756f1d24028f41f013$ +// $hash=511a4146e38cfe2e2242f3d79950cf67415fe4d5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SELECT_POPUP_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/server_ctocpp.cc b/libcef_dll/ctocpp/server_ctocpp.cc index 223e9c004fbbb943df81b5a2530f88941780c8c6..b6410ef5e3b0f73736752e7a58c956a74b379f44 100644 --- a/libcef_dll/ctocpp/server_ctocpp.cc +++ b/libcef_dll/ctocpp/server_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=689b76ff3c07aff14a12cc98fa6a19bad434d3e0$ +// $hash=f1a9552e2522cec989f7267b64a4298964982d46$ // #include "libcef_dll/ctocpp/server_ctocpp.h" diff --git a/libcef_dll/ctocpp/server_ctocpp.h b/libcef_dll/ctocpp/server_ctocpp.h index 5cfa0a9a7fd083e5f541b74380b34273bc381c1f..b9a038e2f88e0e37e05ca0aaeb22ebe8840e9bdd 100644 --- a/libcef_dll/ctocpp/server_ctocpp.h +++ b/libcef_dll/ctocpp/server_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=97edc7df7e4a87903b30ef606f02ec8cb75ca865$ +// $hash=efb9652f9e2a17079ff20457264e8b0ecfd19499$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SERVER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/server_handler_ctocpp.cc b/libcef_dll/ctocpp/server_handler_ctocpp.cc index 55f99b8e44aef4acb57abd6e69d9843ff851d763..112af233c15d17d666629faff92ff94bae06f6fb 100644 --- a/libcef_dll/ctocpp/server_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/server_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=23238422c7ca4a76c2959df8cc7a5d61fed29576$ +// $hash=f94b3d675dfb95c556fb4b3f8c618507aeca89ad$ // #include "libcef_dll/ctocpp/server_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/server_handler_ctocpp.h b/libcef_dll/ctocpp/server_handler_ctocpp.h index 9b2afc4b3157a4c3b19f6b802891bffeffd58aba..fbb9d76162c4a54edef564e0478ef6225b3adc63 100644 --- a/libcef_dll/ctocpp/server_handler_ctocpp.h +++ b/libcef_dll/ctocpp/server_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3d119d27a40f075a52335f72a3cf8ec10ab4585c$ +// $hash=0bed1f616f1ae42a7eb755dba59b329cd600abff$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SERVER_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc index 26b45ac373c7c2a6ce1deb5e4857c5d2930969b2..c4482cbf252cd7d2f44cfce7b33184be6366025f 100644 --- a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6d173fc7c9fb1d60843ea910780821b2a02cd6a3$ +// $hash=392363e82a7131e201fe074eda87020b8c2716de$ // #include "libcef_dll/ctocpp/set_cookie_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h index 333ddb546ce33dc16eb10ff43af3d3421ab01649..067807169e6ada10f4428f7125b4e4cbeac580be 100644 --- a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h +++ b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=30e8fbda68de15d429eb1a50f72f93ebfe6f3747$ +// $hash=26be0ed7d7165630ee23b480419768f1fd9b95fe$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SET_COOKIE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/set_lock_callback_ctocpp.cc b/libcef_dll/ctocpp/set_lock_callback_ctocpp.cc index 57db7da11c52948cd0c8925ccb5dcc8bc681e237..9e057187a5463c639c0067f70d5eb848191ebfc0 100644 --- a/libcef_dll/ctocpp/set_lock_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/set_lock_callback_ctocpp.cc @@ -20,7 +20,7 @@ NO_SANITIZE("cfi-icall") void CefSetLockCallbackCToCpp::Handle(bool key) { shutdown_checker::AssertNotShutdown(); - cef_set_lock_callback_t *_struct = GetStruct(); + cef_set_lock_callback_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, handle)) { return; } @@ -42,16 +42,17 @@ CefSetLockCallbackCToCpp::~CefSetLockCallbackCToCpp() { } template <> -cef_set_lock_callback_t * -CefCToCppRefCounted::UnwrapDerived(CefWrapperType type, - CefSetLockCallback - *c) { +cef_set_lock_callback_t* CefCToCppRefCounted< + CefSetLockCallbackCToCpp, + CefSetLockCallback, + cef_set_lock_callback_t>::UnwrapDerived(CefWrapperType type, + CefSetLockCallback* c) { DCHECK(false) << "Unexpected class type: " << type; return nullptr; } template <> -CefWrapperType CefCToCppRefCounted::kWrapperType = WT_SET_LOCK_CALLBACK; diff --git a/libcef_dll/ctocpp/set_lock_callback_ctocpp.h b/libcef_dll/ctocpp/set_lock_callback_ctocpp.h index 3ce28c3fbb4158363acca5e6b8bf446058936716..2ada2c972eb8b1bf126eda449ae12540cfb6179d 100644 --- a/libcef_dll/ctocpp/set_lock_callback_ctocpp.h +++ b/libcef_dll/ctocpp/set_lock_callback_ctocpp.h @@ -29,9 +29,10 @@ // Wrap a C structure with a C++ class. // This class may be instantiated and accessed DLL-side only. class CefSetLockCallbackCToCpp - : public CefCToCppRefCounted { -public: + public: CefSetLockCallbackCToCpp(); virtual ~CefSetLockCallbackCToCpp(); @@ -39,4 +40,4 @@ public: void Handle(bool key) override; }; -#endif // CEF_LIBCEF_DLL_CTOCPP_SET_LOCK_CALLBACK_CTOCPP_H_ +#endif // CEF_LIBCEF_DLL_CTOCPP_SET_LOCK_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc index c9a0225f2e7ef48039399e8b6aaca3332b7fec3d..dfc3b34a78a87b3eb047cf4c95ba1ea1cc2615c3 100644 --- a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc +++ b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b9ad1b5c8d0b25dbf48f1eadd3f2781df289a748$ +// $hash=79771feab6c6d60667691c826ca9d6deaa23d068$ // #include "libcef_dll/ctocpp/shared_memory_region_ctocpp.h" diff --git a/libcef_dll/ctocpp/shared_memory_region_ctocpp.h b/libcef_dll/ctocpp/shared_memory_region_ctocpp.h index 1b59bd4526bdd735451600e0021813f0c6fd3510..45da99d9630744ce19e47601ee37b9ddca2539e2 100644 --- a/libcef_dll/ctocpp/shared_memory_region_ctocpp.h +++ b/libcef_dll/ctocpp/shared_memory_region_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=75f2e341785122aac5609adcf659204ff65638ef$ +// $hash=f5d0285d28412c40b8e04953025294c5f0779ecd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SHARED_MEMORY_REGION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc index edd76809d02ac5597e6e784170e401079aaa7bfd..35839ea5f71995e9fce8e65ff9d5ff4919796a6f 100644 --- a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc +++ b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=da73d238eb11ae25ae64d3373e2357e40a01051a$ +// $hash=439e6639c3e7a3f99de34d6c499b1c6766dc7fa7$ // #include "libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h" @@ -19,8 +19,9 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefRefPtr CefSharedProcessMessageBuilder:: - Create(const CefString& name, size_t byte_size) { +CefRefPtr +CefSharedProcessMessageBuilder::Create(const CefString& name, + size_t byte_size) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING diff --git a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h index 57be828dc4103ee0b363f428615aa36df07fa23c..ea4f038bd196f205b77224e92a50310f4b99cd59 100644 --- a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h +++ b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e655c019b65f1f03526e022e230f6728780fa2a6$ +// $hash=de0791f744ddb7e9e9256bb120f233cb64826188$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SHARED_PROCESS_MESSAGE_BUILDER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/sslinfo_ctocpp.cc b/libcef_dll/ctocpp/sslinfo_ctocpp.cc index 62524009c8ee1b7b81d080b5734939699917acf8..0aa6fd9bb5f8bdd2c753c8849792b93db2ebbb4e 100644 --- a/libcef_dll/ctocpp/sslinfo_ctocpp.cc +++ b/libcef_dll/ctocpp/sslinfo_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7c81b9e3ff1956edd748ff89a757e77fc089ade3$ +// $hash=0390ebb66bafe64b20f8c55f156a5c118035e5fc$ // #include "libcef_dll/ctocpp/sslinfo_ctocpp.h" diff --git a/libcef_dll/ctocpp/sslinfo_ctocpp.h b/libcef_dll/ctocpp/sslinfo_ctocpp.h index 572ee24573397f135e8b75c07ea6a00cc3e5a1ff..80ed6f17a515f44b8695eaed69e17e5fb6a1bad1 100644 --- a/libcef_dll/ctocpp/sslinfo_ctocpp.h +++ b/libcef_dll/ctocpp/sslinfo_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1cf09c84cfaedca2e25dad4f2ddfe62448304f49$ +// $hash=d08212eed1df4078ed5bb72dd7fc6d478f476ecb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SSLINFO_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/sslstatus_ctocpp.cc b/libcef_dll/ctocpp/sslstatus_ctocpp.cc index 1fa7b8b229e75d09244e7f8bab4aeda2403b320f..67585a5c83619cd85adce227455b3d8a2d0a61f8 100644 --- a/libcef_dll/ctocpp/sslstatus_ctocpp.cc +++ b/libcef_dll/ctocpp/sslstatus_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=40cef032768f31dff7ecb4cbbd1da366b21ab28b$ +// $hash=82e87e32f0c6e2da2ae52a8f3af76e22790ee911$ // #include "libcef_dll/ctocpp/sslstatus_ctocpp.h" diff --git a/libcef_dll/ctocpp/sslstatus_ctocpp.h b/libcef_dll/ctocpp/sslstatus_ctocpp.h index d586889358736314cfece0d3c158b7ac1e401e11..c36c525480511914a622ebaa97724511b9aa7727 100644 --- a/libcef_dll/ctocpp/sslstatus_ctocpp.h +++ b/libcef_dll/ctocpp/sslstatus_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec12ab437515f3dc8a5d30d5c7de7733dbf99dd1$ +// $hash=af612f99d0ccc287b152a20b3e9956af223f82e0$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_SSLSTATUS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.cc b/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.cc index e2fe0234befc35ed8501f34576fbc843f960445b..4dcaaf8dae3903e21cedbf538faa904f45ae4fc2 100644 --- a/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8d91a1fd11d2cf3be847080d682f4066c87433bf$ +// $hash=2ae33f6450dbeb6f836f1f07138f40b1ddd7c2ae$ // #include "libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.h b/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.h index cfd05d4ac59e25adeaaf3786ea61dca9584e725e..9e1fffd6d102068610148413b8b7b5bfadbc6fd8 100644 --- a/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.h +++ b/libcef_dll/ctocpp/store_web_archive_result_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0cd7128929ed3e939b40d53b07d690acce33ac21$ +// $hash=13d8e7ac8493bcf02b39067e63e0d9fe3e7e8e65$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_STORE_WEB_ARCHIVE_RESULT_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.cc b/libcef_dll/ctocpp/stream_reader_ctocpp.cc index 12f7d777f351d89e97da2d74f653b89d9e7a22ab..486d369f6b189982e9d0469e3765ac2d9e707ef9 100644 --- a/libcef_dll/ctocpp/stream_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/stream_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec98b14c134c8dc61af07882b1e1c789669d703a$ +// $hash=baecf84629a6ee97545572b2973650c5d7938938$ // #include "libcef_dll/ctocpp/stream_reader_ctocpp.h" diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.h b/libcef_dll/ctocpp/stream_reader_ctocpp.h index de8a82031568dcf2419dcc84a139a25e6e6d19bf..1376f71494d906cb5eca8a9a8913b60f6fb9ffd1 100644 --- a/libcef_dll/ctocpp/stream_reader_ctocpp.h +++ b/libcef_dll/ctocpp/stream_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e0450b29c0edddd58924cac0fd693f0bb4f5b510$ +// $hash=8a1cd61b67d54a528ac936415fa11ff1936cd628$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.cc b/libcef_dll/ctocpp/stream_writer_ctocpp.cc index 63e40bf6657617538b71368390e7685ce2721180..96d63402717df8660f251379e183c7a4b673ff01 100644 --- a/libcef_dll/ctocpp/stream_writer_ctocpp.cc +++ b/libcef_dll/ctocpp/stream_writer_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ffab37c66e16808d41726ad2520f64976bba82db$ +// $hash=2bbeabe2eb7355b48188a0c0806fba7d08dc3144$ // #include "libcef_dll/ctocpp/stream_writer_ctocpp.h" diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.h b/libcef_dll/ctocpp/stream_writer_ctocpp.h index b42df35b4b96258705b8c7e08a60e2d9130e9a52..eceb31ac95f3c3e435461616e887ac9664a0821f 100644 --- a/libcef_dll/ctocpp/stream_writer_ctocpp.h +++ b/libcef_dll/ctocpp/stream_writer_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dd1a095d17c6d0111238a232962d5ac9ce267294$ +// $hash=f1156f9657858024d8d0dc20af0b5f53e82b5d74$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_STREAM_WRITER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.cc b/libcef_dll/ctocpp/string_visitor_ctocpp.cc index a4590d8286b747e860e55ab8f77b9ec1f906debe..34991d0373e452cbd8393eafd938af7cb4dd7325 100644 --- a/libcef_dll/ctocpp/string_visitor_ctocpp.cc +++ b/libcef_dll/ctocpp/string_visitor_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=159eeab5b0b2aa3cac9dd17493cb6947a3980056$ +// $hash=a2b53161507c06e907247b24022b7d5d62358fd9$ // #include "libcef_dll/ctocpp/string_visitor_ctocpp.h" diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.h b/libcef_dll/ctocpp/string_visitor_ctocpp.h index 52b05f7b4255a0087986c1965569513d08d6af94..53e15edcd50a5e5415a91faa099627fb1618fca5 100644 --- a/libcef_dll/ctocpp/string_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/string_visitor_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=94237489451afb247c08f02db3a02e2c8080c291$ +// $hash=6e693b6dd1a72803aa7243d7cd5de54354338c37$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_STRING_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/task_ctocpp.cc b/libcef_dll/ctocpp/task_ctocpp.cc index 757888f10c7cac1b9cbea22207de8036470f05fa..48050c56cd9e3a0a35243bf69eeecba28c0f6aa8 100644 --- a/libcef_dll/ctocpp/task_ctocpp.cc +++ b/libcef_dll/ctocpp/task_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1f5fda0ee72da720d1cc701e86d0bf4cd112f66f$ +// $hash=2af462fcea47a649e9f17e4101c37f1f69bba508$ // #include "libcef_dll/ctocpp/task_ctocpp.h" diff --git a/libcef_dll/ctocpp/task_ctocpp.h b/libcef_dll/ctocpp/task_ctocpp.h index b91deea003e603a13d87c65ad89d79c0290e7a36..ccd90edb97cc168be37138779346ea3bcb3c9744 100644 --- a/libcef_dll/ctocpp/task_ctocpp.h +++ b/libcef_dll/ctocpp/task_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7981cb011227353bd976ea98848e970a31eacb40$ +// $hash=e722a5b9ae2bb6e3d3236a199930600dc3b5e0f8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TASK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/task_runner_ctocpp.cc b/libcef_dll/ctocpp/task_runner_ctocpp.cc index 7117b1d5635b0736b37192faba6d8d59587d53d7..d598a1ea60bb8c8c123c8706f51326d23776b2e8 100644 --- a/libcef_dll/ctocpp/task_runner_ctocpp.cc +++ b/libcef_dll/ctocpp/task_runner_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=df6e77d5bb333463084c645fbb71ae3a92367c7b$ +// $hash=fbc7a64ec7f731112c32185bf2ecd9bfd9920a34$ // #include "libcef_dll/ctocpp/task_runner_ctocpp.h" diff --git a/libcef_dll/ctocpp/task_runner_ctocpp.h b/libcef_dll/ctocpp/task_runner_ctocpp.h index 57ae5789aa1d4e6ee01c66fef125de3bca7760b0..2f33aaffbd2cbc483d3ee0be84a00258a2ddaf86 100644 --- a/libcef_dll/ctocpp/task_runner_ctocpp.h +++ b/libcef_dll/ctocpp/task_runner_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=316dc0819553024b65f684d545c6271c52ce8418$ +// $hash=372cc40047bb36d78f80f4d1edbbba30faad2c7f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TASK_RUNNER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc b/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc index 4ffb07f59f22c1f30530e2da233ce3f2a3a184a6..af3b160a2fe659dd8ebd7c437a93ac560041ed1a 100644 --- a/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc +++ b/libcef_dll/ctocpp/test/test_server_connection_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3d97edb0fd34e3624c2cae3a71cb16adae9876a8$ +// $hash=fe9776e1f16f92742ad5215b0f990223f8647c59$ // #include "libcef_dll/ctocpp/test/test_server_connection_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/test_server_connection_ctocpp.h b/libcef_dll/ctocpp/test/test_server_connection_ctocpp.h index 680521f4ea4d0fad77818f7a07199779f66fec7a..0c2788d97e088767c986ba27d61eadefa711e914 100644 --- a/libcef_dll/ctocpp/test/test_server_connection_ctocpp.h +++ b/libcef_dll/ctocpp/test/test_server_connection_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0897e5d62dab403ca5b7bb65fd7aa09260abc007$ +// $hash=99b84d1e02eeeaa485722c9d685bfed90a8bd356$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TEST_SERVER_CONNECTION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/test_server_ctocpp.cc b/libcef_dll/ctocpp/test/test_server_ctocpp.cc index c479e7c947b2ecb944acf057a5a3f8166276a7e0..0b73760914cecea9d95318f90fd93d7280384eb0 100644 --- a/libcef_dll/ctocpp/test/test_server_ctocpp.cc +++ b/libcef_dll/ctocpp/test/test_server_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=968a2858141da53370bb7d59298ca9dba4a7c45a$ +// $hash=50c7d4b9b04e640de46aa816dc44b8eeb718cc79$ // #include "libcef_dll/ctocpp/test/test_server_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/test_server_ctocpp.h b/libcef_dll/ctocpp/test/test_server_ctocpp.h index 8e73dd0f576637220835c2cdd4f9a15a0b1f520e..1d95f6b46c6c55793a954a08cb6919c9b3822335 100644 --- a/libcef_dll/ctocpp/test/test_server_ctocpp.h +++ b/libcef_dll/ctocpp/test/test_server_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=34c9f7735daa25c2c3aaa0976ef5b53e6fc1189b$ +// $hash=06d5fbd145898540f060616efbd6f81e1bee7498$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TEST_SERVER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc b/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc index c4a6782049bac9938d7f78896eada993edb0923c..f1f18ce8809d12ee6bfafe8fb10819d063dd86b3 100644 --- a/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/test/test_server_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ea6ffa38b2e8863ae9f8f1171fa2e2f8e80e89ef$ +// $hash=43130e567ff34056d282a006b0023c5892b83afa$ // #include "libcef_dll/ctocpp/test/test_server_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/test_server_handler_ctocpp.h b/libcef_dll/ctocpp/test/test_server_handler_ctocpp.h index 2a7031a5f0e936fbeb0f9c97644b5f70652e06f1..b390bf7c40ea7a8946551a6ff0753e37a4cdfd8b 100644 --- a/libcef_dll/ctocpp/test/test_server_handler_ctocpp.h +++ b/libcef_dll/ctocpp/test/test_server_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=102eed41d0751f47c900b3b39c0b670eb43a2f1c$ +// $hash=c0a7d6e6596314771567fafa185ac777bdc61a65$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TEST_SERVER_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc index 8b7d64cee08bb08e11c9f156304bbdd1082b103d..26b00db7a5a84c0da58cb4cb9e95db66a44d5d09 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d0ef4a40a0f4b30b492ff115dacc8b9248a78c22$ +// $hash=e45ac9d949f5bc30b13e69cf655120250e0ccdc4$ // #include "libcef_dll/ctocpp/test/translator_test_ctocpp.h" @@ -734,8 +734,8 @@ NO_SANITIZE("cfi-icall") size_t CefTranslatorTestCToCpp::GetPointListSize() { } NO_SANITIZE("cfi-icall") -CefRefPtr CefTranslatorTestCToCpp:: - GetRefPtrLibrary(int val) { +CefRefPtr +CefTranslatorTestCToCpp::GetRefPtrLibrary(int val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -780,8 +780,9 @@ int CefTranslatorTestCToCpp::SetRefPtrLibrary( } NO_SANITIZE("cfi-icall") -CefRefPtr CefTranslatorTestCToCpp:: - SetRefPtrLibraryAndReturn(CefRefPtr val) { +CefRefPtr +CefTranslatorTestCToCpp::SetRefPtrLibraryAndReturn( + CefRefPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -833,9 +834,9 @@ int CefTranslatorTestCToCpp::SetChildRefPtrLibrary( } NO_SANITIZE("cfi-icall") -CefRefPtr CefTranslatorTestCToCpp:: - SetChildRefPtrLibraryAndReturnParent( - CefRefPtr val) { +CefRefPtr +CefTranslatorTestCToCpp::SetChildRefPtrLibraryAndReturnParent( + CefRefPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -994,8 +995,9 @@ int CefTranslatorTestCToCpp::SetRefPtrClient( } NO_SANITIZE("cfi-icall") -CefRefPtr CefTranslatorTestCToCpp:: - SetRefPtrClientAndReturn(CefRefPtr val) { +CefRefPtr +CefTranslatorTestCToCpp::SetRefPtrClientAndReturn( + CefRefPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -1047,9 +1049,9 @@ int CefTranslatorTestCToCpp::SetChildRefPtrClient( } NO_SANITIZE("cfi-icall") -CefRefPtr CefTranslatorTestCToCpp:: - SetChildRefPtrClientAndReturnParent( - CefRefPtr val) { +CefRefPtr +CefTranslatorTestCToCpp::SetChildRefPtrClientAndReturnParent( + CefRefPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -1195,8 +1197,8 @@ size_t CefTranslatorTestCToCpp::GetRefPtrClientListSize() { } NO_SANITIZE("cfi-icall") -CefOwnPtr CefTranslatorTestCToCpp:: - GetOwnPtrLibrary(int val) { +CefOwnPtr +CefTranslatorTestCToCpp::GetOwnPtrLibrary(int val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -1241,8 +1243,9 @@ int CefTranslatorTestCToCpp::SetOwnPtrLibrary( } NO_SANITIZE("cfi-icall") -CefOwnPtr CefTranslatorTestCToCpp:: - SetOwnPtrLibraryAndReturn(CefOwnPtr val) { +CefOwnPtr +CefTranslatorTestCToCpp::SetOwnPtrLibraryAndReturn( + CefOwnPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -1296,9 +1299,9 @@ int CefTranslatorTestCToCpp::SetChildOwnPtrLibrary( } NO_SANITIZE("cfi-icall") -CefOwnPtr CefTranslatorTestCToCpp:: - SetChildOwnPtrLibraryAndReturnParent( - CefOwnPtr val) { +CefOwnPtr +CefTranslatorTestCToCpp::SetChildOwnPtrLibraryAndReturnParent( + CefOwnPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -1352,8 +1355,9 @@ int CefTranslatorTestCToCpp::SetOwnPtrClient( } NO_SANITIZE("cfi-icall") -CefOwnPtr CefTranslatorTestCToCpp:: - SetOwnPtrClientAndReturn(CefOwnPtr val) { +CefOwnPtr +CefTranslatorTestCToCpp::SetOwnPtrClientAndReturn( + CefOwnPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); @@ -1407,9 +1411,9 @@ int CefTranslatorTestCToCpp::SetChildOwnPtrClient( } NO_SANITIZE("cfi-icall") -CefOwnPtr CefTranslatorTestCToCpp:: - SetChildOwnPtrClientAndReturnParent( - CefOwnPtr val) { +CefOwnPtr +CefTranslatorTestCToCpp::SetChildOwnPtrClientAndReturnParent( + CefOwnPtr val) { shutdown_checker::AssertNotShutdown(); cef_translator_test_t* _struct = GetStruct(); diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ctocpp.h index 7033446d11dd890ce3b3e8f2f2c1aa3955898bd6..8384cefe5b8ca608f9dc866d4c7176d02d6c3e85 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3eba48ccaeb049442235247470ea785822ae8ee0$ +// $hash=915917340262b6243b06022fe96cc1e96625cac9$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc index bda3ab02228f7ac7f1be8976bcb4a903777ebd30..cc33e22cae3abba93a53cef40fb8a21b69050bc1 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=22540c35c70f5601d4fcfdf0d4114d1f11df674f$ +// $hash=83723bcac7d4a071aeece77b37ddd6b459b931fc$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h index 56a0d01333ea43c042d3741cda6d441993b223cd..d59c50cf4f9a219637cb8e5529d5045a8750c921 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=529eab5a13f63dc9696e3f2912546c203358fd49$ +// $hash=971a30d8a2814ecdddb08763016621ce94b9da92$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc index 0894071892e3113dda271439a753977675f15866..0d54de147d0c1e5235ebc412024e966e7d927d49 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d1777298bd5ee07d789ae867af7de1d0755bc791$ +// $hash=ce7854af973f443c580f9f026be9db6c4cff6182$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h index 87894e2a9dafe55b09c895cb38ace66a49a9fc5d..968847f2b10caa2123d6cbcda6ccfcd07b45fa69 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7bb9949dc49e927f0a9d75ff480b3fcf4e75d4fe$ +// $hash=a083f0198c6c93ee0fccdb262dce8dc567abbf9c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc index 9ad4d9c3e76304a06e2705717f48a17a740d80da..5c37516113b9ca98748d5b2d1420262a7cd09558 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6a599664e32ec9f7c5ec06a3beeba35416551841$ +// $hash=91e5a9096b509e43530e031ae8e46d90380e0796$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h" @@ -18,9 +18,10 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefRefPtr< - CefTranslatorTestRefPtrLibraryChildChild> CefTranslatorTestRefPtrLibraryChildChild:: - Create(int value, int other_value, int other_other_value) { +CefRefPtr +CefTranslatorTestRefPtrLibraryChildChild::Create(int value, + int other_value, + int other_other_value) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h index b2469eb626a1f6b6c34c4d3535ac979f529d3dda..f6a503a2956b1e3f1bf12175252a92ecb20e4a99 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cc8a1be0855afc6bc7d17c49fff8159d28e83aa3$ +// $hash=49af27e043172c178c3ef4f37805069e6af739e6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc index 61d8d5302a16342028326fd42e3d88712c19427c..3039bf74de554e2ac1bbce2b8c667e933da6a5c6 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=cdf50b5486ff4530177ed7200d7f2b692307a012$ +// $hash=cd059e94feaa5f002332fcb6fac40fcd1cb14dca$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h" @@ -19,9 +19,8 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefRefPtr< - CefTranslatorTestRefPtrLibraryChild> CefTranslatorTestRefPtrLibraryChild:: - Create(int value, int other_value) { +CefRefPtr +CefTranslatorTestRefPtrLibraryChild::Create(int value, int other_value) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h index 3576d0c021a644d8056416da01ebdcaf972ca2f7..a5e5b711626ec08803a149b09b1ed27c0025ae54 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=422563e0ad77e972a861e8c90be92b235cbaa38a$ +// $hash=ef77c876031b14fdee487305c5cfded6a9cb910f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc index 7065a13ab5033116056d89846b0e372cd0012187..3e54eee5103a5be3d985ba25b47a8d2e2085f23c 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6b0d13ce9b489d62b086fa4d33ce251b7b518f81$ +// $hash=7540736b997ff0f093265301b1476e18933c492f$ // #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h" @@ -20,8 +20,8 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefRefPtr CefTranslatorTestRefPtrLibrary:: - Create(int value) { +CefRefPtr +CefTranslatorTestRefPtrLibrary::Create(int value) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING diff --git a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h index 33d094f15f2fef794337d48ca3352b52946cbdc1..94ff9da719a4abf0c21fee0fd74e8030ded2d5c6 100644 --- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=9e2ecd0b25bebb92527c03834508edd591cab24b$ +// $hash=9fa8897ee5081b7cd95a6cb791fb69871f61406e$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc index 101419f548c69e841a94f9349ccd6284902cd881..5ba6cd527e6f7c755a62e91fa2c96fd4d6c0e107 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d18845d5a06a1ba8f7c85adc525b22803459b831$ +// $hash=b37005aa19984166b1f103e260cb49f6becec364$ // #include "libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h index aff90c8d79c0ad1380e2be63cfdd2984d510ef85..36339c17754eff1eda03261974d991305f02ea29 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f631d7554d0a7b50a16fc78087acbaf956b270cf$ +// $hash=ec4bff6137c66581b34dc2ef11beb02276de163a$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc index e669db38ec5e9a41a093ab25a8dbf6dd338809bd..a0b9e4b95839fd8a4d7c434f27714ce42a06a85e 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7f28d1c7c51271082e987d17748b94ef8f4bf9d6$ +// $hash=0ce373fa99a3d48d9a512355dfc4d3c26aa18f87$ // #include "libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h" diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h index 9a5be66516acee75df13b6d71a4634c371fa0e96..caeaf6941d6fac83eb46a02f428286d58e06efd1 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4f7c7c02d8eeb63cde89246cefb67b71060d1fb7$ +// $hash=d511f3a8273e4d9c6acff3d183b7bfa84e1385e3$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc index 7ad99073c75062c263691a708c60dfdeba6e60fd..d0605a13677be01e550b21d7ea25309da3058636 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7013f9c1fa9ef3215a44319724848ba8c7c5d939$ +// $hash=7021be9737238bd48745b5cfbfad8c0191f847fe$ // #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h" @@ -17,9 +17,10 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefOwnPtr< - CefTranslatorTestScopedLibraryChildChild> CefTranslatorTestScopedLibraryChildChild:: - Create(int value, int other_value, int other_other_value) { +CefOwnPtr +CefTranslatorTestScopedLibraryChildChild::Create(int value, + int other_value, + int other_other_value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h index a6dbec18d3207ae1847cfb934ccfc156f94996f0..8b3fd3485db40df028742a66b60e1b5fb53cb078 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ceb03b69c0778bf8b4b6825226647b66a1d11523$ +// $hash=b6fc182f3444ce3926bff6d2b30d14aeca4cb9ba$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc index 6a7b378b614656c2fa77c794e56f5b5ce4ace24b..f17fb5cb67c8ba85e806f375c58c7ffc31a88641 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=577ad6d065acb15db81c827be8174f97f71e8f26$ +// $hash=7fd424327ace29415b68a9c9fb15216e33c7c142$ // #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h" @@ -18,9 +18,8 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefOwnPtr< - CefTranslatorTestScopedLibraryChild> CefTranslatorTestScopedLibraryChild:: - Create(int value, int other_value) { +CefOwnPtr +CefTranslatorTestScopedLibraryChild::Create(int value, int other_value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h index 3766148fdd8fe023b7c883b384097571fe2870f1..e4ab2f9ea42aecd70c4f08359a22fdd80f5670f9 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8d51607e3ba3a0efd3d9ac013e8b7fa41ac7d4ba$ +// $hash=954fc390e3b474eedcf0bbb3df41e717c00449d3$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc index 14296445dfe38a374e35568e38326ecb8a747315..675bb2fcfc99bd8ff85c2b6c3b1c0013a487c912 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6f68f49f6c1bf77facbd232395e3b18eb058438c$ +// $hash=042f660ffd41b420a394bc93cdaccf75984cf999$ // #include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h" @@ -19,8 +19,8 @@ // STATIC METHODS - Body may be edited by hand. NO_SANITIZE("cfi-icall") -CefOwnPtr CefTranslatorTestScopedLibrary:: - Create(int value) { +CefOwnPtr +CefTranslatorTestScopedLibrary::Create(int value) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute diff --git a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h index 1f6e89ac12c430fd4615b74156b4ebdc441ac75f..c40e19efc74b2db6ca28e7380623ab09a7a337f8 100644 --- a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=dc45f5b9d5a066706954b4ff9d20eb0ffc3738e6$ +// $hash=5fafb4986f557d448f6f234fd49ea899eac81af1$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/thread_ctocpp.cc b/libcef_dll/ctocpp/thread_ctocpp.cc index 9548d20ca85476ec18de4494e62bf91b793218ce..34c7dcd31e66c4c0165e53b0137d6c8ee755bdce 100644 --- a/libcef_dll/ctocpp/thread_ctocpp.cc +++ b/libcef_dll/ctocpp/thread_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a5d7cc67a07f2e4b8003629ae4d4b1d0dfb4232e$ +// $hash=74736c3227b7b9961f04ab93f5644a16fe0a21b9$ // #include "libcef_dll/ctocpp/thread_ctocpp.h" diff --git a/libcef_dll/ctocpp/thread_ctocpp.h b/libcef_dll/ctocpp/thread_ctocpp.h index 93a7febcb521afa0d8189e34b2f5f94e0bd608b2..5bdc3574ce620bfaf5fd5fe1c95224543674b58f 100644 --- a/libcef_dll/ctocpp/thread_ctocpp.h +++ b/libcef_dll/ctocpp/thread_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1b2467411ec05541f2f0f5351614f617e239fbc2$ +// $hash=63729fa2f06672498bde63eaa8151b20db9e6fd8$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_THREAD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc index f0bf7ea4e73186ec06c9a61808c7025bbe688a30..17faaf6312efca317e96fe6cb43517bade4bf34c 100644 --- a/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_client_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ec0beed1962fdb224c031a961374be29dc6d9c33$ +// $hash=01563ca6bfdf4177e300fd94befec528e5a3d2c8$ // #include "libcef_dll/ctocpp/urlrequest_client_ctocpp.h" diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.h b/libcef_dll/ctocpp/urlrequest_client_ctocpp.h index ed0bcb269a5473723b2d21eac2c4f48bb44648c0..dd081f9c62504555a5a46ba76279f05f0d83d32a 100644 --- a/libcef_dll/ctocpp/urlrequest_client_ctocpp.h +++ b/libcef_dll/ctocpp/urlrequest_client_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5ca99147f1a3d13ee826bcd5b7ff52caf32e30c4$ +// $hash=50740eddae0ae234cf24d2b73eadcfdb16fcf0f0$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CLIENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.cc b/libcef_dll/ctocpp/urlrequest_ctocpp.cc index 0956b79e5f6700ba9353f113031740f92b602828..1b65fc5b6110f3091fc41291597c332dcbf122d9 100644 --- a/libcef_dll/ctocpp/urlrequest_ctocpp.cc +++ b/libcef_dll/ctocpp/urlrequest_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8d3bc803a0fe5b6f961f6538354732718a7b6fcb$ +// $hash=6d08f44b6705e919027d22f22a432bebe47d20da$ // #include "libcef_dll/ctocpp/urlrequest_ctocpp.h" diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.h b/libcef_dll/ctocpp/urlrequest_ctocpp.h index 0eab58e239f45b2225cc5349bedb9d110a8b0277..7a2bff5eac30037fa9a16d59fdfaad626ba18144 100644 --- a/libcef_dll/ctocpp/urlrequest_ctocpp.h +++ b/libcef_dll/ctocpp/urlrequest_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=59e1e7713ce88d9158e89bf5f085f9dd718bd8dd$ +// $hash=8c953a3dd5cdec5cba6160e848884c2f7c9b3ac6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.cc b/libcef_dll/ctocpp/v8accessor_ctocpp.cc index 935439541326da348c6c7ba0680cc048b9eb7c64..efeff04883d1d4b807d3f4b178ebee9e6277790d 100644 --- a/libcef_dll/ctocpp/v8accessor_ctocpp.cc +++ b/libcef_dll/ctocpp/v8accessor_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=abab06775b16d017b6a729b62043f769559af07d$ +// $hash=82799d0f81c3d54dc77361245f26786ea1875199$ // #include "libcef_dll/ctocpp/v8accessor_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.h b/libcef_dll/ctocpp/v8accessor_ctocpp.h index dadb0bbea33f21082aa79ada4017dfa5463c94dd..45c4de9f411331a000689591d1a94d80a953b55a 100644 --- a/libcef_dll/ctocpp/v8accessor_ctocpp.h +++ b/libcef_dll/ctocpp/v8accessor_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=33a07b9d05e7b8e7ee4cdaefc4926614c002d850$ +// $hash=1d8a3afd0e6a0344a9c5f6e301b517e5f906c186$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8ACCESSOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.cc b/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.cc index 196e61e6252175168b4ce2f52d662808e3ffb23c..b20c55cbde1f70bea5541edb444025fcc0acf152 100644 --- a/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.cc +++ b/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=904b13e5d2969108f8da970e7458ed8522b94447$ +// $hash=d7aa0e86c66737e1ec4db2188a1aba3967c95919$ // #include "libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h b/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h index 9940e80909f7dd05e36c4f21d9c2cb3f83c6293c..4a5292531f63a06df4e44d7e2660328defaf7ae8 100644 --- a/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h +++ b/libcef_dll/ctocpp/v8array_buffer_release_callback_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3a236ba48c70354e57701074e9bc4f256869833f$ +// $hash=4f9c4bb702d2824ee94dd334244cd9ba14609025$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8ARRAY_BUFFER_RELEASE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8context_ctocpp.cc b/libcef_dll/ctocpp/v8context_ctocpp.cc index e4989ddf1eaff49602e06644c8b62a1095d9056a..bdc5bcee16fa6659ea5891e48d4302eef307e244 100644 --- a/libcef_dll/ctocpp/v8context_ctocpp.cc +++ b/libcef_dll/ctocpp/v8context_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6db9445f709933ad94f7d0342e64dc5133f058ff$ +// $hash=6bdcf32699e33c7e46b8b9ac67220a6edd0bd73a$ // #include "libcef_dll/ctocpp/v8context_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8context_ctocpp.h b/libcef_dll/ctocpp/v8context_ctocpp.h index 0466c796067b8d76c2023e40ddbffc11ceabea5e..7ab4e0bc12a128cfa7eebdbce89f3de36faa349f 100644 --- a/libcef_dll/ctocpp/v8context_ctocpp.h +++ b/libcef_dll/ctocpp/v8context_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=066ee009bfb93e62948a68f173f2e15eeccf6005$ +// $hash=c5159f67aa8d77aca23153cf6c35468af27dba14$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.cc b/libcef_dll/ctocpp/v8exception_ctocpp.cc index eebb4069a8f639b3116ffefe8c2c77080a8928a2..af6b345f76bac3893cf4d38dbea3e654b1b18508 100644 --- a/libcef_dll/ctocpp/v8exception_ctocpp.cc +++ b/libcef_dll/ctocpp/v8exception_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d245e78d590f9017507c07f848b4797444d80d6a$ +// $hash=a1a9c4ad40c25c80390f0168261569c1b2141e86$ // #include "libcef_dll/ctocpp/v8exception_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.h b/libcef_dll/ctocpp/v8exception_ctocpp.h index b0523be3dadc2249e5d88ed4f89d57a3821c06e8..0256b62f9ec62fb1eaadbf2657714263e74a3c7e 100644 --- a/libcef_dll/ctocpp/v8exception_ctocpp.h +++ b/libcef_dll/ctocpp/v8exception_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c1c6a972b09f9897c60242e931cbc800312bdae2$ +// $hash=ed15db160fa19964fe5c9902c279fa1b44bd0dbe$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.cc b/libcef_dll/ctocpp/v8handler_ctocpp.cc index 4d75084ab28773afee02727bf14f73dbd0cb3e51..6260c1bba2a192dda08347b43194a08aea80e1f6 100644 --- a/libcef_dll/ctocpp/v8handler_ctocpp.cc +++ b/libcef_dll/ctocpp/v8handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c5073ccb5382416c50b9cc37a0e10c2d8bb6290a$ +// $hash=4a30d78ab05a200e8d93b9e8da2c4cb3a8ff4acd$ // #include "libcef_dll/ctocpp/v8handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.h b/libcef_dll/ctocpp/v8handler_ctocpp.h index 828812c39b2985a0013577b9ed819e328130dfe2..cd5a0e42e0d35c69c8288f5b7ea5632b10cc01f5 100644 --- a/libcef_dll/ctocpp/v8handler_ctocpp.h +++ b/libcef_dll/ctocpp/v8handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f096fe32c74a7e7155f33e262653ab15bb92d419$ +// $hash=442444a8b361b3ce3f599181fe8057d175e1cc20$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8interceptor_ctocpp.cc b/libcef_dll/ctocpp/v8interceptor_ctocpp.cc index 03533a553808bf9e7e3994beb5801fb49c624ceb..37dd493fdfd8d6a9d6c68569f80ffb94e3df86dd 100644 --- a/libcef_dll/ctocpp/v8interceptor_ctocpp.cc +++ b/libcef_dll/ctocpp/v8interceptor_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a4d05b34b629979d9e25b24bd9065294b916702f$ +// $hash=49e110abc14cd4c30a1a7aec0157285d3e886a84$ // #include "libcef_dll/ctocpp/v8interceptor_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8interceptor_ctocpp.h b/libcef_dll/ctocpp/v8interceptor_ctocpp.h index 6949bc3e99348e88ddbb337b8d3f2375dd578413..de862c1d32d704bd4da3f50c0aacf6d91fcaf3ad 100644 --- a/libcef_dll/ctocpp/v8interceptor_ctocpp.h +++ b/libcef_dll/ctocpp/v8interceptor_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=2e91dcbb3005950c78ef831e43d7c90d1e2c90ba$ +// $hash=11fbbb5b1de3f96d332ec3653780826677ffcdf2$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8INTERCEPTOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc b/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc index aa1ca6a0a005b27ac86a3833e64ca6b384bc2a94..2311cacbfdac7dab3239404304d2b70c68e09a41 100644 --- a/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc +++ b/libcef_dll/ctocpp/v8stack_frame_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=0a20ae0158b5cda22c1db0b9f3ee9459d7b4cfb4$ +// $hash=8883a3a31a9a48371dcc5b35ea7820a52f105bf1$ // #include "libcef_dll/ctocpp/v8stack_frame_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8stack_frame_ctocpp.h b/libcef_dll/ctocpp/v8stack_frame_ctocpp.h index 50f82b5343a506e07d08feb9cce49ccb3694c963..474cd1ad6faee03c87ca89c316829550fe6cb2c6 100644 --- a/libcef_dll/ctocpp/v8stack_frame_ctocpp.h +++ b/libcef_dll/ctocpp/v8stack_frame_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=da9219ed18261db0ce53060f4189a61585b1d4e8$ +// $hash=366d110fdfaf3d241c26e9ec276f7c363ecd313f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc b/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc index f1941bd2e2f0dc2b44ee35960b0270f010a5b38f..0198dcc5ddf862e8bd57f1c5dc23ef71b3130e0e 100644 --- a/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc +++ b/libcef_dll/ctocpp/v8stack_trace_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4d5c8d1e85098db4ae8eef535d9f8d8f1cde0839$ +// $hash=f35d094b71513d6d1201e53eda87148b415d286d$ // #include "libcef_dll/ctocpp/v8stack_trace_ctocpp.h" diff --git a/libcef_dll/ctocpp/v8stack_trace_ctocpp.h b/libcef_dll/ctocpp/v8stack_trace_ctocpp.h index 25e98d081564c788dcda567439a1e5af1946dca5..1e076ac1321fac943c5d95d48ee1c95324718201 100644 --- a/libcef_dll/ctocpp/v8stack_trace_ctocpp.h +++ b/libcef_dll/ctocpp/v8stack_trace_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=db716fbe0fd9b247bdb6f34edeed4b4ebacc4122$ +// $hash=361eefa5a258faf92d09e28787293fa29bbed742$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8value_ctocpp.cc b/libcef_dll/ctocpp/v8value_ctocpp.cc index b29fb6dd46afd69b754f091adf93fdb0b297075f..8184549dee7c91a617d291b2135892e6af796d75 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d3956da82508a440d74347e913df6c1f75ee6891$ +// $hash=2d4ed978e25a9db2be8740bb076b9750723e45e1$ // #include "libcef_dll/ctocpp/v8value_ctocpp.h" @@ -925,8 +925,8 @@ NO_SANITIZE("cfi-icall") int CefV8ValueCToCpp::GetArrayLength() { } NO_SANITIZE("cfi-icall") -CefRefPtr CefV8ValueCToCpp:: - GetArrayBufferReleaseCallback() { +CefRefPtr +CefV8ValueCToCpp::GetArrayBufferReleaseCallback() { cef_v8value_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_array_buffer_release_callback)) { return nullptr; diff --git a/libcef_dll/ctocpp/v8value_ctocpp.h b/libcef_dll/ctocpp/v8value_ctocpp.h index 19ddf86e7300e6d5713e579605e0d7994423b4b3..b9137cc276af071b6f29c7cf6275ddd1c4ccb851 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.h +++ b/libcef_dll/ctocpp/v8value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=098ed5cfe360a06a86bb761f29df434078565570$ +// $hash=ec4b3cb221b3fcfb0f8f5e35aa351d3696cb78bb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/value_ctocpp.cc b/libcef_dll/ctocpp/value_ctocpp.cc index 11e9dc9751ffde7b3641fa9a07a872026e6e434b..33432f4c69faa2f62a15a9ff9522ac2566463349 100644 --- a/libcef_dll/ctocpp/value_ctocpp.cc +++ b/libcef_dll/ctocpp/value_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d1e86eebd4160f38e7b19be4a057f1735f8e9b75$ +// $hash=9e6bc91e58ee92cf2c2b855d0eea2a0db0743e4a$ // #include "libcef_dll/ctocpp/value_ctocpp.h" diff --git a/libcef_dll/ctocpp/value_ctocpp.h b/libcef_dll/ctocpp/value_ctocpp.h index ddab28b4da01b83fa1164b5b16bedbbec47c270c..66629188c74f756279ef1cdc2ebe05b1ea2b0621 100644 --- a/libcef_dll/ctocpp/value_ctocpp.h +++ b/libcef_dll/ctocpp/value_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=967477ab77e75628d85a5c13167f3d19d6d13f60$ +// $hash=80621c9fcd1e112984ddb490da40034e9731d530$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc index 6f4e084cd1653cecd5a1971cce61e990e4eba744..ccbc6ffd9086f8a000bb9659ce666195914159da 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=6d6b2239e3e28cbe4950ee5f228291c8465aeaa7$ +// $hash=9467c10a9769147a4da5b74ea01015d8e54e9677$ // #include "libcef_dll/ctocpp/views/box_layout_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.h b/libcef_dll/ctocpp/views/box_layout_ctocpp.h index 9e58292cf4af37bcbb8ecb9cf4913653d2d3677a..6639e642f2cec99dfba694d5bf2e64452cacd878 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b3b1a9ba35060d934a7707d33e712ba5ffe28326$ +// $hash=c14b6372ec4705cdcbcebc6d7367fe0c3c544001$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BOX_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc index 3469563e7e45c82e763897a507d274fa1cd10003..92fc1cb686f9707be0feeafe59ec077ef13fa6fc 100644 --- a/libcef_dll/ctocpp/views/browser_view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f5c482db02b530d627e487b8ba71019577910637$ +// $hash=a0b2ffd53a9d1c0054348f323cfdd548cdbeca86$ // #include "libcef_dll/ctocpp/views/browser_view_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/browser_view_ctocpp.h b/libcef_dll/ctocpp/views/browser_view_ctocpp.h index b3d836d368d30763dfccfa670411e7958810d725..526b63fdf34806b5e120ff444e9c20aa735a0f67 100644 --- a/libcef_dll/ctocpp/views/browser_view_ctocpp.h +++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=47b5f2dd231632b2ed2ca843ff1925cabac6d2a8$ +// $hash=3369ae36dfebd0283661566cf91fa57dbfec29e4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc index b315e66eb62522c0a24bedafccedf6bc34067512..9d10dc134fe82d3a4a7cac897b7c4fac27578f08 100644 --- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=271d736e443acf99b504cab5c2d20c2f80f2ff30$ +// $hash=bff0bff161e504deec6aef910ebf5d8962bd7c85$ // #include "libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h" @@ -81,11 +81,12 @@ void CefBrowserViewDelegateCToCpp::OnBrowserDestroyed( } NO_SANITIZE("cfi-icall") -CefRefPtr CefBrowserViewDelegateCToCpp:: - GetDelegateForPopupBrowserView(CefRefPtr browser_view, - const CefBrowserSettings& settings, - CefRefPtr client, - bool is_devtools) { +CefRefPtr +CefBrowserViewDelegateCToCpp::GetDelegateForPopupBrowserView( + CefRefPtr browser_view, + const CefBrowserSettings& settings, + CefRefPtr client, + bool is_devtools) { shutdown_checker::AssertNotShutdown(); cef_browser_view_delegate_t* _struct = GetStruct(); @@ -148,7 +149,7 @@ bool CefBrowserViewDelegateCToCpp::OnPopupBrowserViewCreated( NO_SANITIZE("cfi-icall") CefBrowserViewDelegate::ChromeToolbarType - CefBrowserViewDelegateCToCpp::GetChromeToolbarType() { +CefBrowserViewDelegateCToCpp::GetChromeToolbarType() { shutdown_checker::AssertNotShutdown(); cef_browser_view_delegate_t* _struct = GetStruct(); @@ -193,8 +194,8 @@ bool CefBrowserViewDelegateCToCpp::OnGestureCommand( } NO_SANITIZE("cfi-icall") -CefSize - CefBrowserViewDelegateCToCpp::GetPreferredSize(CefRefPtr view) { +CefSize CefBrowserViewDelegateCToCpp::GetPreferredSize( + CefRefPtr view) { shutdown_checker::AssertNotShutdown(); cef_view_delegate_t* _struct = diff --git a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h index cc72e8e436c9ea9889c00c621e1845a3cd3ea888..b92183201605c5c7340b0c8e1ba9169360b8518c 100644 --- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d92eaa0a8b0d1d96db4a586ec37f3239c09031ca$ +// $hash=15c0d7230887344fa77279c76ff377b3f2d9ee1d$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/button_ctocpp.cc b/libcef_dll/ctocpp/views/button_ctocpp.cc index 49f584f5b8b4e2984584845c6ce96ddf42232758..491015146ee0d2a238191dfefc534c9a14b8f3e0 100644 --- a/libcef_dll/ctocpp/views/button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ff414aa670f0c92cb67f6f18fbe8c7a25034635b$ +// $hash=6e10aa09a1ea84f2f6e4dae41e0fe226fb0f628e$ // #include "libcef_dll/ctocpp/views/button_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/button_ctocpp.h b/libcef_dll/ctocpp/views/button_ctocpp.h index e07d642636bcde01c0abde47358d3d1a3f1df4e1..4f4362ee59448a3bba32e82eff72ddab9d0110b8 100644 --- a/libcef_dll/ctocpp/views/button_ctocpp.h +++ b/libcef_dll/ctocpp/views/button_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fc28306db14011294cbb7e7ef277ddd35d5667f0$ +// $hash=d6be48f8326ec9e541ace36d0b467cf6b1fbc065$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc index 47811ad7e579fcac2af8cb1b2e3738ec13baa30c..39f8c79e6df657436a9e3af0e86a7f24f575e9ee 100644 --- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=68df0ecd51479bdc9f55fb605933ac10ca15affd$ +// $hash=91c554eefa0d182363ba9b50f952f68a8f69ac0d$ // #include "libcef_dll/ctocpp/views/button_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/button_delegate_ctocpp.h b/libcef_dll/ctocpp/views/button_delegate_ctocpp.h index 31ba282a9bf855e12f526d34b1c74adf3671de69..a01a96bde6ba4ca4b5895e9cd0d2f57b739d97c8 100644 --- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=53e751a5b54ab964ee2aef1a8232a9647f47db00$ +// $hash=13140a32b465eaf52f13693cd244a9b47eda5068$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/display_ctocpp.cc b/libcef_dll/ctocpp/views/display_ctocpp.cc index 050e6b61935c2bfc3d971e6a5e041343bdb4fc7f..61c37cdfb8a23de85ed75556f2ab3ab3ccfd9bfe 100644 --- a/libcef_dll/ctocpp/views/display_ctocpp.cc +++ b/libcef_dll/ctocpp/views/display_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=705575e7f868a4667306b1949dce05e1ad39f09d$ +// $hash=b80bdf378a812e1ab80aaf67c1042c69223eaa6b$ // #include "libcef_dll/ctocpp/views/display_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/display_ctocpp.h b/libcef_dll/ctocpp/views/display_ctocpp.h index 407cba5a880551713239102f1a03b9a0a5b11b13..5d12545d52d5ff6329f75ad8d0fba269b980fccc 100644 --- a/libcef_dll/ctocpp/views/display_ctocpp.h +++ b/libcef_dll/ctocpp/views/display_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=10cb06945cb353060ae33cede752978341492e2b$ +// $hash=a05d5f989630c0c031cbe9cc04150a6e1e54c4d4$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_DISPLAY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc b/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc index a3aaed235d72d907bc1aa47284398bdd455709fd..4b07ec74ce07620727f8f270b729aca24e23cf84 100644 --- a/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/fill_layout_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f79d068708f915cea83ab611330f3ea3caf6c148$ +// $hash=28c2bd41db1604637488919fca1375385100595a$ // #include "libcef_dll/ctocpp/views/fill_layout_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/fill_layout_ctocpp.h b/libcef_dll/ctocpp/views/fill_layout_ctocpp.h index 4ef7bb2b67a7605e96aac7652b458cb8dd6ee981..06b0380cf5dd55de18008f30b90aa25b1e44aaac 100644 --- a/libcef_dll/ctocpp/views/fill_layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/fill_layout_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=81f79a9a6dd6d322196491ddd3c61d2083c15bb7$ +// $hash=5d52b0af136f7ac008cb89a29ce65942932b9f64$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_FILL_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/label_button_ctocpp.cc b/libcef_dll/ctocpp/views/label_button_ctocpp.cc index 175ba50fc2a3b50cb96bbce64895870f96eb135a..b5c4d7370b344890f31506d5861b1cfeec73d90f 100644 --- a/libcef_dll/ctocpp/views/label_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/label_button_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e4d98e5ef3ec602b76f42fa4c4d4f5436a8ff53a$ +// $hash=af38c90a350f9426e17f24fab089d90b38af0623$ // #include "libcef_dll/ctocpp/views/label_button_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/label_button_ctocpp.h b/libcef_dll/ctocpp/views/label_button_ctocpp.h index 5a5f9d44cb5a805d11705351c7a771d48106d76d..d7f20dcd4d445dc16a426f18e626324c921f487f 100644 --- a/libcef_dll/ctocpp/views/label_button_ctocpp.h +++ b/libcef_dll/ctocpp/views/label_button_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a22e6b723998dcbfc9c9ff8fd52dd1dfdd3ce772$ +// $hash=e54619e16a7a8f21cdeeb4ddfcedf3504c258d35$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_LABEL_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/layout_ctocpp.cc b/libcef_dll/ctocpp/views/layout_ctocpp.cc index 112f6eb539eeaace61029f65dab84e489d01d0e9..52baad214f4a3550312af2761c97ad2bf8e32773 100644 --- a/libcef_dll/ctocpp/views/layout_ctocpp.cc +++ b/libcef_dll/ctocpp/views/layout_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=30753c2d5046bf76c24d0373dcd4e6a35869164e$ +// $hash=d2db6c2b3eb8abd37305f85e5270e3e5c4d7547b$ // #include "libcef_dll/ctocpp/views/layout_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/layout_ctocpp.h b/libcef_dll/ctocpp/views/layout_ctocpp.h index 5e3eff1cf34b8098373ed949335d6c41c5aa9cb0..6ffa76d33983133d17e1f0a6e19a259edf447114 100644 --- a/libcef_dll/ctocpp/views/layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/layout_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8da66528ed4a241c7f5fcbd3cb1cab869603c70c$ +// $hash=f50cae9c7f44f282497cff43e8b89fc76f60e51b$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc index c800ee709d3048a42e22e34ab8c5b3c45b02b39f..97c9b87a3da21f40a46619b54f8cf658367ad860 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=da5ea80e7619690e181a8d1aade3baab524994af$ +// $hash=456470ac4ea861866ebb9358f85e982ef1c73ef9$ // #include "libcef_dll/ctocpp/views/menu_button_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.h b/libcef_dll/ctocpp/views/menu_button_ctocpp.h index cd1de823071c5f79553dd2393be29dfe5216d7e3..77293750d9b621b247e949db47a71c34bf6b864a 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.h +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4a9ae17508040a9f987bb8a939f99ace0df00c6f$ +// $hash=0323c84d6099ab582a71a40f8065013cecc126cd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc index 0508f365e758fb3cebe67c722dbea9ee2b567e88..ce023f0cd3f5f6bd4613507a18e50aeb130f4bc8 100644 --- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f65b17eb26f40ebf503684544969eed98dcabd9b$ +// $hash=a27cc5bc8d6400e77100d275ba2609bbf3ef9e0f$ // #include "libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h index fe3c94ca3bc1feadc4b897a5559b97b171dae15b..f89062917e7a2e1cf9bcfd8f45024b95fed10cd0 100644 --- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a95e80394596beec91e6f8915fed15fdd52bea96$ +// $hash=962c2d2bc800670d19838fa2a34ab4faa8203531$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc b/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc index 618fcc0096cf937059e6bb85c69849d61b5c4ef9..94aa17d0882ecc0793809ad4e65003e5503b6ec6 100644 --- a/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc +++ b/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=722bf985114de475681723f00b7f5be597702670$ +// $hash=75e19487438e6afe67c650ff5bf616a709c7273b$ // #include "libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h b/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h index 1e5f9d10f81e53fe325a0053a003863652f41b5d..3a2ce082be0a5193271ba538b23588c3ae0d1c81 100644 --- a/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h +++ b/libcef_dll/ctocpp/views/menu_button_pressed_lock_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b36a4ce0cb0c1b69ee6ae73f2d63a6af96e64c12$ +// $hash=8c0bc19bcd5b9f53b0ee556fb0117e9a6115eb7f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_PRESSED_LOCK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc b/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc index d4ef1bd776e989b3cb30992060f143029096cdaf..2ca86d7573108f6fe40ee187ffaa2a544f0d037e 100644 --- a/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc +++ b/libcef_dll/ctocpp/views/overlay_controller_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=227fb7d50e74e240e92a2702af12bbfff4ab4542$ +// $hash=c4c46d19e0b5234bca4f1051d0113af666dc2c09$ // #include "libcef_dll/ctocpp/views/overlay_controller_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/overlay_controller_ctocpp.h b/libcef_dll/ctocpp/views/overlay_controller_ctocpp.h index 79a3a79c009632100644d9da05613c365dec754a..e8c47e0c085ab8927c8c6b9bbb539a2310bb171e 100644 --- a/libcef_dll/ctocpp/views/overlay_controller_ctocpp.h +++ b/libcef_dll/ctocpp/views/overlay_controller_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=549058de203b68621c0cd23d2001827bfd932d9c$ +// $hash=a8dd9d8eb796f499231143866c2d8f45e9b25d0c$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_OVERLAY_CONTROLLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/panel_ctocpp.cc b/libcef_dll/ctocpp/views/panel_ctocpp.cc index 4cb9f89fc071f169d21a9178ec1423551aca6319..cf0f2ac649fb70bb57184efa04cc5488825be709 100644 --- a/libcef_dll/ctocpp/views/panel_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=c821f6ba0426bc3c508b8edfc56369a80d39bce7$ +// $hash=c757b375edf4dd35fb31c4ae81048aa795b2518b$ // #include "libcef_dll/ctocpp/views/panel_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/panel_ctocpp.h b/libcef_dll/ctocpp/views/panel_ctocpp.h index e31c3ded28246cf23f9d16fd6e44e3ef6d77cce1..ee6410be3d7cf98abdf27b53cd7d6256da4622e2 100644 --- a/libcef_dll/ctocpp/views/panel_ctocpp.h +++ b/libcef_dll/ctocpp/views/panel_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=a870337ef265d9234c4113580db3518f271345dd$ +// $hash=c0c4823d1084bd1ea4f2065e93b51a56718bed87$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc index 9a9ba3d6ff374f014283685565e9d1e00cc1042b..b021b299678a568677f0fea38d81287949dada12 100644 --- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=eeb999ed9ff1b98afba6cc6d0c4c7917c4d28230$ +// $hash=046029bba50f8d46cf3c5192d891aee370f21565$ // #include "libcef_dll/ctocpp/views/panel_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h index af4b136b04be597dbdfbca7203f06da80da0194c..62fd16d8a1c085e6efb73f14808ea2245b36da68 100644 --- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=26cc71f954f212dae798b7c0ffb99f9ec7b8caac$ +// $hash=dcad633b9f91da4e5b08cfa8be122b6797211b46$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc b/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc index 6100c26fe6176e8c3969fc5b495a1282ced89d3c..300823eb2596a35c4618c0ad666b0cce03c8ec7c 100644 --- a/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/scroll_view_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b01419d1bf9c7742defc9102ff524d95e524bcc1$ +// $hash=b41b92f818aca51a1f14e5d3d57fa42d13f8590a$ // #include "libcef_dll/ctocpp/views/scroll_view_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/scroll_view_ctocpp.h b/libcef_dll/ctocpp/views/scroll_view_ctocpp.h index 50264263ed083212bc1017441058c2e6f6eadce8..5ceb93da79d1d48d3202f655d8824f922d4da9fb 100644 --- a/libcef_dll/ctocpp/views/scroll_view_ctocpp.h +++ b/libcef_dll/ctocpp/views/scroll_view_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=43a676c3ad82948c81c726d976f915984c116e6f$ +// $hash=3a3c2eee1765f8a1d86044eadc75eca9c6fae25f$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_SCROLL_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/textfield_ctocpp.cc b/libcef_dll/ctocpp/views/textfield_ctocpp.cc index 70eb06f56388cf84ba49eb6bdae2c0a34fc8f9cd..2048008e49ba95e3a832567ea3d19455f28754d3 100644 --- a/libcef_dll/ctocpp/views/textfield_ctocpp.cc +++ b/libcef_dll/ctocpp/views/textfield_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1d904dc9bf2d32baf0841fb55b4ba2d905d0bf83$ +// $hash=96c0f67c377e496e3824d6dc13969a728c4d5cb6$ // #include "libcef_dll/ctocpp/views/textfield_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/textfield_ctocpp.h b/libcef_dll/ctocpp/views/textfield_ctocpp.h index e8b31335fd5344ce863f532ab5d7fadbfc5ef8d7..3325a22a06efeecd9a96654c0c297b8c242d827c 100644 --- a/libcef_dll/ctocpp/views/textfield_ctocpp.h +++ b/libcef_dll/ctocpp/views/textfield_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=047586c07d3c46008ca902cad02a958a2393b1ab$ +// $hash=cdc3237fbd889409f8e9aa2116689a3e1c1229c7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc index f85ab50e76133da01c65196f5a10c69f1f4b0adc..1f42b61765bef951631034cd1d8bb44633edd73c 100644 --- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=974d55311d65e2bea484c9c8721e138018f4ab10$ +// $hash=0554c435e85fb7efb50f22cc7c3e184af48f0ea0$ // #include "libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h index 6ef92d150db98a1d7ed83ac7a98d1c55ff531091..76d15eee7b299687ba41a65259261a0f5c9fe73b 100644 --- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=343716f91bef33f5c84bd269d5755b142010f8be$ +// $hash=65dedd950d154a0125b094bb1488e787726545cb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/view_ctocpp.cc b/libcef_dll/ctocpp/views/view_ctocpp.cc index cb7648b778ffa060a69d20c948049c28105de41c..71850b5daaace0bac89b893ac437ad7e753db360 100644 --- a/libcef_dll/ctocpp/views/view_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=014970f5cef04197c23c05b1c6c73cdf1ed85bce$ +// $hash=425f9800e0f8228d483e55a00f65c3c894df6360$ // #include "libcef_dll/ctocpp/views/view_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/view_ctocpp.h b/libcef_dll/ctocpp/views/view_ctocpp.h index 209597ef11d6f9edd35c46d0c753dec30f625622..65b2cc07dcb64a6987ddde5d592ea4e6c4596a6c 100644 --- a/libcef_dll/ctocpp/views/view_ctocpp.h +++ b/libcef_dll/ctocpp/views/view_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=195039e245037c5efe9c17b85cab2395d34ece27$ +// $hash=5af9a065bd30e46fad816250442dd6b3d31834fd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc index 6971b547d94046ce5a5cf037856bf617af6b5aa7..2a4a098d32d7df44b1cbfb48951a2d55be75dec8 100644 --- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=db639bf9fe95b7a04e6d126b32ba4ba797a82ef0$ +// $hash=024caf54f7f453df5c9ff4e5b62f5f69960f6a1b$ // #include "libcef_dll/ctocpp/views/view_delegate_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/view_delegate_ctocpp.h b/libcef_dll/ctocpp/views/view_delegate_ctocpp.h index 13c8647c5436069ef3e66a99fe66d948834fba9c..2a8024bf78e9f88dc157c50b526343d8c3147533 100644 --- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e6d59b73a62b960955749e557d300f656a95297c$ +// $hash=c433d8e9462e7a948338bfe9192f247fdc253614$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/window_ctocpp.cc b/libcef_dll/ctocpp/views/window_ctocpp.cc index 086283c9a942530b89fe43dc98367470839ff4b4..b29889914584fe13f6efb2b0dfeab4707d76e6fc 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=4acb8ea29bcb2702f86cda3d5b68dea10a0f666f$ +// $hash=30ee552d6bcf02136ce44a3bb5d0d0be7eb112c0$ // #include "libcef_dll/ctocpp/views/window_ctocpp.h" diff --git a/libcef_dll/ctocpp/views/window_ctocpp.h b/libcef_dll/ctocpp/views/window_ctocpp.h index d6ac74c3672bb49ca31a2a9676ba2bd104cb4b36..58fd19e326d2e3a5c566a33ed27034888f5fa447 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.h +++ b/libcef_dll/ctocpp/views/window_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=20b24783909cb3e5b99a2245d95c30af088d461b$ +// $hash=a16d73107ffbbcdb06153c0bfcc5e4ac43bbadb0$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc index 5c354f41541b9a5bacde13198ae6decb95f8e31f..3fe0a81aa136619126688ccd321c9b23753af409 100644 --- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc +++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=becc11fabe2bfea798eb9bfff0d8b80b70aafc9b$ +// $hash=8998830c31f54e6e1199390c42a912033dabd6ad$ // #include "libcef_dll/ctocpp/views/window_delegate_ctocpp.h" @@ -208,8 +208,8 @@ CefRect CefWindowDelegateCToCpp::GetInitialBounds(CefRefPtr window) { } NO_SANITIZE("cfi-icall") -cef_show_state_t - CefWindowDelegateCToCpp::GetInitialShowState(CefRefPtr window) { +cef_show_state_t CefWindowDelegateCToCpp::GetInitialShowState( + CefRefPtr window) { shutdown_checker::AssertNotShutdown(); cef_window_delegate_t* _struct = GetStruct(); diff --git a/libcef_dll/ctocpp/views/window_delegate_ctocpp.h b/libcef_dll/ctocpp/views/window_delegate_ctocpp.h index 54bc5f24374a737b8d41776403c8143ebf6e4e40..cbcf5530ce72409a4aaf2e58e080df02d63d85d9 100644 --- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=41dcda4aae3be14392a53a81ebe70e3be7dd5006$ +// $hash=bf87c473a5bafd3f8c30bd06c033b0182f65a7b7$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/waitable_event_ctocpp.cc b/libcef_dll/ctocpp/waitable_event_ctocpp.cc index 19c5e834573a4873d5830b12d207e26e495231ea..c0bcb71b75aa0b6f78ac039712bc3123cca7f4af 100644 --- a/libcef_dll/ctocpp/waitable_event_ctocpp.cc +++ b/libcef_dll/ctocpp/waitable_event_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=29f4656baa83a774356e06eb26570286e0662755$ +// $hash=39c5b39b7ba2c9b80a75e0c0882145842ee7200d$ // #include "libcef_dll/ctocpp/waitable_event_ctocpp.h" diff --git a/libcef_dll/ctocpp/waitable_event_ctocpp.h b/libcef_dll/ctocpp/waitable_event_ctocpp.h index 6c479e92ab8bb68c39e044324c0c6c1991d51cb3..7cd6e03c78c0b64832b382606799d3cc7f7cb672 100644 --- a/libcef_dll/ctocpp/waitable_event_ctocpp.h +++ b/libcef_dll/ctocpp/waitable_event_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=fae8a463897749540505d1588474d0897fd4e6a0$ +// $hash=ea92b8c5871694e9c32c29a5d554774afe7aa3dd$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_WAITABLE_EVENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_extension_api_handler_ctocpp.cc b/libcef_dll/ctocpp/web_extension_api_handler_ctocpp.cc new file mode 100644 index 0000000000000000000000000000000000000000..fbc6fd6c72ec39c1e3a6851f39dd7ee9a4b3cf15 --- /dev/null +++ b/libcef_dll/ctocpp/web_extension_api_handler_ctocpp.cc @@ -0,0 +1,68 @@ +// Copyright (c) 2024 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. +// +// $hash=91fdc975e832c28f9bfcf22029756295f510daca$ +// + +#include "libcef_dll/ctocpp/web_extension_api_handler_ctocpp.h" +#include "libcef_dll/shutdown_checker.h" + +// VIRTUAL METHODS - Body may be edited by hand. + +NO_SANITIZE("cfi-icall") +void CefWebExtensionApiHandlerCToCpp::OnUpdateTabUrl(int tab_id, + const CefString& url) { + shutdown_checker::AssertNotShutdown(); + + cef_web_extension_api_handler_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_tab_update_url)) { + return; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: url; type: string_byref_const + DCHECK(!url.empty()); + if (url.empty()) { + return; + } + + // Execute + _struct->on_tab_update_url(_struct, tab_id, url.GetStruct()); +} + +// CONSTRUCTOR - Do not edit by hand. + +CefWebExtensionApiHandlerCToCpp::CefWebExtensionApiHandlerCToCpp() {} + +// DESTRUCTOR - Do not edit by hand. + +CefWebExtensionApiHandlerCToCpp::~CefWebExtensionApiHandlerCToCpp() { + shutdown_checker::AssertNotShutdown(); +} + +template <> +cef_web_extension_api_handler_t* CefCToCppRefCounted< + CefWebExtensionApiHandlerCToCpp, + CefWebExtensionApiHandler, + cef_web_extension_api_handler_t>::UnwrapDerived(CefWrapperType type, + CefWebExtensionApiHandler* + c) { + DCHECK(false) << "Unexpected class type: " << type; + return nullptr; +} + +template <> +CefWrapperType + CefCToCppRefCounted::kWrapperType = + WT_WEB_EXTENSION_API_HANDLER; diff --git a/libcef_dll/ctocpp/web_extension_api_handler_ctocpp.h b/libcef_dll/ctocpp/web_extension_api_handler_ctocpp.h new file mode 100644 index 0000000000000000000000000000000000000000..650bcc5c0c677fb69e72fd21be7e9357f0eb5a93 --- /dev/null +++ b/libcef_dll/ctocpp/web_extension_api_handler_ctocpp.h @@ -0,0 +1,41 @@ +// Copyright (c) 2024 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. +// +// $hash=b473fc8de9e002dc2d07dfb7e299fbc7d8549a67$ +// + +#ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_EXTENSION_API_HANDLER_CTOCPP_H_ +#define CEF_LIBCEF_DLL_CTOCPP_WEB_EXTENSION_API_HANDLER_CTOCPP_H_ +#pragma once + +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif + +#include "include/capi/cef_web_extension_api_handler_capi.h" +#include "include/cef_web_extension_api_handler.h" +#include "libcef_dll/ctocpp/ctocpp_ref_counted.h" + +// Wrap a C structure with a C++ class. +// This class may be instantiated and accessed DLL-side only. +class CefWebExtensionApiHandlerCToCpp + : public CefCToCppRefCounted { + public: + CefWebExtensionApiHandlerCToCpp(); + virtual ~CefWebExtensionApiHandlerCToCpp(); + + // CefWebExtensionApiHandler methods. + void OnUpdateTabUrl(int tab_id, const CefString& url) override; +}; + +#endif // CEF_LIBCEF_DLL_CTOCPP_WEB_EXTENSION_API_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_message_receiver_ctocpp.cc b/libcef_dll/ctocpp/web_message_receiver_ctocpp.cc index 04b3df3ca0db2d1b3897419afa6c5f0a970d1b85..4020f831d3cf474f86bc5a59a24f7ee81a536127 100644 --- a/libcef_dll/ctocpp/web_message_receiver_ctocpp.cc +++ b/libcef_dll/ctocpp/web_message_receiver_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7b86f31130ffff682546303df29d3fd46ded8b9d$ +// $hash=b7374d8ff6c27458586d4ab064947b2bbb353ed7$ // #include "libcef_dll/ctocpp/web_message_receiver_ctocpp.h" @@ -39,6 +39,32 @@ void CefWebMessageReceiverCToCpp::OnMessage(CefRefPtr message) { _struct->on_message(_struct, CefValueCppToC::Wrap(message)); } +NO_SANITIZE("cfi-icall") +bool CefWebMessageReceiverCToCpp::OnMessageWithBoolResult( + CefRefPtr message) { + shutdown_checker::AssertNotShutdown(); + + cef_web_message_receiver_t* _struct = GetStruct(); + if (CEF_MEMBER_MISSING(_struct, on_message_with_bool_result)) { + return false; + } + + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + + // Verify param: message; type: refptr_diff + DCHECK(message.get()); + if (!message.get()) { + return false; + } + + // Execute + int _retval = _struct->on_message_with_bool_result( + _struct, CefValueCppToC::Wrap(message)); + + // Return type: bool + return _retval ? true : false; +} + // CONSTRUCTOR - Do not edit by hand. CefWebMessageReceiverCToCpp::CefWebMessageReceiverCToCpp() {} diff --git a/libcef_dll/ctocpp/web_message_receiver_ctocpp.h b/libcef_dll/ctocpp/web_message_receiver_ctocpp.h index 715f8d2a16632e69d9e320452ea7278db8becc67..88d40c6fb61de9a96f7f77299e8881d57fe2435f 100644 --- a/libcef_dll/ctocpp/web_message_receiver_ctocpp.h +++ b/libcef_dll/ctocpp/web_message_receiver_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=3b5e9726c583668eb1ab69c7a7337c7f8993b002$ +// $hash=32d8a2d5e6e5880fdbdda1cd513ad77021a58803$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_MESSAGE_RECEIVER_CTOCPP_H_ @@ -38,6 +38,7 @@ class CefWebMessageReceiverCToCpp // CefWebMessageReceiver methods. void OnMessage(CefRefPtr message) override; + bool OnMessageWithBoolResult(CefRefPtr message) override; }; #endif // CEF_LIBCEF_DLL_CTOCPP_WEB_MESSAGE_RECEIVER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_storage_ctocpp.cc b/libcef_dll/ctocpp/web_storage_ctocpp.cc index 18f7ba37f9b0d0fbb464c7728e13da72aab06ad1..dc4ac3539f813ec94fa991476ef9a40f26c86e0a 100644 --- a/libcef_dll/ctocpp/web_storage_ctocpp.cc +++ b/libcef_dll/ctocpp/web_storage_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d6796203c24a7d2eaeda7a7cd8a2a5b465e47935$ +// $hash=4fee9cda8c46061cdba99dd8f66380547eead6e3$ // #include "libcef_dll/ctocpp/web_storage_ctocpp.h" diff --git a/libcef_dll/ctocpp/web_storage_ctocpp.h b/libcef_dll/ctocpp/web_storage_ctocpp.h index cbe5f593ff28d22b1d094dd5be4442a1486d4ccc..6989c483cbf1497df9fe3138f231aefc28f46c3b 100644 --- a/libcef_dll/ctocpp/web_storage_ctocpp.h +++ b/libcef_dll/ctocpp/web_storage_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=931d7a90673e372acd126ace68cd76930d08a3de$ +// $hash=b07faf163ac2c26e83e78ba10e175f4e2e7c5edb$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_WEB_STORAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.cc b/libcef_dll/ctocpp/write_handler_ctocpp.cc index 85773de8aa257af1177c8a380bd4532c45d3cfa4..6d12719904b8f235c79d169b966ec68fdf96d026 100644 --- a/libcef_dll/ctocpp/write_handler_ctocpp.cc +++ b/libcef_dll/ctocpp/write_handler_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f670d26a807ff6ad907d8813b763cbdbe5cfdf1a$ +// $hash=5bd2fb1e0278480edade1fa59ea7321ca39cfa19$ // #include "libcef_dll/ctocpp/write_handler_ctocpp.h" diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.h b/libcef_dll/ctocpp/write_handler_ctocpp.h index 98e31b611b709d44690a004d380fb75cf9283158..8d95983159c0f69887671dcdb7794b34ae35830e 100644 --- a/libcef_dll/ctocpp/write_handler_ctocpp.h +++ b/libcef_dll/ctocpp/write_handler_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5f4ec82fbc7f1391acf34411922d1d68e0f61459$ +// $hash=56728a12a3e14ab71d1dee991a7912d5d3c111f6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_WRITE_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc b/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc index 3a0d0c577fafba813c092c67deec8676b7042940..783abcb452c39a7d48e9f156ae79eef7a85b70b3 100644 --- a/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc +++ b/libcef_dll/ctocpp/x509cert_principal_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=5f176d0ac250d76ec5412cff12b3f5e21ff67e10$ +// $hash=c577948bc4903eac504888829a610d149757fcc4$ // #include "libcef_dll/ctocpp/x509cert_principal_ctocpp.h" diff --git a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h index 34b75c71a821eb779f0ba807ef2b67acc68f2c0d..ff05ec5fdddf0b48ac20d2c98c5dc657992a1917 100644 --- a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h +++ b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d26912fadfe668828a284ea73bb9c3d0c0649f6b$ +// $hash=26c06425ee3d75470177631cff1348e5dc26f946$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/x509certificate_ctocpp.cc b/libcef_dll/ctocpp/x509certificate_ctocpp.cc index bdb3a76fd124e6f1afc0eb45da52d73158274c02..8855002529d3ff6fca95f81cb620cbece2da1da1 100644 --- a/libcef_dll/ctocpp/x509certificate_ctocpp.cc +++ b/libcef_dll/ctocpp/x509certificate_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=1adf394fe616eeb7d67a1da63bbd4a4345dce0b9$ +// $hash=e3ddef0c76d5f5a33d463751cb799235cad58bf4$ // #include "libcef_dll/ctocpp/x509certificate_ctocpp.h" diff --git a/libcef_dll/ctocpp/x509certificate_ctocpp.h b/libcef_dll/ctocpp/x509certificate_ctocpp.h index 212bf516af19fee68477e105bd9e2ad40cb5a2fa..721b49990342a7ebf0d00b693e07524431cf4fbf 100644 --- a/libcef_dll/ctocpp/x509certificate_ctocpp.h +++ b/libcef_dll/ctocpp/x509certificate_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=f73edac3b485b09fc14c44731690551a1a4e6a7d$ +// $hash=39cb5dd7488f7035a1b52e50b48e3bffee27dba6$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_X509CERTIFICATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.cc b/libcef_dll/ctocpp/xml_reader_ctocpp.cc index 180542d1615979bb85d4fb0e66c10d179bb826d7..7366d79c04650c8ba87dc96c3c3a3ebabaf33e39 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7c86a6d2ae8a2a37b360efdfcf96c1556315bf10$ +// $hash=f53f587d16aeb5a66ed0cd8f5ef90a6b00833443$ // #include "libcef_dll/ctocpp/xml_reader_ctocpp.h" diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.h b/libcef_dll/ctocpp/xml_reader_ctocpp.h index c6f7f77fdc093e67955867543dd0f0b7cc81ab3b..281018604842f924ca3030df8c226454860be2f8 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.h +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=7822b8ddbe622884aad6b782e4b59550d91c0649$ +// $hash=5f87c82093a6a16e03df00673d2ff20a9f0490d5$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.cc b/libcef_dll/ctocpp/zip_reader_ctocpp.cc index 9e484df64e400644f39337e718e0d75e41a5b335..ae9590557d523d7e5d130b175a446f0363a5f7fe 100644 --- a/libcef_dll/ctocpp/zip_reader_ctocpp.cc +++ b/libcef_dll/ctocpp/zip_reader_ctocpp.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=ea18e998c7fd3b04b1f5daf5d065fe69ffaeb798$ +// $hash=1c8a7adb48ee3403ecae28f61f8f175fc819c2c3$ // #include "libcef_dll/ctocpp/zip_reader_ctocpp.h" diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.h b/libcef_dll/ctocpp/zip_reader_ctocpp.h index ba877c2c8c3c49117afdf5c3cd540472020753f5..3c1e77446964aebf04a26d39bc0e5dddb7bebb0f 100644 --- a/libcef_dll/ctocpp/zip_reader_ctocpp.h +++ b/libcef_dll/ctocpp/zip_reader_ctocpp.h @@ -1,4 +1,4 @@ -// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights +// Copyright (c) 2023 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. // @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=845e52ef85ce29039a71ad7afbcf1c68bda1d35f$ +// $hash=607dfcaa8f19f7510fc4f87fc31a8754369fdc3a$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_ZIP_READER_CTOCPP_H_ diff --git a/libcef_dll/wrapper_types.h b/libcef_dll/wrapper_types.h index 7c8f51c53ba5c496cd25c154150c06a6e4a1ddb4..f4fc059fc2aa9e9f93c3050aa6ef9ca26017fe5f 100644 --- a/libcef_dll/wrapper_types.h +++ b/libcef_dll/wrapper_types.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=07332c4b5860fe074e76179d4ed8c094d66abc86$ +// $hash=3d5dccd3b2c88a430cc79b9105a6969a01e82b86$ // #ifndef CEF_LIBCEF_DLL_WRAPPER_TYPES_H_ @@ -40,6 +40,7 @@ enum CefWrapperType { WT_CALLBACK, WT_CLIENT, WT_COMMAND_HANDLER, + WT_FIRST_MEANINGFUL_PAINT_DETAILS, WT_COMMAND_LINE, WT_COMPLETION_CALLBACK, WT_CONTEXT_MENU_HANDLER, @@ -70,7 +71,6 @@ enum CefWrapperType { WT_FILE_DIALOG_CALLBACK, WT_FILL_LAYOUT, WT_FIND_HANDLER, - WT_FIRST_MEANINGFUL_PAINT_DETAILS, WT_FOCUS_HANDLER, WT_FORM_HANDLER, WT_FRAME, @@ -203,6 +203,7 @@ enum CefWrapperType { WT_VIEW, WT_VIEW_DELEGATE, WT_WAITABLE_EVENT, + WT_WEB_EXTENSION_API_HANDLER, WT_WEB_MESSAGE_RECEIVER, WT_WEB_STORAGE, WT_WINDOW,