Skip to content

Commit

Permalink
Patches for 125.0.6422.60
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo committed May 18, 2024
1 parent 9b63cf2 commit e2961d1
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build/patches/Add-a-proxy-configuration-page.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
kChromeUIMultiDeviceSetupHost,
kChromeUINetworkHost,
kChromeUINotificationTesterHost,
@@ -759,6 +762,7 @@ const char* const kChromeHostURLs[] = {
@@ -760,6 +763,7 @@ const char* const kChromeHostURLs[] = {
#if !BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_CHROMEOS)
kChromeUIAppLauncherPageHost,
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-cromite-flags-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,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
@@ -2674,5 +2674,6 @@ BASE_FEATURE(kNoThrottlingVisibleAgent,
@@ -2676,5 +2676,6 @@ BASE_FEATURE(kNoThrottlingVisibleAgent,
"NoThrottlingVisibleAgent",
base::FEATURE_DISABLED_BY_DEFAULT);

Expand Down
4 changes: 2 additions & 2 deletions build/patches/Add-setting-to-clear-data-on-exit.patch
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2280,6 +2280,16 @@
@@ -2294,6 +2294,16 @@
<message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for clear browsing data button in Privacy options">
Clear browsing data
</message>
Expand Down Expand Up @@ -338,7 +338,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -518,6 +518,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
@@ -520,6 +520,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
(*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
settings_api::PrefType::kNumber;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
#include "services/network/public/mojom/source_location.mojom-blink.h"
@@ -2656,9 +2657,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
@@ -2670,9 +2671,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
}

Expand Down
18 changes: 9 additions & 9 deletions build/patches/Content-settings-infrastructure.patch
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -1496,4 +1496,5 @@
@@ -1506,4 +1506,5 @@
</settings-subpage>
</template>
</template>
Expand All @@ -159,15 +159,15 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -51,6 +51,7 @@ import {SiteSettingsPrefsBrowserProxyImpl} from '../site_settings/site_settings_
@@ -52,6 +52,7 @@ import {SiteSettingsPrefsBrowserProxyImpl} from '../site_settings/site_settings_

import {PrivacyGuideAvailabilityMixin} from './privacy_guide/privacy_guide_availability_mixin.js';
import {getTemplate} from './privacy_page.html.js';
+import { SettingsCategoryDefaultRadioGroupElement } from '../site_settings/settings_category_default_radio_group.js';

interface BlockAutoplayStatus {
enabled: boolean;
@@ -74,8 +75,82 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
@@ -75,8 +76,82 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
return 'settings-privacy-page';
}

Expand Down Expand Up @@ -262,7 +262,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc

/**
* Add all of the child routes that originate from the privacy route,
@@ -148,6 +149,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
@@ -152,6 +153,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
r.SITE_SETTINGS_AUTOMATIC_FULLSCREEN =
r.SITE_SETTINGS.createChild('automaticFullScreen');
}
Expand Down Expand Up @@ -587,7 +587,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
{
route: routes.SITE_SETTINGS_ADS,
id: Id.ADS,
@@ -429,10 +429,36 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
@@ -436,10 +436,36 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
disabledLabel: 'trackingProtectionLinkRowSubLabel',
});
}
Expand Down Expand Up @@ -624,7 +624,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
function buildItemListFromIds(orderedIdList: ContentSettingsTypes[]):
CategoryListItem[] {
const map = getCategoryItemMap();
@@ -518,7 +544,7 @@ export class SettingsSiteSettingsPageElement extends
@@ -525,7 +551,7 @@ export class SettingsSiteSettingsPageElement extends
Id.IMAGES,
Id.POPUPS,
]),
Expand Down Expand Up @@ -691,8 +691,8 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
/**
* Determine localization string for i18n for a given content settings type.
* Sorted alphabetically by |ContentSettingsType|.
@@ -100,6 +148,13 @@ export function getLocalizationStringForContentType(
case ContentSettingsTypes.SITE_DATA:
@@ -101,6 +149,13 @@ export function getLocalizationStringForContentType(
case ContentSettingsTypes.OFFER_WRITING_HELP:
return null;
default:
+ for (let index=0; index < loadTimeData.getInteger("br_cs_count"); index++) {
Expand Down Expand Up @@ -1153,7 +1153,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
#include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
#include "components/password_manager/core/browser/manage_passwords_referrer.h"
#include "components/password_manager/core/common/password_manager_features.h"
@@ -3577,6 +3581,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3588,6 +3592,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);

Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-FLoC-and-privacy-sandbox.patch
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ new file mode 100644
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
@@ -2602,6 +2602,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
@@ -2604,6 +2604,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
// constants for features in the section above.

bool IsAllowURNsInIframeEnabled() {
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-PrivacyGuide.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -365,8 +365,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
@@ -366,8 +366,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)

bool show_privacy_guide =
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-conversion-measurement-api.patch
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
--- a/third_party/blink/renderer/core/page/page.cc
+++ b/third_party/blink/renderer/core/page/page.cc
@@ -1399,7 +1399,7 @@ void Page::UpdateBrowsingContextGroup(
@@ -1412,7 +1412,7 @@ void Page::UpdateBrowsingContextGroup(

void Page::SetAttributionSupport(
network::mojom::AttributionSupport attribution_support) {
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Disable-plugins-enumeration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2173,9 +2173,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -2187,9 +2187,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}

PluginData* LocalFrame::GetPluginData() const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ diff --git a/third_party/blink/renderer/core/css/media_query_exp.cc b/third_part
diff --git a/third_party/blink/renderer/core/css/parser/media_query_parser.cc b/third_party/blink/renderer/core/css/parser/media_query_parser.cc
--- a/third_party/blink/renderer/core/css/parser/media_query_parser.cc
+++ b/third_party/blink/renderer/core/css/parser/media_query_parser.cc
@@ -79,8 +79,8 @@ class MediaQueryFeatureSet : public MediaQueryParser::FeatureSet {
@@ -80,8 +80,8 @@ class MediaQueryFeatureSet : public MediaQueryParser::FeatureSet {
RuntimeEnabledFeatures::CSSUpdateMediaFeatureEnabled()) ||
(feature == media_feature_names::kPrefersReducedDataMediaFeature &&
RuntimeEnabledFeatures::PrefersReducedDataEnabled()) ||
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Enable-search-engine-settings-desktop-ui.patch
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2458,6 +2458,9 @@
@@ -2472,6 +2472,9 @@
<message name="IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION" desc="Label for explaining the format of the URL that should be entered by the user in the add/edit search engine dialog.">
URL with <ph name="SPECIAL_SYMBOL">%s</ph> in place of query
</message>
Expand Down Expand Up @@ -1259,7 +1259,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -2299,6 +2299,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
@@ -2300,6 +2300,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
{"searchEnginesQueryURL", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL},
{"searchEnginesQueryURLExplanation",
IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION},
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Eyeo-Adblock-Remove-Privacy-Issues.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc
"appearance_page/appearance_fonts_page.ts",
"appearance_page/appearance_page.ts",
"appearance_page/home_url_input.ts",
@@ -397,6 +398,7 @@ build_webui("build") {
@@ -398,6 +399,7 @@ build_webui("build") {
ts_definitions = [
"//tools/typescript/definitions/autofill_private.d.ts",
"//tools/typescript/definitions/chrome_event.d.ts",
Expand Down Expand Up @@ -1613,7 +1613,7 @@ diff --git a/chrome/browser/resources/settings/page_visibility.ts b/chrome/brows
diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
@@ -204,6 +204,10 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
@@ -208,6 +208,10 @@ function createBrowserSettingsRoutes(): SettingsRoutes {
r.FONTS = r.APPEARANCE.createChild('/fonts');
}

Expand Down
2 changes: 1 addition & 1 deletion build/patches/History-number-of-days-privacy-setting.patch
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -80,6 +80,23 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
@@ -81,6 +81,23 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {

static get properties() {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -97,6 +97,17 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
@@ -98,6 +98,17 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
},
},

Expand All @@ -464,7 +464,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch
/**
* Preferences state.
*/
@@ -475,6 +486,12 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
@@ -482,6 +493,12 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
Router.getInstance().navigateTo(routes.TRACKING_PROTECTION);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3934,14 +3934,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
@@ -3948,14 +3948,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
}


Expand Down
4 changes: 2 additions & 2 deletions build/patches/Site-setting-for-images.patch
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3920,13 +3920,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
@@ -3934,13 +3934,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
return loader_.GetDocumentLoader()->GetContentSettings();
}

Expand Down Expand Up @@ -414,7 +414,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/thir
diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
--- a/third_party/blink/renderer/core/page/page.cc
+++ b/third_party/blink/renderer/core/page/page.cc
@@ -874,9 +874,8 @@ void Page::SettingsChanged(ChangeType change_type) {
@@ -875,9 +875,8 @@ void Page::SettingsChanged(ChangeType change_type) {
for (Frame* frame = MainFrame(); frame;
frame = frame->Tree().TraverseNext()) {
if (auto* local_frame = DynamicTo<LocalFrame>(frame)) {
Expand Down
10 changes: 5 additions & 5 deletions build/patches/Viewport-Protection-flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -1485,6 +1485,10 @@ void LocalFrame::RestoreScrollOffsets() {
@@ -1493,6 +1493,10 @@ void LocalFrame::RestoreScrollOffsets() {
saved_scroll_offsets_ = nullptr;
}

Expand All @@ -503,7 +503,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
void LocalFrame::SetPageZoomFactor(float factor) {
SetPageAndTextZoomFactors(factor, text_zoom_factor_);
}
@@ -1657,12 +1661,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() {
@@ -1671,12 +1675,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() {
return mojo_handler_->GetDevicePosture();
}

Expand All @@ -522,7 +522,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
return ratio;
}

@@ -3230,6 +3238,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) {
@@ -3244,6 +3252,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) {
DCHECK(!GetDocument() || !GetDocument()->Printing());
DCHECK(IsMainFrame());

Expand Down Expand Up @@ -732,7 +732,7 @@ diff --git a/third_party/blink/renderer/core/input/touch.cc b/third_party/blink/
diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
--- a/third_party/blink/renderer/core/page/page.cc
+++ b/third_party/blink/renderer/core/page/page.cc
@@ -99,6 +99,12 @@
@@ -100,6 +100,12 @@
#include "ui/color/color_provider.h"
#include "ui/color/color_provider_utils.h"

Expand All @@ -745,7 +745,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
namespace blink {

namespace {
@@ -1082,7 +1088,94 @@ void Page::UpdateAcceleratedCompositingSettings() {
@@ -1083,7 +1089,94 @@ void Page::UpdateAcceleratedCompositingSettings() {
}
}

Expand Down
2 changes: 1 addition & 1 deletion build/patches/WIN-enable-pdf-plugin.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2174,7 +2174,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -2188,7 +2188,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}

PluginData* LocalFrame::GetPluginData() const {
Expand Down

0 comments on commit e2961d1

Please sign in to comment.