diff --git a/include/capi/cef_browser_capi.h b/include/capi/cef_browser_capi.h index 3b10ba60b0c983e4ccae296d44365ea8a9e2a693..c3561a36516a82af71aa7c0f181d8edcc39285d0 100644 --- a/include/capi/cef_browser_capi.h +++ b/include/capi/cef_browser_capi.h @@ -1838,8 +1838,8 @@ typedef struct _cef_browser_host_t { /// /// Notify browser host needs reload 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. diff --git a/include/cef_browser.h b/include/cef_browser.h index 22bac72a687c61b97303f344e70d8901c31c8c39..029e98bd142c2e5482da13c5d43b12d4a2b009ea 100644 --- a/include/cef_browser.h +++ b/include/cef_browser.h @@ -1867,7 +1867,7 @@ class CefBrowserHost : public virtual CefBaseRefCounted { /// Notify browser host needs reload when the render process terminated. /// /*--cef()--*/ - virtual void NotifyNeedsReload(bool needs_reload) = 0; + virtual void SetNeedsReload(bool needs_reload) = 0; /// /// Return true if needs reload page, or false if nees not reload. diff --git a/libcef/browser/alloy/alloy_browser_host_impl.cc b/libcef/browser/alloy/alloy_browser_host_impl.cc index 187d7a7c584461ccb6d29a6b76bce388d58aa502..87e8b2580da9668a7862502849ef59a27af7d4e7 100644 --- a/libcef/browser/alloy/alloy_browser_host_impl.cc +++ b/libcef/browser/alloy/alloy_browser_host_impl.cc @@ -2647,11 +2647,11 @@ AlloyBrowserHostImpl::CreateCustomMediaPlayer( #endif // OHOS_CUSTOM_VIDEO_PLAYER #ifdef OHOS_RENDER_PROCESS_MODE -void AlloyBrowserHostImpl::NotifyNeedsReload(bool needs_reload) { +void AlloyBrowserHostImpl::SetNeedsReload(bool needs_reload) { if (is_hidden_ && needs_reload) { web_contents()->GetController().SetNeedsReload(); } - LOG(INFO) << "NotifyNeedsReload set needs reload: " << needs_reload; + LOG(INFO) << "Set needs reload: " << needs_reload; needs_reload_ = needs_reload; } diff --git a/libcef/browser/alloy/alloy_browser_host_impl.h b/libcef/browser/alloy/alloy_browser_host_impl.h index 548d1eb7256d5b4d22aef4c4f493054f5f3153a7..5492f5c956cf1067eadf366f89e7e7e9bac82b8c 100644 --- a/libcef/browser/alloy/alloy_browser_host_impl.h +++ b/libcef/browser/alloy/alloy_browser_host_impl.h @@ -245,7 +245,7 @@ class AlloyBrowserHostImpl : public CefBrowserHostBase, #endif #ifdef OHOS_RENDER_PROCESS_MODE -void NotifyNeedsReload(bool needs_reload) override; +void SetNeedsReload(bool needs_reload) override; bool NeedsReload() override; #endif diff --git a/libcef/browser/browser_contents_delegate.cc b/libcef/browser/browser_contents_delegate.cc index cf64200e6f38d3f513e9c1a7835b7c5bfba69caa..404dc6eca660e5c29f333215c2c7f2331850d6d0 100644 --- a/libcef/browser/browser_contents_delegate.cc +++ b/libcef/browser/browser_contents_delegate.cc @@ -674,7 +674,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) { diff --git a/libcef/browser/browser_host_base.cc b/libcef/browser/browser_host_base.cc index 6f7a3c58b8ab020e128db1f58e13b1a72ca8cc1e..5551ff97ffcecf129b83b8d4bc3eb57651819b87 100644 --- a/libcef/browser/browser_host_base.cc +++ b/libcef/browser/browser_host_base.cc @@ -3583,12 +3583,9 @@ void CefBrowserHostBase::OnDidGenerateCodeCache(CefRefPtr } #ifdef OHOS_RENDER_PROCESS_MODE -void CefBrowserHostBase::NotifyNeedsReload(bool needs_reload) { - // TODO(ohos): please impl the function and remove this comment. -} +void CefBrowserHostBase::SetNeedsReload(bool needs_reload) {} bool CefBrowserHostBase::NeedsReload() { - // TODO(ohos): please impl the function and remove this comment. return false; } #endif \ No newline at end of file diff --git a/libcef/browser/browser_host_base.h b/libcef/browser/browser_host_base.h index e88b675db137b0ce014707e0859b9416e19e2d6e..1b69bf8f8dfb850b49d6b2bf5feefb1e25d87676 100644 --- a/libcef/browser/browser_host_base.h +++ b/libcef/browser/browser_host_base.h @@ -328,7 +328,7 @@ class CefBrowserHostBase : public CefBrowserHost, #endif #ifdef OHOS_RENDER_PROCESS_MODE -void NotifyNeedsReload(bool needs_reload) override; +void SetNeedsReload(bool needs_reload) override; bool NeedsReload() override; #endif diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.cc b/libcef_dll/cpptoc/browser_host_cpptoc.cc index e79301003f4736aaa75d4576893eac5bd0a5525b..78c87a94fec4cfa420ce0c5dbfb3b4f0542b264a 100644 --- a/libcef_dll/cpptoc/browser_host_cpptoc.cc +++ b/libcef_dll/cpptoc/browser_host_cpptoc.cc @@ -3242,8 +3242,8 @@ 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_needs_reload(struct _cef_browser_host_t* self, + int needs_reload) { shutdown_checker::AssertNotShutdown(); // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -3254,8 +3254,8 @@ browser_host_notify_needs_reload(struct _cef_browser_host_t* self, } // Execute - CefBrowserHostCppToC::Get(self)->NotifyNeedsReload(needs_reload ? true - : false); + CefBrowserHostCppToC::Get(self)->SetNeedsReload(needs_reload ? true + : false); } int CEF_CALLBACK browser_host_needs_reload(struct _cef_browser_host_t* self) { @@ -3458,7 +3458,7 @@ CefBrowserHostCppToC::CefBrowserHostCppToC() { 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_needs_reload = browser_host_set_needs_reload; GetStruct()->needs_reload = browser_host_needs_reload; } diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.cc b/libcef_dll/ctocpp/browser_host_ctocpp.cc index 9dd407dd7ecf582aa06bfe4e3a06c9bdc94f26ce..096ff8e97da6712dce69a8e8c18f89d344cbbfb0 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.cc +++ b/libcef_dll/ctocpp/browser_host_ctocpp.cc @@ -2966,18 +2966,18 @@ CefRefPtr CefBrowserHostCToCpp::GetDownloadItem( } NO_SANITIZE("cfi-icall") -void CefBrowserHostCToCpp::NotifyNeedsReload(bool needs_reload) { +void CefBrowserHostCToCpp::SetNeedsReload(bool needs_reload) { shutdown_checker::AssertNotShutdown(); cef_browser_host_t* _struct = GetStruct(); - if (CEF_MEMBER_MISSING(_struct, notify_needs_reload)) { + if (CEF_MEMBER_MISSING(_struct, set_needs_reload)) { return; } // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - _struct->notify_needs_reload(_struct, needs_reload); + _struct->set_needs_reload(_struct, needs_reload); } NO_SANITIZE("cfi-icall") bool CefBrowserHostCToCpp::NeedsReload() { diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.h b/libcef_dll/ctocpp/browser_host_ctocpp.h index d92d2f4946327bea005b26d54531a89f9e05af8e..8d7ac847c1fe6b238103148e8c76927e0c1bf209 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.h +++ b/libcef_dll/ctocpp/browser_host_ctocpp.h @@ -268,7 +268,7 @@ class CefBrowserHostCToCpp : public CefCToCppRefCounted callback) override; CefRefPtr GetDownloadItem(uint32 item_id) override; - void NotifyNeedsReload(bool needs_reload) override; + void SetNeedsReload(bool needs_reload) override; bool NeedsReload() override; };