mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Move message routing from CefBrowser to CefFrame (see issue #2498).
This change moves the SendProcessMessage method from CefBrowser to CefFrame and adds CefBrowser parameters to OnProcessMessageReceived and OnDraggableRegionsChanged. The internal implementation has changed as follows: - Frame IDs are now a 64-bit combination of the 32-bit render_process_id and render_routing_id values that uniquely identify a RenderFrameHost (RFH). - CefFrameHostImpl objects are now managed by CefBrowserInfo with life span tied to RFH expectations. Specifically, a CefFrameHostImpl object representing a sub-frame will be created when a RenderFrame is created in the renderer process and detached when the associated RenderFrame is deleted or the renderer process in which it runs has died. - The CefFrameHostImpl object representing the main frame will always be valid but the underlying RFH (and associated frame ID) may change over time as a result of cross-origin navigations. Despite these changes calling LoadURL on the main frame object in the browser process will always navigate as expected. - Speculative RFHs, which may be created as a result of a cross-origin navigation and discarded if that navigation is not committed, are now handled correctly (e.g. ignored in most cases until they're committed). - It is less likely, but still possible, to receive a CefFrame object with an invalid frame ID (ID < 0). This can happen in cases where a RFH has not yet been created for a sub-frame. For example, when OnBeforeBrowse is called before initiating navigation in a previously nonexisting sub-frame. To test: All tests pass with NetworkService enabled and disabled.
This commit is contained in:
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=7b918e87169c8fee39d93a9093ac700eceb6a061$
|
||||
// $hash=1abf9303cc2c0f6d86b9e84b4edddcb294330294$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/render_process_handler_cpptoc.h"
|
||||
@ -239,6 +239,7 @@ void CEF_CALLBACK render_process_handler_on_focused_node_changed(
|
||||
int CEF_CALLBACK render_process_handler_on_process_message_received(
|
||||
struct _cef_render_process_handler_t* self,
|
||||
cef_browser_t* browser,
|
||||
cef_frame_t* frame,
|
||||
cef_process_id_t source_process,
|
||||
cef_process_message_t* message) {
|
||||
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
||||
@ -250,6 +251,10 @@ int CEF_CALLBACK render_process_handler_on_process_message_received(
|
||||
DCHECK(browser);
|
||||
if (!browser)
|
||||
return 0;
|
||||
// Verify param: frame; type: refptr_diff
|
||||
DCHECK(frame);
|
||||
if (!frame)
|
||||
return 0;
|
||||
// Verify param: message; type: refptr_diff
|
||||
DCHECK(message);
|
||||
if (!message)
|
||||
@ -258,8 +263,8 @@ int CEF_CALLBACK render_process_handler_on_process_message_received(
|
||||
// Execute
|
||||
bool _retval =
|
||||
CefRenderProcessHandlerCppToC::Get(self)->OnProcessMessageReceived(
|
||||
CefBrowserCToCpp::Wrap(browser), source_process,
|
||||
CefProcessMessageCToCpp::Wrap(message));
|
||||
CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
|
||||
source_process, CefProcessMessageCToCpp::Wrap(message));
|
||||
|
||||
// Return type: bool
|
||||
return _retval;
|
||||
|
Reference in New Issue
Block a user