mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-27 10:03:31 +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.
103 lines
3.9 KiB
C++
103 lines
3.9 KiB
C++
// Copyright (c) 2012 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/cefclient/renderer/client_renderer.h"
|
|
|
|
#include <sstream>
|
|
#include <string>
|
|
|
|
#include "include/cef_crash_util.h"
|
|
#include "include/cef_dom.h"
|
|
#include "include/wrapper/cef_helpers.h"
|
|
#include "include/wrapper/cef_message_router.h"
|
|
|
|
namespace client {
|
|
namespace renderer {
|
|
|
|
namespace {
|
|
|
|
// Must match the value in client_handler.cc.
|
|
const char kFocusedNodeChangedMessage[] = "ClientRenderer.FocusedNodeChanged";
|
|
|
|
class ClientRenderDelegate : public ClientAppRenderer::Delegate {
|
|
public:
|
|
ClientRenderDelegate() : last_node_is_editable_(false) {}
|
|
|
|
void OnRenderThreadCreated(CefRefPtr<ClientAppRenderer> app,
|
|
CefRefPtr<CefListValue> extra_info) OVERRIDE {
|
|
if (CefCrashReportingEnabled()) {
|
|
// Set some crash keys for testing purposes. Keys must be defined in the
|
|
// "crash_reporter.cfg" file. See cef_crash_util.h for details.
|
|
CefSetCrashKeyValue("testkey_small1", "value1_small_renderer");
|
|
CefSetCrashKeyValue("testkey_small2", "value2_small_renderer");
|
|
CefSetCrashKeyValue("testkey_medium1", "value1_medium_renderer");
|
|
CefSetCrashKeyValue("testkey_medium2", "value2_medium_renderer");
|
|
CefSetCrashKeyValue("testkey_large1", "value1_large_renderer");
|
|
CefSetCrashKeyValue("testkey_large2", "value2_large_renderer");
|
|
}
|
|
}
|
|
|
|
void OnWebKitInitialized(CefRefPtr<ClientAppRenderer> app) OVERRIDE {
|
|
// Create the renderer-side router for query handling.
|
|
CefMessageRouterConfig 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);
|
|
}
|
|
|
|
void OnFocusedNodeChanged(CefRefPtr<ClientAppRenderer> app,
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefDOMNode> node) OVERRIDE {
|
|
bool is_editable = (node.get() && node->IsEditable());
|
|
if (is_editable != last_node_is_editable_) {
|
|
// Notify the browser of the change in focused element type.
|
|
last_node_is_editable_ = is_editable;
|
|
CefRefPtr<CefProcessMessage> message =
|
|
CefProcessMessage::Create(kFocusedNodeChangedMessage);
|
|
message->GetArgumentList()->SetBool(0, is_editable);
|
|
frame->SendProcessMessage(PID_BROWSER, message);
|
|
}
|
|
}
|
|
|
|
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:
|
|
bool last_node_is_editable_;
|
|
|
|
// Handles the renderer side of query routing.
|
|
CefRefPtr<CefMessageRouterRendererSide> message_router_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(ClientRenderDelegate);
|
|
IMPLEMENT_REFCOUNTING(ClientRenderDelegate);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
void CreateDelegates(ClientAppRenderer::DelegateSet& delegates) {
|
|
delegates.insert(new ClientRenderDelegate);
|
|
}
|
|
|
|
} // namespace renderer
|
|
} // namespace client
|