From af5a86615a380b8157b7c1dfcbe59ee46b3a00c8 Mon Sep 17 00:00:00 2001 From: w00477664 Date: Mon, 22 Jan 2024 17:30:35 +0800 Subject: [PATCH] scheme handler ndk api. Signed-off-by: w00477664 --- cef_paths.gypi | 4 ++-- include/capi/cef_request_capi.h | 8 ++++---- include/cef_api_hash.h | 10 +++++----- include/cef_request.h | 6 +++--- libcef/common/request_impl.cc | 6 +++--- libcef/common/request_impl.h | 6 +++--- libcef_dll/cpptoc/post_data_stream_cpptoc.cc | 12 ++++++------ libcef_dll/ctocpp/post_data_stream_ctocpp.cc | 12 ++++++------ libcef_dll/ctocpp/post_data_stream_ctocpp.h | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cef_paths.gypi b/cef_paths.gypi index 97686815b..3f1b915d9 100644 --- a/cef_paths.gypi +++ b/cef_paths.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2023 The Chromium Embedded Framework Authors. All rights +# Copyright (c) 2024 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. # @@ -8,7 +8,7 @@ # by hand. See the translator.README.txt file in the tools directory for # more information. # -# $hash=50255f84d17ebf23c105dbb8ca8b30554d3070d2$ +# $hash=f6075503eefc38bce1c4fc07ff78fa3459d3d82c$ # { diff --git a/include/capi/cef_request_capi.h b/include/capi/cef_request_capi.h index 3937d8028..306c00df2 100644 --- a/include/capi/cef_request_capi.h +++ b/include/capi/cef_request_capi.h @@ -33,7 +33,7 @@ // by hand. See the translator.README.txt file in the tools directory for // more information. // -// $hash=510f3652b5f05c65bbf70dfafdee08cbb76c9844$ +// $hash=20e190801d63bb2e0216be76f9893f02ae0a10e5$ // #ifndef CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_ @@ -308,18 +308,18 @@ typedef struct _cef_post_data_stream_t { void(CEF_CALLBACK* read)( struct _cef_post_data_stream_t* self, void* buffer, - int64_t buf_len, + int buf_len, struct _cef_post_data_stream_read_callback_t* read_callback); /// /// Get the size of stream. /// - int64(CEF_CALLBACK* get_size)(struct _cef_post_data_stream_t* self); + uint64(CEF_CALLBACK* get_size)(struct _cef_post_data_stream_t* self); /// /// Get the position of stream. /// - int64(CEF_CALLBACK* get_position)(struct _cef_post_data_stream_t* self); + uint64(CEF_CALLBACK* get_position)(struct _cef_post_data_stream_t* self); /// /// Get if the stream is trunked. diff --git a/include/cef_api_hash.h b/include/cef_api_hash.h index 0cfcbd55d..f1514edbd 100644 --- a/include/cef_api_hash.h +++ b/include/cef_api_hash.h @@ -42,15 +42,15 @@ // 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 "466ec0f1e8dee96c12fee524b41db22317058a21" +#define CEF_API_HASH_UNIVERSAL "509ab565586e0872bdd30eff1386da6b62e4034c" #if defined(OS_WIN) -#define CEF_API_HASH_PLATFORM "818ca94e175ea4dd59df48a140418e4933ef566f" +#define CEF_API_HASH_PLATFORM "d7d69497f034bdc074d44244884ddbba0e8a0fd9" #elif defined(OS_MAC) -#define CEF_API_HASH_PLATFORM "9d213f1e2acf7886e3b063cf2cdc0570b2f8bca3" +#define CEF_API_HASH_PLATFORM "2f6a575a732694945c924d018ecde5dd074f1400" #elif defined(OS_LINUX) -#define CEF_API_HASH_PLATFORM "0c785af581690c701821d8f7c5f30e5817caada1" +#define CEF_API_HASH_PLATFORM "44328e6bd5c73ee9b90a63b3a135c66d5bfa2366" #elif defined(OS_OHOS) -#define CEF_API_HASH_PLATFORM "0c785af581690c701821d8f7c5f30e5817caada1" +#define CEF_API_HASH_PLATFORM "44328e6bd5c73ee9b90a63b3a135c66d5bfa2366" #endif #ifdef __cplusplus diff --git a/include/cef_request.h b/include/cef_request.h index 6c53d5525..dfd1b349d 100644 --- a/include/cef_request.h +++ b/include/cef_request.h @@ -313,20 +313,20 @@ class CefPostDataStream : public virtual CefBaseRefCounted { /*--cef()--*/ virtual void Read( void* buffer, - int64_t buf_len, + int buf_len, CefRefPtr read_callback) = 0; /// /// Get the size of stream. /// /*--cef()--*/ - virtual int64 GetSize() = 0; + virtual uint64 GetSize() = 0; /// /// Get the position of stream. /// /*--cef()--*/ - virtual int64 GetPosition() = 0; + virtual uint64 GetPosition() = 0; /// /// Get if the stream is trunked. diff --git a/libcef/common/request_impl.cc b/libcef/common/request_impl.cc index e29e0c5b4..7c2d98a86 100644 --- a/libcef/common/request_impl.cc +++ b/libcef/common/request_impl.cc @@ -1099,7 +1099,7 @@ void CefPostDataStreamImpl::Init(CefRefPtr init_c void CefPostDataStreamImpl::Read( void* buffer, - int64_t buf_len, + int buf_len, CefRefPtr read_callback) { scoped_refptr upload_buffer = base::MakeRefCounted( @@ -1127,7 +1127,7 @@ void CefPostDataStreamImpl::OnStreamRead( } } -int64_t CefPostDataStreamImpl::GetSize() { +uint64_t CefPostDataStreamImpl::GetSize() { if (upload_stream_) { return upload_stream_->size(); } else { @@ -1136,7 +1136,7 @@ int64_t CefPostDataStreamImpl::GetSize() { } } -int64_t CefPostDataStreamImpl::GetPosition() { +uint64_t CefPostDataStreamImpl::GetPosition() { if (upload_stream_) { return upload_stream_->position(); } else { diff --git a/libcef/common/request_impl.h b/libcef/common/request_impl.h index 597b761ed..3a87753a8 100644 --- a/libcef/common/request_impl.h +++ b/libcef/common/request_impl.h @@ -215,10 +215,10 @@ class CefPostDataStreamImpl : public CefPostDataStream { void Init(CefRefPtr init_callback) override; void Read(void* buffer, - int64_t buf_len, + int buf_len, CefRefPtr read_callback) override; - int64_t GetSize() override; - int64_t GetPosition() override; + uint64_t GetSize() override; + uint64_t GetPosition() override; bool IsChunked() override; bool HasNullSource() override; bool IsEOF() override; diff --git a/libcef_dll/cpptoc/post_data_stream_cpptoc.cc b/libcef_dll/cpptoc/post_data_stream_cpptoc.cc index 475fb8838..524a733dc 100644 --- a/libcef_dll/cpptoc/post_data_stream_cpptoc.cc +++ b/libcef_dll/cpptoc/post_data_stream_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=09f26d25bde9a3c33324e64fcd3cbae00c88aed5$ +// $hash=7c23c4d51ba9ecdcd3ea0c3985d32a89064a7a42$ // #include "libcef_dll/cpptoc/post_data_stream_cpptoc.h" @@ -75,7 +75,7 @@ post_data_stream_init(struct _cef_post_data_stream_t* self, void CEF_CALLBACK post_data_stream_read(struct _cef_post_data_stream_t* self, void* buffer, - int64_t buf_len, + int buf_len, cef_post_data_stream_read_callback_t* read_callback) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -100,7 +100,7 @@ post_data_stream_read(struct _cef_post_data_stream_t* self, CefPostDataStreamReadCallbackCppToC::Unwrap(read_callback)); } -int64 CEF_CALLBACK +uint64 CEF_CALLBACK post_data_stream_get_size(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -110,13 +110,13 @@ post_data_stream_get_size(struct _cef_post_data_stream_t* self) { } // Execute - int64 _retval = CefPostDataStreamCppToC::Get(self)->GetSize(); + uint64 _retval = CefPostDataStreamCppToC::Get(self)->GetSize(); // Return type: simple return _retval; } -int64 CEF_CALLBACK +uint64 CEF_CALLBACK post_data_stream_get_position(struct _cef_post_data_stream_t* self) { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING @@ -126,7 +126,7 @@ post_data_stream_get_position(struct _cef_post_data_stream_t* self) { } // Execute - int64 _retval = CefPostDataStreamCppToC::Get(self)->GetPosition(); + uint64 _retval = CefPostDataStreamCppToC::Get(self)->GetPosition(); // Return type: simple return _retval; diff --git a/libcef_dll/ctocpp/post_data_stream_ctocpp.cc b/libcef_dll/ctocpp/post_data_stream_ctocpp.cc index a58a9d143..86947af81 100644 --- a/libcef_dll/ctocpp/post_data_stream_ctocpp.cc +++ b/libcef_dll/ctocpp/post_data_stream_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8014fc65ba9af4a88ab8067815e2ab64ab34439a$ +// $hash=75fe081311911376307c1406d3c85749270082d6$ // #include "libcef_dll/ctocpp/post_data_stream_ctocpp.h" @@ -76,7 +76,7 @@ void CefPostDataStreamCToCpp::Init( NO_SANITIZE("cfi-icall") void CefPostDataStreamCToCpp::Read( void* buffer, - int64_t buf_len, + int buf_len, CefRefPtr read_callback) { cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, read)) { @@ -101,7 +101,7 @@ void CefPostDataStreamCToCpp::Read( CefPostDataStreamReadCallbackCToCpp::Unwrap(read_callback)); } -NO_SANITIZE("cfi-icall") int64 CefPostDataStreamCToCpp::GetSize() { +NO_SANITIZE("cfi-icall") uint64 CefPostDataStreamCToCpp::GetSize() { cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_size)) { return 0; @@ -110,13 +110,13 @@ NO_SANITIZE("cfi-icall") int64 CefPostDataStreamCToCpp::GetSize() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int64 _retval = _struct->get_size(_struct); + uint64 _retval = _struct->get_size(_struct); // Return type: simple return _retval; } -NO_SANITIZE("cfi-icall") int64 CefPostDataStreamCToCpp::GetPosition() { +NO_SANITIZE("cfi-icall") uint64 CefPostDataStreamCToCpp::GetPosition() { cef_post_data_stream_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, get_position)) { return 0; @@ -125,7 +125,7 @@ NO_SANITIZE("cfi-icall") int64 CefPostDataStreamCToCpp::GetPosition() { // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute - int64 _retval = _struct->get_position(_struct); + uint64 _retval = _struct->get_position(_struct); // Return type: simple return _retval; diff --git a/libcef_dll/ctocpp/post_data_stream_ctocpp.h b/libcef_dll/ctocpp/post_data_stream_ctocpp.h index a7b157f4e..8a943810b 100644 --- a/libcef_dll/ctocpp/post_data_stream_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_stream_ctocpp.h @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=8685967b8036ea44a4d657ef6d09cb2921483c73$ +// $hash=f56fbff9a852f4a83251803f4719d5f57d042978$ // #ifndef CEF_LIBCEF_DLL_CTOCPP_POST_DATA_STREAM_CTOCPP_H_ @@ -39,10 +39,10 @@ class CefPostDataStreamCToCpp CefRefPtr read_callback) override; void Init(CefRefPtr init_callback) override; void Read(void* buffer, - int64_t buf_len, + int buf_len, CefRefPtr read_callback) override; - int64 GetSize() override; - int64 GetPosition() override; + uint64 GetSize() override; + uint64 GetPosition() override; bool IsChunked() override; bool HasNullSource() override; bool IsEOF() override; -- Gitee