PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #769 from uazo/create-pull-request/patch-f661e4f

Browse Source 
Git apply result for master branch
This commit is contained in:
uazo
2024-02-01 16:48:35 +01:00
committed by GitHub
parent ecf04a94ca 0913a726df
commit 4d606bb7f3
16 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Add-cromite-flags-support.patch
+3 -3
View File
@@ -1332,7 +1332,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -1383,4 +1383,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
@@ -1388,4 +1388,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
}
@@ -1341,7 +1341,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -337,6 +337,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);
@@ -338,6 +338,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);
CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
@@ -1699,7 +1699,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2304,5 +2304,6 @@ BASE_FEATURE(kTreatHTTPExpiresHeaderValueZeroAsExpiredInBlink,
@@ -2305,5 +2305,6 @@ BASE_FEATURE(kTreatHTTPExpiresHeaderValueZeroAsExpiredInBlink,
"TreatHTTPExpiresHeaderValueZeroAsExpiredInBlink",
base::FEATURE_ENABLED_BY_DEFAULT);
build/patches/Add-menu-item-to-view-source.patch
+1 -1
View File
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
@@ -1182,6 +1183,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
@@ -1181,6 +1182,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
}
}
build/patches/Add-support-to-jxl.patch
+2 -2
View File
@@ -607,7 +607,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -2263,6 +2263,10 @@ source_set("blink_platform_unittests_sources") {
@@ -2264,6 +2264,10 @@ source_set("blink_platform_unittests_sources") {
sources += [ "text/locale_icu_test.cc" ]
}
@@ -618,7 +618,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
sources += [ "testing/run_all_tests.cc" ]
configs += [
@@ -2306,6 +2310,7 @@ source_set("blink_platform_unittests_sources") {
@@ -2307,6 +2311,7 @@ source_set("blink_platform_unittests_sources") {
"//third_party/blink/renderer/platform/scheduler:unit_tests",
"//third_party/blink/renderer/platform/wtf",
"//third_party/libavif:libavif",
build/patches/Allow-building-without-supervised-users.patch
+2 -2
View File
@@ -272,7 +272,7 @@ diff --git a/components/supervised_user/core/common/supervised_user_constants.cc
diff --git a/components/supervised_user/core/common/supervised_user_utils.cc b/components/supervised_user/core/common/supervised_user_utils.cc
--- a/components/supervised_user/core/common/supervised_user_utils.cc
+++ b/components/supervised_user/core/common/supervised_user_utils.cc
@@ -75,11 +75,14 @@ GURL NormalizeUrl(const GURL& url) {
@@ -52,11 +52,14 @@ GURL NormalizeUrl(const GURL& url) {
}
bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
@@ -289,5 +289,5 @@ diff --git a/components/supervised_user/core/common/supervised_user_utils.cc b/c
+#endif
}
bool EmitLogSegmentHistogram(const std::vector<AccountInfo>& primary_accounts) {
absl::optional<LogSegment> SupervisionStatusForUser(
--
build/patches/Disable-all-predictors-code.patch
+4 -4
View File
@@ -85,7 +85,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
@@ -517,7 +517,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
@@ -520,7 +520,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
void OptimizationGuideKeyedService::RegisterOptimizationTypes(
const std::vector<optimization_guide::proto::OptimizationType>&
optimization_types) {
@@ -343,7 +343,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
// Returns whether |locale| is a supported locale for |feature|.
//
@@ -582,8 +570,7 @@ size_t MaxURLKeyedHintCacheSize() {
@@ -587,8 +575,7 @@ size_t MaxURLKeyedHintCacheSize() {
}
bool ShouldPersistHintsToDisk() {
@@ -353,7 +353,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
}
bool ShouldEnablePersonalizedMetadata(proto::RequestContext request_context) {
@@ -1002,5 +989,19 @@ bool CanLaunchOnDeviceModelService() {
@@ -1007,5 +994,19 @@ bool CanLaunchOnDeviceModelService() {
base::FeatureList::IsEnabled(kLogOnDeviceMetricsOnStartup);
}
@@ -437,7 +437,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
--- a/components/search/ntp_features.cc
+++ b/components/search/ntp_features.cc
@@ -499,4 +499,7 @@ std::vector<std::string> GetModulesOrder() {
@@ -501,4 +501,7 @@ std::vector<std::string> GetModulesOrder() {
base::SplitResult::SPLIT_WANT_NONEMPTY);
}
build/patches/Disable-all-promo-dialogs.patch
+2 -2
View File
@@ -73,14 +73,14 @@ diff --git a/components/user_education/common/feature_promo_controller.cc b/comp
diff --git a/components/user_education/common/feature_promo_registry.cc b/components/user_education/common/feature_promo_registry.cc
--- a/components/user_education/common/feature_promo_registry.cc
+++ b/components/user_education/common/feature_promo_registry.cc
@@ -30,6 +30,7 @@ const FeaturePromoSpecification* FeaturePromoRegistry::GetParamsForFeature(
@@ -29,6 +29,7 @@ const FeaturePromoSpecification* FeaturePromoRegistry::GetParamsForFeature(
}
void FeaturePromoRegistry::RegisterFeature(FeaturePromoSpecification spec) {
+ if ((true)) return;
const base::Feature* const iph_feature = spec.feature();
CHECK(iph_feature);
const auto result = feature_promo_data_.emplace(iph_feature, std::move(spec));
CHECK_NE(FeaturePromoSpecification::PromoType::kUnspecified,
diff --git a/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc b/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc
new file mode 100755
--- /dev/null
build/patches/Disable-conversion-measurement-api.patch
+1 -1
View File
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
<!--
@@ -1162,9 +1161,6 @@ by a child template that "extends" this file.
@@ -1166,9 +1165,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
</activity>
build/patches/Disable-privacy-issues-in-password-manager.patch
+1 -1
View File
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -446,15 +446,6 @@ by a child template that "extends" this file.
@@ -450,15 +450,6 @@ by a child template that "extends" this file.
</intent-filter>
</receiver>
build/patches/Disable-speechSynthesis-getVoices-API.patch
+2 -2
View File
@@ -43,7 +43,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
--- a/components/content_settings/renderer/content_settings_agent_impl.cc
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
@@ -476,6 +476,14 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const {
@@ -475,6 +475,14 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const {
return false;
}
@@ -58,7 +58,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
bool ContentSettingsAgentImpl::UpdateOverrides() {
// Evaluate the content setting rules
ContentSetting setting = CONTENT_SETTING_ALLOW;
@@ -486,7 +494,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
@@ -485,7 +493,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
}
return UpdateTimeZoneOverride(
setting, content_setting_rules_->timezone_override_value);
build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch
+2 -2
View File
@@ -1002,7 +1002,7 @@ new file mode 100644
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -31,6 +31,13 @@
@@ -32,6 +32,13 @@
<settings-ai-page prefs="{{prefs}}"></settings-ai-page>
</settings-section>
</template>
@@ -1231,7 +1231,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
import("//components/captive_portal/core/features.gni")
import("//components/compose/features.gni")
import("//components/enterprise/buildflags/buildflags.gni")
@@ -2957,10 +2956,6 @@ if (!is_android) {
@@ -2958,10 +2957,6 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
build/patches/Multiple-fingerprinting-mitigations.patch
+1 -1
View File
@@ -498,7 +498,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
}
return image_data;
@@ -2908,9 +2916,23 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
@@ -2885,9 +2893,23 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {
TextDirection direction = ToTextDirection(GetState().GetDirection(), canvas);
build/patches/Partitioning-all-cookies-by-top-frame-domain.patch
+1 -1
View File
@@ -72,7 +72,7 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc
--- a/components/content_settings/core/common/cookie_settings_base.cc
+++ b/components/content_settings/core/common/cookie_settings_base.cc
@@ -414,7 +414,7 @@ CookieSettingsBase::GetCookieSettingInternal(
@@ -419,7 +419,7 @@ CookieSettingsBase::GetCookieSettingInternal(
absl::optional<ThirdPartyBlockingScope> scope;
if (block_third) {
scope = IsAllowed(setting)
build/patches/Revert-removal-of-execution-context-address-space.patch
+1 -1
View File
@@ -712,7 +712,7 @@ diff --git a/third_party/blink/renderer/core/workers/worker_thread_test.cc b/thi
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
@@ -372,6 +373,7 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunningOnInitialization) {
@@ -380,6 +381,7 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunningOnInitialization) {
CalculateHttpsState(security_origin_.get()),
MakeGarbageCollected<WorkerClients>(),
nullptr /* content_settings_client */,
build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
+5 -5
View File
@@ -8170,7 +8170,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/apps/guest_view/app_view_browsertest.cc",
"../browser/apps/guest_view/web_view_browsertest.cc",
"../browser/apps/platform_apps/app_browsertest.cc",
@@ -2939,6 +2957,10 @@ if (!is_android) {
@@ -2940,6 +2958,10 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
@@ -8181,7 +8181,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (enable_reporting) {
sources += [ "../browser/net/reporting_browsertest.cc" ]
}
@@ -3793,6 +3815,7 @@ if (!is_android) {
@@ -3794,6 +3816,7 @@ if (!is_android) {
]
}
@@ -8189,7 +8189,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (is_chromeos_ash && enable_extensions) {
deps +=
[ "//chromeos/ash/components/network/portal_detector:test_support" ]
@@ -6096,6 +6119,7 @@ test("unit_tests") {
@@ -6097,6 +6120,7 @@ test("unit_tests") {
sources = [
# All unittests in browser, common, renderer and service.
"../browser/about_flags_unittest.cc",
@@ -8197,7 +8197,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/after_startup_task_utils_unittest.cc",
"../browser/apps/icon_standardizer_unittest.cc",
"../browser/apps/user_type_filter_unittest.cc",
@@ -6786,6 +6810,8 @@ test("unit_tests") {
@@ -6787,6 +6811,8 @@ test("unit_tests") {
"//chrome/services/file_util:unit_tests",
"//chrome/services/qrcode_generator/public/cpp",
"//components/account_id",
@@ -8206,7 +8206,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/assist_ranker/proto",
"//components/autofill/content/browser:test_support",
"//components/background_sync",
@@ -10380,6 +10406,7 @@ if (!is_android) {
@@ -10381,6 +10407,7 @@ if (!is_android) {
public_deps = [
"//chrome/browser:test_support_ui",
build/patches/eyeo-beta-118.0.5993.48-extension_api.patch
+1 -1
View File
@@ -4120,7 +4120,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -3815,6 +3815,12 @@ if (!is_android) {
@@ -3816,6 +3816,12 @@ if (!is_android) {
]
}
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+1 -1
View File
@@ -784,7 +784,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6737,7 +6737,6 @@ test("unit_tests") {
@@ -6738,7 +6738,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",