diff --git a/chromium_version.txt b/chromium_version.txt index 956aa6fe..35c16076 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -151.0.7922.71 +151.0.7922.75 diff --git a/domain_substitution.list b/domain_substitution.list index ccf14529..8aa1747c 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -15384,7 +15384,6 @@ third_party/skia/infra/bots/recipes/upload_nano_results.expected/normal_bot.json third_party/skia/infra/bots/recipes/upload_nano_results.expected/trybot.json third_party/skia/infra/bots/recipes/upload_nano_results.py third_party/skia/infra/bots/run_recipe.py -third_party/skia/infra/bots/tasks.json third_party/skia/infra/bots/utils.py third_party/skia/modules/canvaskit/htmlcanvas/canvas2dcontext.js third_party/skia/modules/canvaskit/htmlcanvas/font.js diff --git a/patches/ungoogled-chromium/block-requests.patch b/patches/ungoogled-chromium/block-requests.patch index 7de22128..18a05085 100644 --- a/patches/ungoogled-chromium/block-requests.patch +++ b/patches/ungoogled-chromium/block-requests.patch @@ -122,14 +122,10 @@ /** * Lazily loads the vscode.web-custom-data/browser.css-data.json and allows -@@ -15,33 +14,14 @@ import * as Root from '../../core/root/r - export class WebCustomData { - #data = new Map(); +@@ -19,18 +18,7 @@ export class WebCustomData { + readonly fetchPromiseForTest: Promise; -- /** The test actually needs to wait for the result */ -- readonly fetchPromiseForTest: Promise; -- -- constructor(remoteBase: string) { + constructor(remoteBase: string) { - if (!remoteBase) { - this.fetchPromiseForTest = Promise.resolve(); - return; @@ -142,22 +138,22 @@ - } - }) - .catch(); -- } -- ++ this.fetchPromiseForTest = Promise.resolve(); + } + /** - * Creates a fresh `WebCustomData` instance using the standard - * DevTools remote base. +@@ -39,9 +27,8 @@ export class WebCustomData { * Throws if no valid remoteBase was found. */ static create(): WebCustomData { - const remoteBase = Root.Runtime.getRemoteBase(); // Silently skip loading of the CSS data if remoteBase is not set properly. - return new WebCustomData(remoteBase?.base ?? ''); -+ return new WebCustomData(); ++ return new WebCustomData(''); } /** -@@ -54,9 +34,6 @@ export class WebCustomData { +@@ -54,9 +41,6 @@ export class WebCustomData { } } diff --git a/patches/ungoogled-chromium/disable-gcm.patch b/patches/ungoogled-chromium/disable-gcm.patch index 77a04b40..de685f5d 100644 --- a/patches/ungoogled-chromium/disable-gcm.patch +++ b/patches/ungoogled-chromium/disable-gcm.patch @@ -154,3 +154,32 @@ } std::string GCMClientImpl::GetStateString() const { +--- a/components/gcm_driver/gcm_driver_desktop.cc ++++ b/components/gcm_driver/gcm_driver_desktop.cc +@@ -1189,25 +1189,7 @@ GCMClient::Result GCMDriverDesktop::Ensu + GCMClient::StartMode start_mode) { + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); + +- if (gcm_started_) +- return GCMClient::SUCCESS; +- +- // Have any app requested the service? +- if (app_handlers().empty()) +- return GCMClient::UNKNOWN_ERROR; +- +- if (!delayed_task_controller_) +- delayed_task_controller_ = std::make_unique(); +- +- // Note that we need to pass weak pointer again since the existing weak +- // pointer in IOWorker might have been invalidated when GCM is stopped. +- io_thread_->PostTask( +- FROM_HERE, base::BindOnce(&GCMDriverDesktop::IOWorker::Start, +- base::Unretained(io_worker_.get()), start_mode, +- weak_ptr_factory_.GetWeakPtr(), +- /*time_task_posted=*/base::TimeTicks::Now())); +- +- return GCMClient::SUCCESS; ++ return GCMClient::GCM_DISABLED; + } + + void GCMDriverDesktop::RemoveCachedData() {