mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02: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.
120 lines
3.7 KiB
C++
120 lines
3.7 KiB
C++
// Copyright (c) 2019 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.
|
|
//
|
|
// ---------------------------------------------------------------------------
|
|
//
|
|
// This file was generated by the CEF translator tool. If making changes by
|
|
// hand only do so within the body of existing method and function
|
|
// implementations. See the translator.README.txt file in the tools directory
|
|
// for more information.
|
|
//
|
|
// $hash=ed9ec27e4e93df6821437ee0d49da3ebd122bed3$
|
|
//
|
|
|
|
#include "libcef_dll/ctocpp/drag_handler_ctocpp.h"
|
|
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/drag_data_cpptoc.h"
|
|
#include "libcef_dll/cpptoc/frame_cpptoc.h"
|
|
#include "libcef_dll/shutdown_checker.h"
|
|
|
|
// VIRTUAL METHODS - Body may be edited by hand.
|
|
|
|
NO_SANITIZE("cfi-icall")
|
|
bool CefDragHandlerCToCpp::OnDragEnter(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefDragData> dragData,
|
|
DragOperationsMask mask) {
|
|
shutdown_checker::AssertNotShutdown();
|
|
|
|
cef_drag_handler_t* _struct = GetStruct();
|
|
if (CEF_MEMBER_MISSING(_struct, on_drag_enter))
|
|
return false;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return false;
|
|
// Verify param: dragData; type: refptr_diff
|
|
DCHECK(dragData.get());
|
|
if (!dragData.get())
|
|
return false;
|
|
|
|
// Execute
|
|
int _retval = _struct->on_drag_enter(_struct, CefBrowserCppToC::Wrap(browser),
|
|
CefDragDataCppToC::Wrap(dragData), mask);
|
|
|
|
// Return type: bool
|
|
return _retval ? true : false;
|
|
}
|
|
|
|
NO_SANITIZE("cfi-icall")
|
|
void CefDragHandlerCToCpp::OnDraggableRegionsChanged(
|
|
CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
const std::vector<CefDraggableRegion>& regions) {
|
|
shutdown_checker::AssertNotShutdown();
|
|
|
|
cef_drag_handler_t* _struct = GetStruct();
|
|
if (CEF_MEMBER_MISSING(_struct, on_draggable_regions_changed))
|
|
return;
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser.get());
|
|
if (!browser.get())
|
|
return;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame.get());
|
|
if (!frame.get())
|
|
return;
|
|
|
|
// Translate param: regions; type: simple_vec_byref_const
|
|
const size_t regionsCount = regions.size();
|
|
cef_draggable_region_t* regionsList = NULL;
|
|
if (regionsCount > 0) {
|
|
regionsList = new cef_draggable_region_t[regionsCount];
|
|
DCHECK(regionsList);
|
|
if (regionsList) {
|
|
for (size_t i = 0; i < regionsCount; ++i) {
|
|
regionsList[i] = regions[i];
|
|
}
|
|
}
|
|
}
|
|
|
|
// Execute
|
|
_struct->on_draggable_regions_changed(
|
|
_struct, CefBrowserCppToC::Wrap(browser), CefFrameCppToC::Wrap(frame),
|
|
regionsCount, regionsList);
|
|
|
|
// Restore param:regions; type: simple_vec_byref_const
|
|
if (regionsList)
|
|
delete[] regionsList;
|
|
}
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefDragHandlerCToCpp::CefDragHandlerCToCpp() {}
|
|
|
|
// DESTRUCTOR - Do not edit by hand.
|
|
|
|
CefDragHandlerCToCpp::~CefDragHandlerCToCpp() {
|
|
shutdown_checker::AssertNotShutdown();
|
|
}
|
|
|
|
template <>
|
|
cef_drag_handler_t*
|
|
CefCToCppRefCounted<CefDragHandlerCToCpp, CefDragHandler, cef_drag_handler_t>::
|
|
UnwrapDerived(CefWrapperType type, CefDragHandler* c) {
|
|
NOTREACHED() << "Unexpected class type: " << type;
|
|
return NULL;
|
|
}
|
|
|
|
template <>
|
|
CefWrapperType CefCToCppRefCounted<CefDragHandlerCToCpp,
|
|
CefDragHandler,
|
|
cef_drag_handler_t>::kWrapperType =
|
|
WT_DRAG_HANDLER;
|