mirror of
https://github.com/imputnet/helium.git
synced 2026-08-20 00:57:32 +02:00
merge: update ungoogled-chromium to 151.0.7922.75
This commit is contained in:
@@ -1 +1 @@
|
||||
151.0.7922.71
|
||||
151.0.7922.75
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<string, CSSProperty>();
|
||||
@@ -19,18 +18,7 @@ export class WebCustomData {
|
||||
readonly fetchPromiseForTest: Promise<unknown>;
|
||||
|
||||
- /** The test actually needs to wait for the result */
|
||||
- readonly fetchPromiseForTest: Promise<unknown>;
|
||||
-
|
||||
- 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 {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<GCMDelayedTaskController>();
|
||||
-
|
||||
- // 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() {
|
||||
|
||||
Reference in New Issue
Block a user