mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 01:26:03 +01:00
241941a44a
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.
108 lines
3.8 KiB
C++
108 lines
3.8 KiB
C++
// Copyright (c) 2014 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
#include "tests/ceftests/routing_test_handler.h"
|
|
#include "tests/shared/renderer/client_app_renderer.h"
|
|
|
|
using client::ClientAppRenderer;
|
|
|
|
namespace {
|
|
|
|
void SetRouterConfig(CefMessageRouterConfig& config) {
|
|
config.js_query_function = "testQuery";
|
|
config.js_cancel_function = "testQueryCancel";
|
|
}
|
|
|
|
// Handle the renderer side of the routing implementation.
|
|
class RoutingRenderDelegate : public ClientAppRenderer::Delegate {
|
|
public:
|
|
RoutingRenderDelegate() {}
|
|
|
|
void OnWebKitInitialized(CefRefPtr<ClientAppRenderer> app) override {
|
|
// Create the renderer-side router for query handling.
|
|
CefMessageRouterConfig config;
|
|
SetRouterConfig(config);
|
|
message_router_ = CefMessageRouterRendererSide::Create(config);
|
|
}
|
|
|
|
void OnContextCreated(CefRefPtr<ClientAppRenderer> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefV8Context> context) override {
|
|
message_router_->OnContextCreated(browser, frame, context);
|
|
}
|
|
|
|
void OnContextReleased(CefRefPtr<ClientAppRenderer> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefV8Context> context) override {
|
|
message_router_->OnContextReleased(browser, frame, context);
|
|
}
|
|
|
|
bool OnProcessMessageReceived(CefRefPtr<ClientAppRenderer> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefProcessId source_process,
|
|
CefRefPtr<CefProcessMessage> message) override {
|
|
return message_router_->OnProcessMessageReceived(browser, frame,
|
|
source_process, message);
|
|
}
|
|
|
|
private:
|
|
CefRefPtr<CefMessageRouterRendererSide> message_router_;
|
|
|
|
IMPLEMENT_REFCOUNTING(RoutingRenderDelegate);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
RoutingTestHandler::RoutingTestHandler() {}
|
|
|
|
void RoutingTestHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser) {
|
|
if (!message_router_.get()) {
|
|
// Create the browser-side router for query handling.
|
|
CefMessageRouterConfig config;
|
|
SetRouterConfig(config);
|
|
message_router_ = CefMessageRouterBrowserSide::Create(config);
|
|
message_router_->AddHandler(this, false);
|
|
}
|
|
TestHandler::OnAfterCreated(browser);
|
|
}
|
|
|
|
void RoutingTestHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
|
|
message_router_->OnBeforeClose(browser);
|
|
TestHandler::OnBeforeClose(browser);
|
|
}
|
|
|
|
void RoutingTestHandler::OnRenderProcessTerminated(
|
|
CefRefPtr<CefBrowser> browser,
|
|
TerminationStatus status) {
|
|
message_router_->OnRenderProcessTerminated(browser);
|
|
}
|
|
|
|
bool RoutingTestHandler::OnBeforeBrowse(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefRequest> request,
|
|
bool user_gesture,
|
|
bool is_redirect) {
|
|
message_router_->OnBeforeBrowse(browser, frame);
|
|
return false;
|
|
}
|
|
|
|
bool RoutingTestHandler::OnProcessMessageReceived(
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefProcessId source_process,
|
|
CefRefPtr<CefProcessMessage> message) {
|
|
return message_router_->OnProcessMessageReceived(browser, frame,
|
|
source_process, message);
|
|
}
|
|
|
|
// Entry point for creating the test delegate.
|
|
// Called from client_app_delegates.cc.
|
|
void CreateRoutingTestHandlerDelegate(
|
|
ClientAppRenderer::DelegateSet& delegates) {
|
|
delegates.insert(new RoutingRenderDelegate);
|
|
}
|