mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Add CefResolveURL function (fixes issue #3402)
This commit is contained in:
committed by
Marshall Greenblatt
parent
5433d9fe5c
commit
e0c878df5f
@@ -33,7 +33,7 @@
|
||||
// by hand. See the translator.README.txt file in the tools directory for
|
||||
// more information.
|
||||
//
|
||||
// $hash=a6cb0abd77320cfd9ddfa3f16ca0a6ff3987521a$
|
||||
// $hash=f6dfdfa5b8c77931d8e083a66f5a9445a2fdbf45$
|
||||
//
|
||||
|
||||
#ifndef CEF_INCLUDE_CAPI_CEF_PARSER_CAPI_H_
|
||||
@@ -46,6 +46,14 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
///
|
||||
/// Combines specified |base_url| and |relative_url| into |resolved_url|.
|
||||
/// Returns false (0) if one of the URLs is NULL or invalid.
|
||||
///
|
||||
CEF_EXPORT int cef_resolve_url(const cef_string_t* base_url,
|
||||
const cef_string_t* relative_url,
|
||||
cef_string_t* resolved_url);
|
||||
|
||||
///
|
||||
/// Parse the specified |url| into its component parts. Returns false (0) if the
|
||||
/// URL is NULL or invalid.
|
||||
|
@@ -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 "44197292401010f8fce5b053733edd8642d01095"
|
||||
#define CEF_API_HASH_UNIVERSAL "c06406b23dc4a845177dcd306541ce527d061364"
|
||||
#if defined(OS_WIN)
|
||||
#define CEF_API_HASH_PLATFORM "95bf7fa1356070be95b7a6fee958355c6619fb63"
|
||||
#define CEF_API_HASH_PLATFORM "edd206c50f636a935872c9cc251ccb9448b9050e"
|
||||
#elif defined(OS_MAC)
|
||||
#define CEF_API_HASH_PLATFORM "8ec5426d7aa0418fca147380e97623a49cd8eaf4"
|
||||
#define CEF_API_HASH_PLATFORM "a74e6429302d2d947cc614688e83cd3b29e74c17"
|
||||
#elif defined(OS_LINUX)
|
||||
#define CEF_API_HASH_PLATFORM "b2cbc2e6a3048d2415566d35ba434967fd796491"
|
||||
#define CEF_API_HASH_PLATFORM "e119b68ec7e406ca74ddea5e244af7150eef7118"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@@ -43,6 +43,15 @@
|
||||
#include "include/cef_base.h"
|
||||
#include "include/cef_values.h"
|
||||
|
||||
///
|
||||
/// Combines specified |base_url| and |relative_url| into |resolved_url|.
|
||||
/// Returns false if one of the URLs is empty or invalid.
|
||||
///
|
||||
/*--cef()--*/
|
||||
bool CefResolveURL(const CefString& base_url,
|
||||
const CefString& relative_url,
|
||||
CefString& resolved_url);
|
||||
|
||||
///
|
||||
/// Parse the specified |url| into its component parts.
|
||||
/// Returns false if the URL is empty or invalid.
|
||||
|
Reference in New Issue
Block a user