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

Update to Chromium version 91.0.4472.0 (#870763)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-04-20 18:52:34 -04:00
parent b189c7b472
commit ae4f68f695
193 changed files with 1381 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/common/alloy/alloy_content_client.cc
View File

@@ -106,8 +106,8 @@ void AlloyContentClient::AddAdditionalSchemes(Schemes* schemes) {
CefAppManager::Get()->AddAdditionalSchemes(schemes);
}
base::string16 AlloyContentClient::GetLocalizedString(int message_id) {
base::string16 value =
std::u16string AlloyContentClient::GetLocalizedString(int message_id) {
std::u16string value =
ui::ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
if (value.empty())
LOG(ERROR) << "No localized string available for id " << message_id;
@@ -115,10 +115,10 @@ base::string16 AlloyContentClient::GetLocalizedString(int message_id) {
return value;
}
base::string16 AlloyContentClient::GetLocalizedString(
std::u16string AlloyContentClient::GetLocalizedString(
int message_id,
const base::string16& replacement) {
base::string16 value = l10n_util::GetStringFUTF16(message_id, replacement);
const std::u16string& replacement) {
std::u16string value = l10n_util::GetStringFUTF16(message_id, replacement);
if (value.empty())
LOG(ERROR) << "No localized string available for id " << message_id;

6
libcef/common/alloy/alloy_content_client.h
View File

@@ -25,9 +25,9 @@ class AlloyContentClient : public content::ContentClient {
std::vector<content::CdmInfo>* cdms,
std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
void AddAdditionalSchemes(Schemes* schemes) override;
base::string16 GetLocalizedString(int message_id) override;
base::string16 GetLocalizedString(int message_id,
const base::string16& replacement) override;
std::u16string GetLocalizedString(int message_id) override;
std::u16string GetLocalizedString(int message_id,
const std::u16string& replacement) override;
base::StringPiece GetDataResource(int resource_id,
ui::ScaleFactor scale_factor) override;
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;

2
libcef/common/command_line_impl.cc
View File

@@ -43,7 +43,7 @@ void CefCommandLineImpl::InitFromArgv(int argc, const char* const* argv) {
void CefCommandLineImpl::InitFromString(const CefString& command_line) {
#if defined(OS_WIN)
CEF_VALUE_VERIFY_RETURN_VOID(true);
const base::string16& str16 = command_line;
const std::wstring& str16 = command_line;
mutable_value()->ParseFromString(str16);
#else
NOTREACHED() << "method not supported on this platform";

31
libcef/common/crash_reporter_client.cc
View File

@@ -13,7 +13,6 @@
#include "base/environment.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
@@ -53,7 +52,7 @@
namespace {
#if defined(OS_WIN)
typedef base::string16 PathString;
typedef std::wstring PathString;
const char kPathSep = '\\';
#else
typedef std::string PathString;
@@ -568,7 +567,7 @@ void CefCrashReporterClient::InitializeCrashReportingForProcess() {
}
bool CefCrashReporterClient::GetAlternativeCrashDumpLocation(
base::string16* crash_dir) {
std::wstring* crash_dir) {
// By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
// location to write breakpad crash dumps can be set.
*crash_dir = install_static::GetEnvironmentString(L"BREAKPAD_DUMP_LOCATION");
@@ -576,29 +575,29 @@ bool CefCrashReporterClient::GetAlternativeCrashDumpLocation(
}
void CefCrashReporterClient::GetProductNameAndVersion(
const base::string16& exe_path,
base::string16* product_name,
base::string16* version,
base::string16* special_build,
base::string16* channel_name) {
*product_name = base::ASCIIToUTF16(product_name_);
*version = base::ASCIIToUTF16(product_version_);
*special_build = base::string16();
*channel_name = base::string16();
const std::wstring& exe_path,
std::wstring* product_name,
std::wstring* version,
std::wstring* special_build,
std::wstring* channel_name) {
*product_name = base::ASCIIToWide(product_name_);
*version = base::ASCIIToWide(product_version_);
*special_build = std::wstring();
*channel_name = std::wstring();
}
bool CefCrashReporterClient::GetCrashDumpLocation(base::string16* crash_dir) {
bool CefCrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) {
// By setting the BREAKPAD_DUMP_LOCATION environment variable, an alternate
// location to write breakpad crash dumps can be set.
if (GetAlternativeCrashDumpLocation(crash_dir))
return true;
return GetDefaultCrashDumpLocation(crash_dir, base::UTF8ToUTF16(app_name_));
return GetDefaultCrashDumpLocation(crash_dir, base::UTF8ToWide(app_name_));
}
bool CefCrashReporterClient::GetCrashMetricsLocation(
base::string16* metrics_dir) {
return GetDefaultUserDataDirectory(metrics_dir, base::UTF8ToUTF16(app_name_));
std::wstring* metrics_dir) {
return GetDefaultUserDataDirectory(metrics_dir, base::UTF8ToWide(app_name_));
}
#elif defined(OS_POSIX)

16
libcef/common/crash_reporter_client.h
View File

@@ -43,14 +43,14 @@ class CefCrashReporterClient : public crash_reporter::CrashReporterClient {
// the module address space.
static void InitializeCrashReportingForProcess();
bool GetAlternativeCrashDumpLocation(base::string16* crash_dir) override;
void GetProductNameAndVersion(const base::string16& exe_path,
base::string16* product_name,
base::string16* version,
base::string16* special_build,
base::string16* channel_name) override;
bool GetCrashDumpLocation(base::string16* crash_dir) override;
bool GetCrashMetricsLocation(base::string16* metrics_dir) override;
bool GetAlternativeCrashDumpLocation(std::wstring* crash_dir) override;
void GetProductNameAndVersion(const std::wstring& exe_path,
std::wstring* product_name,
std::wstring* version,
std::wstring* special_build,
std::wstring* channel_name) override;
bool GetCrashDumpLocation(std::wstring* crash_dir) override;
bool GetCrashMetricsLocation(std::wstring* metrics_dir) override;
#elif defined(OS_POSIX)
void GetProductNameAndVersion(const char** product_name,
const char** version) override;

12
libcef/common/request_impl.cc
View File

@@ -20,6 +20,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "components/navigation_interception/navigation_params.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
@@ -76,8 +77,8 @@ class BytesElementReader : public net::UploadBytesElementReader {
};
scoped_refptr<base::SequencedTaskRunner> GetFileTaskRunner() {
return base::CreateSequencedTaskRunner(
{base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE});
return base::ThreadPool::CreateSequencedTaskRunner(
{base::MayBlock(), base::TaskPriority::USER_VISIBLE});
}
// A subclass of net::UploadFileElementReader that keeps the associated
@@ -171,7 +172,7 @@ blink::WebString FilePathStringToWebString(
#if defined(OS_POSIX)
return blink::WebString::FromUTF8(str);
#elif defined(OS_WIN)
return blink::WebString::FromUTF16(str);
return blink::WebString::FromUTF16(base::WideToUTF16(str));
#endif
}
@@ -632,9 +633,8 @@ void CefRequestImpl::Get(const CefMsg_LoadRequest_Params& params,
}
if (params.upload_data.get()) {
const base::string16& method = request.HttpMethod().Utf16();
if (method == base::ASCIIToUTF16("GET") ||
method == base::ASCIIToUTF16("HEAD")) {
const std::u16string& method = request.HttpMethod().Utf16();
if (method == u"GET" || method == u"HEAD") {
request.SetHttpMethod(blink::WebString::FromASCII("POST"));
}

2
libcef/common/resource_bundle_delegate.cc
View File

@@ -67,7 +67,7 @@ bool CefResourceBundleDelegate::GetRawDataResource(
bool CefResourceBundleDelegate::GetLocalizedString(
int message_id,
base::string16* value) const {
std::u16string* value) const {
auto application = CefAppManager::Get()->GetApplication();
if (application) {
CefRefPtr<CefResourceBundleHandler> handler =

2
libcef/common/resource_bundle_delegate.h
View File

@@ -35,7 +35,7 @@ class CefResourceBundleDelegate : public ui::ResourceBundle::Delegate {
bool GetRawDataResource(int resource_id,
ui::ScaleFactor scale_factor,
base::StringPiece* value) const override;
bool GetLocalizedString(int message_id, base::string16* value) const override;
bool GetLocalizedString(int message_id, std::u16string* value) const override;
private:
bool pack_loading_disabled_ = false;

25
libcef/common/string_types_impl.cc
View File

@@ -8,7 +8,6 @@
#include "base/i18n/case_conversion.h"
#include "base/logging.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -171,9 +170,9 @@ CEF_EXPORT int cef_string_utf16_cmp(const cef_string_utf16_t* str1,
if (str1->length == 0 && str2->length == 0)
return 0;
#if defined(WCHAR_T_IS_UTF32)
int r = std::char_traits<base::string16::value_type>::compare(
reinterpret_cast<base::string16::value_type*>(str1->str),
reinterpret_cast<base::string16::value_type*>(str2->str),
int r = std::char_traits<std::u16string::value_type>::compare(
reinterpret_cast<std::u16string::value_type*>(str1->str),
reinterpret_cast<std::u16string::value_type*>(str2->str),
std::min(str1->length, str2->length));
#else
int r = wcsncmp(str1->str, str2->str, std::min(str1->length, str2->length));
@@ -210,7 +209,7 @@ CEF_EXPORT int cef_string_utf8_to_wide(const char* src,
CEF_EXPORT int cef_string_wide_to_utf16(const wchar_t* src,
size_t src_len,
cef_string_utf16_t* output) {
base::string16 str;
std::u16string str;
bool ret = base::WideToUTF16(src, src_len, &str);
if (!cef_string_utf16_set(reinterpret_cast<const char16*>(str.c_str()),
str.length(), output, true))
@@ -223,7 +222,7 @@ CEF_EXPORT int cef_string_utf16_to_wide(const char16* src,
cef_string_wide_t* output) {
std::wstring str;
bool ret = base::UTF16ToWide(
reinterpret_cast<const base::string16::value_type*>(src), src_len, &str);
reinterpret_cast<const std::u16string::value_type*>(src), src_len, &str);
if (!cef_string_wide_set(str.c_str(), str.length(), output, true))
return false;
return ret;
@@ -232,7 +231,7 @@ CEF_EXPORT int cef_string_utf16_to_wide(const char16* src,
CEF_EXPORT int cef_string_utf8_to_utf16(const char* src,
size_t src_len,
cef_string_utf16_t* output) {
base::string16 str;
std::u16string str;
bool ret = base::UTF8ToUTF16(src, src_len, &str);
if (!cef_string_utf16_set(reinterpret_cast<const char16*>(str.c_str()),
str.length(), output, true))
@@ -245,7 +244,7 @@ CEF_EXPORT int cef_string_utf16_to_utf8(const char16* src,
cef_string_utf8_t* output) {
std::string str;
bool ret = base::UTF16ToUTF8(
reinterpret_cast<const base::string16::value_type*>(src), src_len, &str);
reinterpret_cast<const std::u16string::value_type*>(src), src_len, &str);
if (!cef_string_utf8_set(str.c_str(), str.length(), output, true))
return false;
return ret;
@@ -261,7 +260,7 @@ CEF_EXPORT int cef_string_ascii_to_wide(const char* src,
CEF_EXPORT int cef_string_ascii_to_utf16(const char* src,
size_t src_len,
cef_string_utf16_t* output) {
const base::string16& str = base::ASCIIToUTF16(std::string(src, src_len));
const std::u16string& str = base::ASCIIToUTF16(std::string(src, src_len));
return cef_string_utf16_set(reinterpret_cast<const char16*>(str.c_str()),
str.length(), output, true);
}
@@ -303,8 +302,8 @@ CEF_EXPORT void cef_string_userfree_utf16_free(
CEF_EXPORT int cef_string_utf16_to_lower(const char16* src,
size_t src_len,
cef_string_utf16_t* output) {
const base::string16& str = base::i18n::ToLower(base::string16(
reinterpret_cast<const base::string16::value_type*>(src), src_len));
const std::u16string& str = base::i18n::ToLower(std::u16string(
reinterpret_cast<const std::u16string::value_type*>(src), src_len));
return cef_string_utf16_set(reinterpret_cast<const char16*>(str.c_str()),
str.length(), output, true);
}
@@ -312,8 +311,8 @@ CEF_EXPORT int cef_string_utf16_to_lower(const char16* src,
CEF_EXPORT int cef_string_utf16_to_upper(const char16* src,
size_t src_len,
cef_string_utf16_t* output) {
const base::string16& str = base::i18n::ToUpper(base::string16(
reinterpret_cast<const base::string16::value_type*>(src), src_len));
const std::u16string& str = base::i18n::ToUpper(std::u16string(
reinterpret_cast<const std::u16string::value_type*>(src), src_len));
return cef_string_utf16_set(reinterpret_cast<const char16*>(str.c_str()),
str.length(), output, true);
}