mirror of
https://github.com/imputnet/helium.git
synced 2026-08-20 00:57:32 +02:00
merge: update to ungoogled-chromium 150.0.7871.124
This commit is contained in:
@@ -1 +1 @@
|
||||
150.0.7871.114
|
||||
150.0.7871.124
|
||||
|
||||
@@ -16,11 +16,11 @@ the process has finished.
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import multiprocessing
|
||||
import os
|
||||
import sys
|
||||
|
||||
from itertools import repeat
|
||||
from multiprocessing import Pool
|
||||
from pathlib import Path, PurePosixPath
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent / 'utils'))
|
||||
@@ -338,7 +338,7 @@ def compute_lists(source_tree, search_regex, processes): # pylint: disable=too-m
|
||||
unused_patterns = UnusedPatterns()
|
||||
|
||||
# Launch multiple processes iterating over the source tree
|
||||
with Pool(processes) as procpool:
|
||||
with multiprocessing.Pool(processes) as procpool:
|
||||
returned_data = procpool.starmap(
|
||||
compute_lists_proc,
|
||||
zip(source_tree.rglob('*'), repeat(source_tree), repeat(search_regex)))
|
||||
@@ -427,4 +427,6 @@ def main(args_list=None):
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if os.name == 'posix':
|
||||
multiprocessing.set_start_method('fork')
|
||||
main()
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
// - ScriptSchedulingType::kInOrder
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -3461,6 +3461,9 @@ Vector<gfx::RectF> Element::GetClientRec
|
||||
@@ -3462,6 +3462,9 @@ Vector<gfx::RectF> Element::GetClientRec
|
||||
}
|
||||
Vector<gfx::RectF> result;
|
||||
for (auto& quad : quads) {
|
||||
@@ -186,7 +186,7 @@
|
||||
result.emplace_back(quad.BoundingBox());
|
||||
}
|
||||
return result;
|
||||
@@ -3490,6 +3493,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -3491,6 +3494,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -457,14 +457,6 @@ group("gn_all") {
|
||||
@@ -462,14 +462,6 @@ group("gn_all") {
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
|
||||
--- a/content/browser/child_process_security_policy_impl.cc
|
||||
+++ b/content/browser/child_process_security_policy_impl.cc
|
||||
@@ -1118,6 +1118,7 @@ void ChildProcessSecurityPolicyImpl::Reg
|
||||
@@ -1119,6 +1119,7 @@ void ChildProcessSecurityPolicyImpl::Reg
|
||||
RegisterWebSafeScheme(url::kWssScheme);
|
||||
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
|
||||
RegisterWebSafeScheme(url::kDataScheme);
|
||||
|
||||
@@ -136,16 +136,6 @@
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
--- a/chrome/browser/actor/ui/actor_ui_tab_controller.cc
|
||||
+++ b/chrome/browser/actor/ui/actor_ui_tab_controller.cc
|
||||
@@ -50,7 +50,6 @@ ActorUiTabController::ActorUiTabControll
|
||||
scoped_unowned_user_data_(tab.GetUnownedUserDataHost(), *this) {
|
||||
CHECK(base::FeatureList::IsEnabled(features::kGlicActorUi));
|
||||
CHECK(base::FeatureList::IsEnabled(features::kGlicActor));
|
||||
- CHECK(actor_keyed_service_);
|
||||
}
|
||||
|
||||
ActorUiTabController::~ActorUiTabController() = default;
|
||||
--- a/chrome/browser/browser_process_impl.cc
|
||||
+++ b/chrome/browser/browser_process_impl.cc
|
||||
@@ -260,12 +260,10 @@ void OnLocalStatePrefsLoaded();
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -579,9 +579,6 @@ group("gn_all") {
|
||||
@@ -584,9 +584,6 @@ group("gn_all") {
|
||||
deps += [ "//chrome/test:chrome_app_unittests" ]
|
||||
}
|
||||
|
||||
|
||||
@@ -1110,7 +1110,7 @@
|
||||
void OnOptinImpression() override {
|
||||
--- a/chrome/browser/lifetime/smart_restart_policy.cc
|
||||
+++ b/chrome/browser/lifetime/smart_restart_policy.cc
|
||||
@@ -12,7 +12,6 @@
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "chrome/browser/ui/startup/startup_browser_creator.h"
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
# when navigating from the onmibox/realbox
|
||||
--- a/components/search_engines/template_url.cc
|
||||
+++ b/components/search_engines/template_url.cc
|
||||
@@ -1413,26 +1413,6 @@ std::string TemplateURLRef::HandleReplac
|
||||
// url.insert(replacement.index, used_www ? "gcx=w&" : "gcx=c&");
|
||||
@@ -1414,23 +1414,6 @@ std::string TemplateURLRef::HandleReplac
|
||||
break;
|
||||
|
||||
- case GOOGLE_SEARCH_SOURCE: {
|
||||
case GOOGLE_SEARCH_SOURCE: {
|
||||
- DCHECK(!replacement.is_post_param);
|
||||
- using OEP = ::metrics::OmniboxEventProto;
|
||||
- std::string source_param;
|
||||
@@ -24,8 +23,6 @@
|
||||
- if (!source_param.empty()) {
|
||||
- HandleReplacement("source", source_param, replacement, &url);
|
||||
- }
|
||||
- break;
|
||||
- }
|
||||
break;
|
||||
}
|
||||
|
||||
case GOOGLE_SEARCH_SOURCE_ID: {
|
||||
DCHECK(!replacement.is_post_param);
|
||||
|
||||
Reference in New Issue
Block a user