mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Initial changes to allow use of CefLoadHandler in the render process (issue #1077).
- Move OnLoadingStateChange from CefDisplayHandler to CefLoadHandler. - Move OnRenderProcessTerminated and OnPluginCrashed from CefLoadHandler to CefRequestHandler. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1441 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -17,6 +17,26 @@
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
|
||||
void CefLoadHandlerCToCpp::OnLoadingStateChange(CefRefPtr<CefBrowser> browser,
|
||||
bool isLoading, bool canGoBack, bool canGoForward) {
|
||||
if (CEF_MEMBER_MISSING(struct_, on_loading_state_change))
|
||||
return;
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
// Verify param: browser; type: refptr_diff
|
||||
DCHECK(browser.get());
|
||||
if (!browser.get())
|
||||
return;
|
||||
|
||||
// Execute
|
||||
struct_->on_loading_state_change(struct_,
|
||||
CefBrowserCppToC::Wrap(browser),
|
||||
isLoading,
|
||||
canGoBack,
|
||||
canGoForward);
|
||||
}
|
||||
|
||||
void CefLoadHandlerCToCpp::OnLoadStart(CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefFrame> frame) {
|
||||
if (CEF_MEMBER_MISSING(struct_, on_load_start))
|
||||
@@ -93,46 +113,6 @@ void CefLoadHandlerCToCpp::OnLoadError(CefRefPtr<CefBrowser> browser,
|
||||
failedUrl.GetStruct());
|
||||
}
|
||||
|
||||
void CefLoadHandlerCToCpp::OnRenderProcessTerminated(
|
||||
CefRefPtr<CefBrowser> browser, TerminationStatus status) {
|
||||
if (CEF_MEMBER_MISSING(struct_, on_render_process_terminated))
|
||||
return;
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
// Verify param: browser; type: refptr_diff
|
||||
DCHECK(browser.get());
|
||||
if (!browser.get())
|
||||
return;
|
||||
|
||||
// Execute
|
||||
struct_->on_render_process_terminated(struct_,
|
||||
CefBrowserCppToC::Wrap(browser),
|
||||
status);
|
||||
}
|
||||
|
||||
void CefLoadHandlerCToCpp::OnPluginCrashed(CefRefPtr<CefBrowser> browser,
|
||||
const CefString& plugin_path) {
|
||||
if (CEF_MEMBER_MISSING(struct_, on_plugin_crashed))
|
||||
return;
|
||||
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
|
||||
// Verify param: browser; type: refptr_diff
|
||||
DCHECK(browser.get());
|
||||
if (!browser.get())
|
||||
return;
|
||||
// Verify param: plugin_path; type: string_byref_const
|
||||
DCHECK(!plugin_path.empty());
|
||||
if (plugin_path.empty())
|
||||
return;
|
||||
|
||||
// Execute
|
||||
struct_->on_plugin_crashed(struct_,
|
||||
CefBrowserCppToC::Wrap(browser),
|
||||
plugin_path.GetStruct());
|
||||
}
|
||||
|
||||
|
||||
#ifndef NDEBUG
|
||||
template<> long CefCToCpp<CefLoadHandlerCToCpp, CefLoadHandler,
|
||||
|
Reference in New Issue
Block a user