mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-15 10:58:33 +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.
90 lines
3.1 KiB
C++
90 lines
3.1 KiB
C++
// Copyright 2015 The Chromium Embedded Framework Authors.
|
|
// Portions copyright 2014 The Chromium 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 "libcef/browser/extensions/mime_handler_view_guest_delegate.h"
|
|
|
|
#include "libcef/browser/browser_context.h"
|
|
#include "libcef/browser/browser_host_impl.h"
|
|
#include "libcef/browser/browser_info.h"
|
|
#include "libcef/browser/content_browser_client.h"
|
|
#include "libcef/browser/osr/web_contents_view_osr.h"
|
|
|
|
#include "content/browser/browser_plugin/browser_plugin_guest.h"
|
|
#include "content/browser/web_contents/web_contents_impl.h"
|
|
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
|
|
|
|
namespace extensions {
|
|
|
|
namespace {
|
|
|
|
CefRefPtr<CefBrowserHostImpl> GetOwnerBrowser(
|
|
extensions::MimeHandlerViewGuest* guest) {
|
|
content::WebContents* owner_web_contents = guest->owner_web_contents();
|
|
CefRefPtr<CefBrowserHostImpl> owner_browser =
|
|
CefBrowserHostImpl::GetBrowserForContents(owner_web_contents);
|
|
DCHECK(owner_browser);
|
|
return owner_browser;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
CefMimeHandlerViewGuestDelegate::CefMimeHandlerViewGuestDelegate(
|
|
MimeHandlerViewGuest* guest)
|
|
: guest_(guest) {}
|
|
|
|
CefMimeHandlerViewGuestDelegate::~CefMimeHandlerViewGuestDelegate() {}
|
|
|
|
void CefMimeHandlerViewGuestDelegate::OverrideWebContentsCreateParams(
|
|
content::WebContents::CreateParams* params) {
|
|
DCHECK(params->guest_delegate);
|
|
|
|
CefRefPtr<CefBrowserHostImpl> owner_browser = GetOwnerBrowser(guest_);
|
|
if (owner_browser->IsWindowless()) {
|
|
CefWebContentsViewOSR* view_osr = new CefWebContentsViewOSR(
|
|
owner_browser->GetBackgroundColor(), false, false);
|
|
params->view = view_osr;
|
|
params->delegate_view = view_osr;
|
|
}
|
|
}
|
|
|
|
void CefMimeHandlerViewGuestDelegate::OnGuestAttached(
|
|
content::WebContentsView* parent_view) {
|
|
content::WebContents* web_contents = guest_->web_contents();
|
|
DCHECK(web_contents);
|
|
|
|
// Associate guest state information with the owner browser.
|
|
GetOwnerBrowser(guest_)->browser_info()->MaybeCreateFrame(
|
|
web_contents->GetMainFrame(), true /* is_guest_view */);
|
|
}
|
|
|
|
void CefMimeHandlerViewGuestDelegate::OnGuestDetached(
|
|
content::WebContentsView* parent_view) {
|
|
content::WebContents* web_contents = guest_->web_contents();
|
|
DCHECK(web_contents);
|
|
|
|
// Disassociate guest state information with the owner browser.
|
|
GetOwnerBrowser(guest_)->browser_info()->RemoveFrame(
|
|
web_contents->GetMainFrame());
|
|
}
|
|
|
|
bool CefMimeHandlerViewGuestDelegate::HandleContextMenu(
|
|
content::WebContents* web_contents,
|
|
const content::ContextMenuParams& params) {
|
|
content::ContextMenuParams new_params = params;
|
|
|
|
gfx::Point guest_coordinates =
|
|
static_cast<content::WebContentsImpl*>(web_contents)
|
|
->GetBrowserPluginGuest()
|
|
->GetScreenCoordinates(gfx::Point());
|
|
|
|
// Adjust (x,y) position for offset from guest to embedder.
|
|
new_params.x += guest_coordinates.x();
|
|
new_params.y += guest_coordinates.y();
|
|
|
|
return GetOwnerBrowser(guest_)->HandleContextMenu(web_contents, new_params);
|
|
}
|
|
|
|
} // namespace extensions
|