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:
@@ -17,7 +17,7 @@
|
||||
#include "ui/base/window_open_disposition.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
// Parameters that tell CefBrowserHostImpl::Navigate() what to do.
|
||||
// Parameters that tell CefFrameHostImpl::Navigate() what to do.
|
||||
struct CefNavigateParams {
|
||||
CefNavigateParams(const GURL& a_url, ui::PageTransition a_transition);
|
||||
~CefNavigateParams();
|
||||
@@ -32,9 +32,6 @@ struct CefNavigateParams {
|
||||
GURL url;
|
||||
content::Referrer referrer;
|
||||
|
||||
// The frame that the request should be loaded in or -1 to use the main frame.
|
||||
int64_t frame_id;
|
||||
|
||||
// Usually the URL of the document in the top-level window, which may be
|
||||
// checked by the third-party cookie blocking policy. Leaving it empty may
|
||||
// lead to undesired cookie blocking. Third-party cookie blocking can be
|
||||
@@ -46,7 +43,7 @@ struct CefNavigateParams {
|
||||
std::string headers;
|
||||
|
||||
// net::URLRequest load flags (0 by default).
|
||||
int load_flags;
|
||||
int load_flags = 0;
|
||||
|
||||
// Upload data (may be NULL).
|
||||
scoped_refptr<net::UploadData> upload_data;
|
||||
@@ -56,20 +53,20 @@ struct CefNavigateParams {
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// The disposition requested by the navigation source. Default is CURRENT_TAB.
|
||||
WindowOpenDisposition disposition;
|
||||
WindowOpenDisposition disposition = WindowOpenDisposition::CURRENT_TAB;
|
||||
|
||||
// The transition type of the navigation.
|
||||
ui::PageTransition transition;
|
||||
|
||||
// Whether this navigation was initiated by the renderer process.
|
||||
bool is_renderer_initiated;
|
||||
bool is_renderer_initiated = false;
|
||||
|
||||
// If non-empty, the new tab contents encoding is overriden by this value.
|
||||
std::string override_encoding;
|
||||
|
||||
// If false then the navigation was not initiated by a user gesture. Default
|
||||
// is true.
|
||||
bool user_gesture;
|
||||
bool user_gesture = true;
|
||||
|
||||
// Refers to a navigation that was parked in the browser in order to be
|
||||
// transferred to another RVH. Only used in case of a redirection of a request
|
||||
|
Reference in New Issue
Block a user