mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-04-03 21:51:06 +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.
123 lines
3.6 KiB
C++
123 lines
3.6 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=9c1c7a83aab83ba8cdb751db09373aaa49601ded$
|
|
//
|
|
|
|
#include "libcef_dll/cpptoc/drag_handler_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/drag_data_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
|
#include "libcef_dll/shutdown_checker.h"
|
|
|
|
namespace {
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
int CEF_CALLBACK drag_handler_on_drag_enter(struct _cef_drag_handler_t* self,
|
|
cef_browser_t* browser,
|
|
cef_drag_data_t* dragData,
|
|
cef_drag_operations_mask_t mask) {
|
|
shutdown_checker::AssertNotShutdown();
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return 0;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return 0;
|
|
// Verify param: dragData; type: refptr_diff
|
|
DCHECK(dragData);
|
|
if (!dragData)
|
|
return 0;
|
|
|
|
// Execute
|
|
bool _retval = CefDragHandlerCppToC::Get(self)->OnDragEnter(
|
|
CefBrowserCToCpp::Wrap(browser), CefDragDataCToCpp::Wrap(dragData), mask);
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
void CEF_CALLBACK drag_handler_on_draggable_regions_changed(
|
|
struct _cef_drag_handler_t* self,
|
|
cef_browser_t* browser,
|
|
struct _cef_frame_t* frame,
|
|
size_t regionsCount,
|
|
cef_draggable_region_t const* regions) {
|
|
shutdown_checker::AssertNotShutdown();
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self)
|
|
return;
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser)
|
|
return;
|
|
// Verify param: frame; type: refptr_diff
|
|
DCHECK(frame);
|
|
if (!frame)
|
|
return;
|
|
// Verify param: regions; type: simple_vec_byref_const
|
|
DCHECK(regionsCount == 0 || regions);
|
|
if (regionsCount > 0 && !regions)
|
|
return;
|
|
|
|
// Translate param: regions; type: simple_vec_byref_const
|
|
std::vector<CefDraggableRegion> regionsList;
|
|
if (regionsCount > 0) {
|
|
for (size_t i = 0; i < regionsCount; ++i) {
|
|
CefDraggableRegion regionsVal = regions[i];
|
|
regionsList.push_back(regionsVal);
|
|
}
|
|
}
|
|
|
|
// Execute
|
|
CefDragHandlerCppToC::Get(self)->OnDraggableRegionsChanged(
|
|
CefBrowserCToCpp::Wrap(browser), CefFrameCToCpp::Wrap(frame),
|
|
regionsList);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefDragHandlerCppToC::CefDragHandlerCppToC() {
|
|
GetStruct()->on_drag_enter = drag_handler_on_drag_enter;
|
|
GetStruct()->on_draggable_regions_changed =
|
|
drag_handler_on_draggable_regions_changed;
|
|
}
|
|
|
|
// DESTRUCTOR - Do not edit by hand.
|
|
|
|
CefDragHandlerCppToC::~CefDragHandlerCppToC() {
|
|
shutdown_checker::AssertNotShutdown();
|
|
}
|
|
|
|
template <>
|
|
CefRefPtr<CefDragHandler>
|
|
CefCppToCRefCounted<CefDragHandlerCppToC, CefDragHandler, cef_drag_handler_t>::
|
|
UnwrapDerived(CefWrapperType type, cef_drag_handler_t* s) {
|
|
NOTREACHED() << "Unexpected class type: " << type;
|
|
return NULL;
|
|
}
|
|
|
|
template <>
|
|
CefWrapperType CefCppToCRefCounted<CefDragHandlerCppToC,
|
|
CefDragHandler,
|
|
cef_drag_handler_t>::kWrapperType =
|
|
WT_DRAG_HANDLER;
|