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=366d6e567451af19ce5a4cc5f6f06791f504af26$
|
||||
// $hash=3983c8f521d444195dc52b4605840b51289e77e0$
|
||||
//
|
||||
|
||||
#include "libcef_dll/ctocpp/render_process_handler_ctocpp.h"
|
||||
@@ -241,6 +241,7 @@ void CefRenderProcessHandlerCToCpp::OnFocusedNodeChanged(
|
||||
NO_SANITIZE("cfi-icall")
|
||||
bool CefRenderProcessHandlerCToCpp::OnProcessMessageReceived(
|
||||
CefRefPtr<CefBrowser> browser,
|
||||
CefRefPtr<CefFrame> frame,
|
||||
CefProcessId source_process,
|
||||
CefRefPtr<CefProcessMessage> message) {
|
||||
cef_render_process_handler_t* _struct = GetStruct();
|
||||
@@ -253,6 +254,10 @@ bool CefRenderProcessHandlerCToCpp::OnProcessMessageReceived(
|
||||
DCHECK(browser.get());
|
||||
if (!browser.get())
|
||||
return false;
|
||||
// Verify param: frame; type: refptr_diff
|
||||
DCHECK(frame.get());
|
||||
if (!frame.get())
|
||||
return false;
|
||||
// Verify param: message; type: refptr_diff
|
||||
DCHECK(message.get());
|
||||
if (!message.get())
|
||||
@@ -260,8 +265,8 @@ bool CefRenderProcessHandlerCToCpp::OnProcessMessageReceived(
|
||||
|
||||
// Execute
|
||||
int _retval = _struct->on_process_message_received(
|
||||
_struct, CefBrowserCppToC::Wrap(browser), source_process,
|
||||
CefProcessMessageCppToC::Wrap(message));
|
||||
_struct, CefBrowserCppToC::Wrap(browser), CefFrameCppToC::Wrap(frame),
|
||||
source_process, CefProcessMessageCppToC::Wrap(message));
|
||||
|
||||
// Return type: bool
|
||||
return _retval ? true : false;
|
||||
|
Reference in New Issue
Block a user