mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 102.0.5005.0 (#992738)
Linux: 32-bit x86 builds are no longer supported (see issue #2676).
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc
|
||||
index 492d466239d1a..a1df635870ede 100644
|
||||
index 3e92f06c8b3b4..74b4bf290dd0c 100644
|
||||
--- third_party/crashpad/crashpad/client/prune_crash_reports.cc
|
||||
+++ third_party/crashpad/crashpad/client/prune_crash_reports.cc
|
||||
@@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database,
|
||||
@@ -75,13 +75,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database,
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -26,7 +26,7 @@ index 492d466239d1a..a1df635870ede 100644
|
||||
|
||||
static const time_t kSecondsInDay = 60 * 60 * 24;
|
||||
diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h
|
||||
index b80cf7a59103b..6318dd05e6eef 100644
|
||||
index f121a2b07cdbd..b2e9bedac39d3 100644
|
||||
--- third_party/crashpad/crashpad/client/prune_crash_reports.h
|
||||
+++ third_party/crashpad/crashpad/client/prune_crash_reports.h
|
||||
@@ -58,7 +58,8 @@ class PruneCondition {
|
||||
@@ -40,10 +40,10 @@ index b80cf7a59103b..6318dd05e6eef 100644
|
||||
virtual ~PruneCondition() {}
|
||||
|
||||
diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
|
||||
index 966481d6284e4..e0fa8394cb045 100644
|
||||
index 8fe578f92f3a3..9acab9404c885 100644
|
||||
--- third_party/crashpad/crashpad/client/settings.cc
|
||||
+++ third_party/crashpad/crashpad/client/settings.cc
|
||||
@@ -87,7 +87,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
|
||||
@@ -111,7 +111,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
|
||||
|
||||
struct Settings::Data {
|
||||
static constexpr uint32_t kSettingsMagic = 'CPds';
|
||||
@@ -52,7 +52,7 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||
|
||||
enum Options : uint32_t {
|
||||
kUploadsEnabled = 1 << 0,
|
||||
@@ -98,6 +98,9 @@ struct Settings::Data {
|
||||
@@ -122,6 +122,9 @@ struct Settings::Data {
|
||||
options(0),
|
||||
padding_0(0),
|
||||
last_upload_attempt_time(0),
|
||||
@@ -62,7 +62,7 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||
client_id() {}
|
||||
|
||||
uint32_t magic;
|
||||
@@ -105,6 +108,9 @@ struct Settings::Data {
|
||||
@@ -129,6 +132,9 @@ struct Settings::Data {
|
||||
uint32_t options;
|
||||
uint32_t padding_0;
|
||||
int64_t last_upload_attempt_time; // time_t
|
||||
@@ -72,7 +72,7 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||
UUID client_id;
|
||||
};
|
||||
|
||||
@@ -188,6 +194,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
|
||||
@@ -212,6 +218,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) {
|
||||
return WriteSettings(handle.get(), settings);
|
||||
}
|
||||
|
||||
@@ -130,10 +130,10 @@ index 966481d6284e4..e0fa8394cb045 100644
|
||||
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
|
||||
FileHandle file,
|
||||
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
|
||||
index e476c60c3ba6b..ce8256c9f6d25 100644
|
||||
index aedf30cd874f7..ab798f00e0862 100644
|
||||
--- third_party/crashpad/crashpad/client/settings.h
|
||||
+++ third_party/crashpad/crashpad/client/settings.h
|
||||
@@ -116,6 +116,11 @@ class Settings {
|
||||
@@ -120,6 +120,11 @@ class Settings {
|
||||
//! error logged.
|
||||
bool SetLastUploadAttemptTime(time_t time);
|
||||
|
||||
@@ -184,7 +184,7 @@ index 0fe4760db7fe2..042af7247712c 100644
|
||||
|
||||
if (crashpad_is_win) {
|
||||
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||
index efbeab7804c44..44fd31e58175c 100644
|
||||
index 138cf80026c98..d4af1f0c38d76 100644
|
||||
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
|
||||
@@ -269,6 +269,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
|
||||
|
Reference in New Issue
Block a user