bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-02 12:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add CefDragData::GetFilePaths to return file paths (fixes #3568)

Browse Source 
GetFileNames now returns just the display names with a fallback to
path.BaseName() if the display name is empty.
This commit is contained in:
Cristian Amarie 2023-09-22 14:04:16 +03:00 committed by Marshall Greenblatt
parent 4ae030fec1
commit bdec92caf8
8 changed files with 105 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/capi/cef_drag_data_capi.h
View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for
// more information.
//
// $hash=a1ce746f0dd97d21973d4c80d8ef46391c0fd463$
// $hash=8d00465ba004758f464cdb8b1fbd02cd26323ace$
//
#ifndef CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
@ -149,6 +149,13 @@ typedef struct _cef_drag_data_t {
int(CEF_CALLBACK* get_file_names)(struct _cef_drag_data_t* self,
cef_string_list_t names);
///
/// Retrieve the list of file paths that are being dragged into the browser
/// window.
///
int(CEF_CALLBACK* get_file_paths)(struct _cef_drag_data_t* self,
cef_string_list_t paths);
///
/// Set the link URL that is being dragged.
///

8
include/cef_api_hash.h
View File

@ -42,13 +42,13 @@
// way that may cause binary incompatibility with other builds. The universal
// hash value will change if any platform is affected whereas the platform hash
// values will change only if that particular platform is affected.
#define CEF_API_HASH_UNIVERSAL "c684c3da478cb88b042bf13c88ab7797e33c29bc"
#define CEF_API_HASH_UNIVERSAL "fb95812349ecedc56374e2d195b4af712f6f9ab3"
#if defined(OS_WIN)
#define CEF_API_HASH_PLATFORM "bcc26a8181330fd0dc07e9d2475c048919d4f55f"
#define CEF_API_HASH_PLATFORM "4b12d27bf02871c32719580c1be18d686e20bc84"
#elif defined(OS_MAC)
#define CEF_API_HASH_PLATFORM "2abec7e306f2c474c8a66b585b9c6a0bdcd45276"
#define CEF_API_HASH_PLATFORM "e6b30ef107ccb6ba9af40bd6498ad4cef247a171"
#elif defined(OS_LINUX)
#define CEF_API_HASH_PLATFORM "b93f84208be4af554a5b60315a63251263a71e57"
#define CEF_API_HASH_PLATFORM "a4ec73cc821ea2d1681c7f8271f0a7d3e3cea33a"
#endif
#ifdef __cplusplus

7
include/cef_drag_data.h
View File

@ -145,6 +145,13 @@ class CefDragData : public virtual CefBaseRefCounted {
/*--cef()--*/
virtual bool GetFileNames(std::vector<CefString>& names) = 0;
///
/// Retrieve the list of file paths that are being dragged into the browser
/// window.
///
/*--cef()--*/
virtual bool GetFilePaths(std::vector<CefString>& paths) = 0;
///
/// Set the link URL that is being dragged.
///

17
libcef/common/drag_data_impl.cc
View File

@ -126,7 +126,7 @@ bool CefDragDataImpl::GetFileNames(std::vector<CefString>& names) {
for (; it != data_.filenames.end(); ++it) {
auto name = it->display_name.value();
if (name.empty()) {
name = it->path.value();
name = it->path.BaseName().value();
}
names.push_back(name);
}
@ -134,6 +134,21 @@ bool CefDragDataImpl::GetFileNames(std::vector<CefString>& names) {
return true;
}
bool CefDragDataImpl::GetFilePaths(std::vector<CefString>& paths) {
base::AutoLock lock_scope(lock_);
if (data_.filenames.empty()) {
return false;
}
std::vector<ui::FileInfo>::const_iterator it = data_.filenames.begin();
for (; it != data_.filenames.end(); ++it) {
auto path = it->path.value();
paths.push_back(path);
}
return true;
}
void CefDragDataImpl::SetLinkURL(const CefString& url) {
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();

1
libcef/common/drag_data_impl.h
View File

@ -37,6 +37,7 @@ class CefDragDataImpl : public CefDragData {
CefString GetFileName() override;
size_t GetFileContents(CefRefPtr<CefStreamWriter> writer) override;
bool GetFileNames(std::vector<CefString>& names) override;
bool GetFilePaths(std::vector<CefString>& paths) override;
void SetLinkURL(const CefString& url) override;
void SetLinkTitle(const CefString& title) override;
void SetLinkMetadata(const CefString& data) override;

35
libcef_dll/cpptoc/drag_data_cpptoc.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=dc5d0e68bdc9b8ec86dbc9b4fa0ddce6e4597006$
// $hash=14322f994bd6eb8732cef20a3a70fc8ebbf32dea$
//
#include "libcef_dll/cpptoc/drag_data_cpptoc.h"
@ -300,6 +300,38 @@ int CEF_CALLBACK drag_data_get_file_names(struct _cef_drag_data_t* self,
return _retval;
}
int CEF_CALLBACK
drag_data_get_file_paths(struct _cef_drag_data_t* self,
cef_string_list_t paths) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Verify param: paths; type: string_vec_byref
DCHECK(paths);
if (!paths) {
return 0;
}
// Translate param: paths; type: string_vec_byref
std::vector<CefString> pathsList;
transfer_string_list_contents(paths, pathsList);
// Execute
bool _retval = CefDragDataCppToC::Get(self)->GetFilePaths(pathsList);
// Restore param: paths; type: string_vec_byref
cef_string_list_clear(paths);
transfer_string_list_contents(pathsList, paths);
// Return type: bool
return _retval;
}
void CEF_CALLBACK drag_data_set_link_url(struct _cef_drag_data_t* self,
const cef_string_t* url) {
shutdown_checker::AssertNotShutdown();
@ -520,6 +552,7 @@ CefDragDataCppToC::CefDragDataCppToC() {
GetStruct()->get_file_name = drag_data_get_file_name;
GetStruct()->get_file_contents = drag_data_get_file_contents;
GetStruct()->get_file_names = drag_data_get_file_names;
GetStruct()->get_file_paths = drag_data_get_file_paths;
GetStruct()->set_link_url = drag_data_set_link_url;
GetStruct()->set_link_title = drag_data_set_link_title;
GetStruct()->set_link_metadata = drag_data_set_link_metadata;

34
libcef_dll/ctocpp/drag_data_ctocpp.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=62aa3d486f9f864b4a5a68ebdf4ebb0695c017d1$
// $hash=1dadac1c1138021a5f38e52ccb8f9863f5a387b5$
//
#include "libcef_dll/ctocpp/drag_data_ctocpp.h"
@ -305,6 +305,38 @@ bool CefDragDataCToCpp::GetFileNames(std::vector<CefString>& names) {
return _retval ? true : false;
}
NO_SANITIZE("cfi-icall")
bool CefDragDataCToCpp::GetFilePaths(std::vector<CefString>& paths) {
shutdown_checker::AssertNotShutdown();
cef_drag_data_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, get_file_paths)) {
return false;
}
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Translate param: paths; type: string_vec_byref
cef_string_list_t pathsList = cef_string_list_alloc();
DCHECK(pathsList);
if (pathsList) {
transfer_string_list_contents(paths, pathsList);
}
// Execute
int _retval = _struct->get_file_paths(_struct, pathsList);
// Restore param:paths; type: string_vec_byref
if (pathsList) {
paths.clear();
transfer_string_list_contents(pathsList, paths);
cef_string_list_free(pathsList);
}
// Return type: bool
return _retval ? true : false;
}
NO_SANITIZE("cfi-icall")
void CefDragDataCToCpp::SetLinkURL(const CefString& url) {
shutdown_checker::AssertNotShutdown();

3
libcef_dll/ctocpp/drag_data_ctocpp.h
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=7a8ec7b7c1010725596b1a64eb325b0e75ea34b7$
// $hash=fee8d107d6baed8cb7d838613ab4b95134e04c59$
//
#ifndef CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_
@ -49,6 +49,7 @@ class CefDragDataCToCpp : public CefCToCppRefCounted<CefDragDataCToCpp,
CefString GetFileName() override;
size_t GetFileContents(CefRefPtr<CefStreamWriter> writer) override;
bool GetFileNames(std::vector<CefString>& names) override;
bool GetFilePaths(std::vector<CefString>& paths) override;
void SetLinkURL(const CefString& url) override;
void SetLinkTitle(const CefString& title) override;
void SetLinkMetadata(const CefString& data) override;