Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict-resolved patches from Chromium 109.0.5414.25 to Chromium 110.0.5449.0.

Browse Source
This commit is contained in:
Claudio DeSouza
2023-01-25 07:39:34 +00:00
parent 699f7d1938
commit d5476278ab
14 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/base-trace_event-builtin_categories.h.patch
+3 -3
View File
@@ -1,10 +1,10 @@
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index a96b2338f39adb7f765d7c7a67eff8dbbdb991a5..977dbb4d1ce931bfba77b4170992ca2729c0969f 100644
index 1c33c3345fd7dcc106576b239946be79eee45cb1..858072517301d569a2c5330498a158d68b0e0235 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -183,6 +183,7 @@
X("WebCore") \
@@ -184,6 +184,7 @@
X("webrtc") \
X("webrtc_stats") \
X("xr") \
+ BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES(X) /*see chromium_src*/ \
X(TRACE_DISABLED_BY_DEFAULT("android_view_hierarchy")) \
patches/chrome-VERSION.patch
+4 -4
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index b7517548a6596e35de99564a190dbb877e981894..68614189bc31693c55d1d0a25d76284a2cfa8210 100644
index bc5b8f16ab4321355e543cddbfa6b572e5856776..7cfcbf46922060cef150f27729ce4e32f9a73087 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=109
MAJOR=110
-MINOR=0
-BUILD=5414
-PATCH=119
-BUILD=5449
-PATCH=0
+MINOR=1
+BUILD=49
+PATCH=59
patches/chrome-android-BUILD.gn.patch
+12 -12
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d238f968261 100644
index 791df0004c9b8b6f25e1b4a2abb74ab73b250828..f4181b1202d5b66f9c88dc029a54f2e2fa8d7f01 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -243,6 +243,7 @@ if (current_toolchain == default_toolchain) {
@@ -239,6 +239,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -10,7 +10,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
}
android_resources("chrome_app_java_resources") {
@@ -318,6 +319,7 @@ if (current_toolchain == default_toolchain) {
@@ -315,6 +316,7 @@ if (current_toolchain == default_toolchain) {
"//third_party/androidx:androidx_gridlayout_gridlayout_java",
"//third_party/androidx:androidx_preference_preference_java",
]
@@ -18,15 +18,15 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
}
if (enable_vr) {
@@ -718,6 +720,7 @@ if (current_toolchain == default_toolchain) {
@@ -716,6 +718,7 @@ if (current_toolchain == default_toolchain) {
]
deps += feed_deps
+ deps += brave_chrome_java_deps
srcjar_deps = [
":autofill_verification_status_generated_enum",
@@ -744,6 +747,7 @@ if (current_toolchain == default_toolchain) {
":chrome_android_java_enums_srcjar",
@@ -740,6 +743,7 @@ if (current_toolchain == default_toolchain) {
"//components/offline_pages/core:offline_page_model_enums_java",
"//net:effective_connection_type_java",
]
@@ -34,7 +34,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
# From java_sources.gni.
sources = chrome_java_sources + [ app_hooks_impl ]
@@ -885,6 +889,7 @@ if (current_toolchain == default_toolchain) {
@@ -881,6 +885,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/android/features/tab_ui:module_desc_java",
]
}
@@ -42,7 +42,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
}
action_with_pydeps("chrome_android_java_google_api_keys_srcjar") {
@@ -2102,6 +2107,7 @@ if (current_toolchain == default_toolchain) {
@@ -2099,6 +2104,7 @@ if (current_toolchain == default_toolchain) {
"java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png",
"java/res_chromium_base/values/channel_constants.xml",
]
@@ -50,7 +50,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
# Dep needed to ensure override works properly.
deps = [ ":chrome_base_module_resources" ]
@@ -2350,6 +2356,7 @@ if (current_toolchain == default_toolchain) {
@@ -2347,6 +2353,7 @@ if (current_toolchain == default_toolchain) {
":${_variant}_locale_pak_assets",
":${_variant}_paks",
]
@@ -58,7 +58,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
if (_is_monochrome) {
deps += [ "//android_webview:locale_pak_assets" ]
if (webview_includes_weblayer && !_is_bundle_module) {
@@ -2563,6 +2570,7 @@ if (current_toolchain == default_toolchain) {
@@ -2559,6 +2566,7 @@ if (current_toolchain == default_toolchain) {
load_library_from_apk = chromium_linker_supported
version_name = chrome_version_name
@@ -66,7 +66,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
}
}
@@ -2706,6 +2714,7 @@ if (current_toolchain == default_toolchain) {
@@ -2702,6 +2710,7 @@ if (current_toolchain == default_toolchain) {
"//components/payments/content/android:service_java",
"//third_party/androidx:androidx_browser_browser_java",
]
@@ -74,7 +74,7 @@ index 78cca7269ce99591eaafee3c6592f6a72568271f..344488234bf7b551233c06521a408d23
# More deps for DFMs.
if (dfmify_dev_ui) {
@@ -2891,6 +2900,7 @@ if (current_toolchain == default_toolchain) {
@@ -2885,6 +2894,7 @@ if (current_toolchain == default_toolchain) {
deps += [ "//weblayer/browser/java:upstream_java" ]
}
}
patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
index 655fee00cfb3560e64b76a66757c1b131c3d8dd1..370dab9dcfd9135b045fc4d43b2654be02812a73 100644
index 95c4dd94fadbbb56304bb0536e91eefbd14bae86..181dd93eea8696b366f13df9c5b11a30f71655c9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
@@ -24,7 +24,7 @@ import androidx.appcompat.app.AppCompatActivity;
@@ -11,12 +11,12 @@ index 655fee00cfb3560e64b76a66757c1b131c3d8dd1..370dab9dcfd9135b045fc4d43b2654be
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
@@ -365,7 +365,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
IdentityServicesProvider.get()
@@ -360,7 +360,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat
.getIdentityManager(Profile.getLastUsedRegularProfile())
.getPrimaryAccountInfo(ConsentLevel.SYNC));
// May happen if account is removed from the device while this screen is shown.
- if (signedInAccountName == null) {
+ if (false) {
// May happen if account is removed from the device while this screen is shown.
getActivity().finish();
if (getActivity() != null) getActivity().finish();
return;
}
patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch
+4 -4
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
index 562e410db22fc0e1d9dc4edec11be1298e32f2f8..3fb00ff2df4b050dde9cf450ed7c426f6d1e4ee9 100644
index 98373d10063d5eab1e0bc4dc177e4880548a515a..d0bc355902113afb740db81e2ec44a95be34c169 100644
--- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
+++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts
@@ -95,6 +95,7 @@ export class ProfilePickerMainViewElement extends
@@ -96,6 +96,7 @@ export class ProfilePickerMainViewElement extends
if (!isProfileCreationAllowed()) {
this.$.addProfile.style.display = 'none';
}
+ this.$.addProfile.style.borderRadius = '8px';
}
override connectedCallback() {
this.addEventListener('view-enter-finish', this.onViewEnterFinish_);
}
patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch
+2 -4
View File
@@ -4,10 +4,8 @@ index 3e6b2000510aea83c4844e7f6dfb13bebd345902..0c3c591fdcbc7ae1d64169a934d9fd9f
+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
@@ -476,7 +476,7 @@ void UpgradeDetectorImpl::Init() {
// On Windows, only enable upgrade notifications for Google Chrome builds.
// Chromium does not use an auto-updater.
-#if !BUILDFLAG(IS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#if !BUILDFLAG(IS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OFFICIAL_BUILD)
-#if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS)
+#if BUILDFLAG(ENABLE_UPDATE_NOTIFICATIONS) || defined(OFFICIAL_BUILD)
// On macOS, only enable upgrade notifications if the updater (Keystone) is
// present.
patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch
+11 -11
View File
@@ -1,26 +1,26 @@
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
index f08c07401bf2e82bb9b38deff45f179ee39c8875..40fa5eab2ce0d2ad7c8269cb174247dae3e2454a 100644
index da8164afe9fac05c7742b50d7d2fe8ae35da646c..8105834589d104b98609114d12068605e070a6bc 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
@@ -43,7 +43,7 @@ public class SiteSettingsCategory {
Type.JAVASCRIPT, Type.MICROPHONE, Type.NFC, Type.NOTIFICATIONS, Type.POPUPS,
@@ -48,7 +48,7 @@ public class SiteSettingsCategory {
Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY,
Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE,
- Type.FEDERATED_IDENTITY_API})
+ Type.FEDERATED_IDENTITY_API, Type.AUTOPLAY})
Type.FEDERATED_IDENTITY_API, Type.THIRD_PARTY_COOKIES, Type.SITE_DATA,
- Type.NUM_ENTRIES})
+ Type.NUM_ENTRIES, Type.AUTOPLAY})
@Retention(RetentionPolicy.SOURCE)
public @interface Type {
// All updates here must also be reflected in {@link #preferenceKey(int)
@@ -74,10 +74,11 @@ public class SiteSettingsCategory {
int AUTO_DARK_WEB_CONTENT = 23;
int REQUEST_DESKTOP_SITE = 24;
@@ -81,10 +81,11 @@ public class SiteSettingsCategory {
int FEDERATED_IDENTITY_API = 25;
+ int AUTOPLAY = 26;
int THIRD_PARTY_COOKIES = 26;
int SITE_DATA = 27;
+ int AUTOPLAY = 28;
/**
* Number of handled categories used for calculating array sizes.
*/
- int NUM_ENTRIES = 26;
+ int NUM_ENTRIES = 27;
- int NUM_ENTRIES = 28;
+ int NUM_ENTRIES = 29;
}
private final BrowserContextHandle mBrowserContextHandle;
patches/components-infobars-core-infobar_delegate.h.patch
+3 -3
View File
@@ -1,11 +1,11 @@
diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
index 9c26957e515756df49bf61486c92b2f97330d464..323ee720d5b46e752aa2d85774fa58b23e92e6a5 100644
index 871bf785bf863ade7cdaa279a8c85626deb209a7..b689d147d12d8a745fb5667e9f33e78bce24323d 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -180,6 +180,7 @@ class InfoBarDelegate {
SUPPORTED_LINKS_INFOBAR_DELEGATE_CHROMEOS = 109,
@@ -181,6 +181,7 @@ class InfoBarDelegate {
AUTOFILL_VIRTUAL_CARD_ENROLLMENT_INFOBAR_DELEGATE_MOBILE = 110,
TAILORED_SECURITY_SERVICE_INFOBAR_DELEGATE = 111,
CHROME_FOR_TESTING_INFOBAR_DELEGATE = 112,
+ BRAVE_INFOBAR_DELEGATE_IDENTIFIERS
};
patches/components-omnibox-browser-autocomplete_controller.cc.patch
+3 -3
View File
@@ -1,5 +1,5 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index b8d4c7b5e588d43296acdcfcbd919c376d1976cc..8b413a805302380eb3b0863d0876324f040bfa9c 100644
index 30dcfc8c8a045207171d5b6887bf82a55f5b8763..5f858eed720ba95057bb9f42cc2ea0df07a0723f 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -347,6 +347,7 @@ AutocompleteController::AutocompleteController(
@@ -10,11 +10,11 @@ index b8d4c7b5e588d43296acdcfcbd919c376d1976cc..8b413a805302380eb3b0863d0876324f
}
// Providers run in the order they're added. Add `HistoryURLProvider` after
// `SearchProvider` because:
@@ -993,6 +994,7 @@ void AutocompleteController::UpdateResult(
@@ -953,6 +954,7 @@ void AutocompleteController::UpdateResult(
#if DCHECK_IS_ON()
result_.Validate();
#endif // DCHECK_IS_ON()
+ BRAVE_AUTOCOMPLETE_CONTROLLER_UPDATE_RESULT
// Below are all annotations after the match list is ready.
if (!input_.IsZeroSuggest()) {
patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch
+2 -2
View File
@@ -1,5 +1,5 @@
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
index 12d10cc3059df7946a436561fc8b7b08bfe4af1a..f6b195d894ff3646c521455ada712e40b509ed4c 100644
index 2c44c3d9c4622167aa861bd9efae678b49140d31..227b2020b4c54cbdcf3a608f108a5b2936788978 100644
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
@@ -150,6 +150,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
@@ -9,4 +9,4 @@ index 12d10cc3059df7946a436561fc8b7b08bfe4af1a..f6b195d894ff3646c521455ada712e40
+ BRAVE_IS_ENHANCED_PROTECTION_ENABLED
// SafeBrowsingEnabled is checked too due to devices being out
// of sync or not on a version that includes SafeBrowsingEnhanced pref.
return base::FeatureList::IsEnabled(kEnhancedProtection) &&
return prefs.GetBoolean(prefs::kSafeBrowsingEnhanced) &&
patches/components-sync-protocol-device_info_specifics.proto.patch
+5 -5
View File
@@ -1,5 +1,5 @@
diff --git a/components/sync/protocol/device_info_specifics.proto b/components/sync/protocol/device_info_specifics.proto
index bbced6284dd0f7611de6661c6be6322fca3d0705..b9614d3b9d8dac6cc959f4899c18421ae779408c 100644
index 99fb9895edd4830129068f3f0d47714942d0be67..a989d86d2a2f2b589032eefc9b42b00e96a19c36 100644
--- a/components/sync/protocol/device_info_specifics.proto
+++ b/components/sync/protocol/device_info_specifics.proto
@@ -17,6 +17,7 @@ option optimize_for = LITE_RUNTIME;
@@ -10,10 +10,10 @@ index bbced6284dd0f7611de6661c6be6322fca3d0705..b9614d3b9d8dac6cc959f4899c18421a
// Information about a device that is running a sync-enabled Chrome browser. We
// are mapping the per-client cache guid to more specific information about the
@@ -90,6 +91,7 @@ message DeviceInfoSpecifics {
ChromeVersionInfo chrome_version_info = 17;
GooglePlayServicesVersionInfo google_play_services_version_info = 18;
}
@@ -96,6 +97,7 @@ message DeviceInfoSpecifics {
// The form factor of the device.
optional SyncEnums.DeviceFormFactor device_form_factor = 20;
+ optional BraveSpecificFields brave_fields = 1000;
}
patches/services-network-cookie_settings.cc.patch
+3 -3
View File
@@ -1,12 +1,12 @@
diff --git a/services/network/cookie_settings.cc b/services/network/cookie_settings.cc
index 8aa5f5eb69f4eb0a2f5e2b67f3030ce7696b379f..33bbfccc611ebf1397dea7f0e1934e14facccb14 100644
index 33169c2d85a48528ad105b2892a0fa0742f9a207..c4fe5e6b9e37ceb79921a4681d74e9a2091c6d09 100644
--- a/services/network/cookie_settings.cc
+++ b/services/network/cookie_settings.cc
@@ -256,6 +256,7 @@ CookieSettings::GetCookieSettingWithMetadata(const GURL& url,
@@ -228,6 +228,7 @@ CookieSettings::GetCookieSettingWithMetadata(
match) {
cookie_setting = match->GetContentSetting();
found_explicit_setting = IsExplicitSetting(*match);
+ BRAVE_COOKIE_SETTINGS_GET_COOKIE_SETTINGS_INTERNAL
}
if (cookie_setting != CONTENT_SETTING_BLOCK && !found_explicit_setting) {
bool allowed_by_storage_access_grant = false;
patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
index db72e5edb2f0ae5df1553acae5b6bfb16b30dcfd..6d6301548235252380998f0b70528c6156874b72 100644
index 08c058b88ac7c23992979fdd400a8657b645b290..1589f01b63a4d7fadd0623a5d24408a950ee2646 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -2600,6 +2600,7 @@ generated_interface_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h",
@@ -2616,6 +2616,7 @@ generated_interface_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.h",
]
+generated_interface_sources_in_modules += brave_generated_interface_sources_in_modules
patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch
+3 -3
View File
@@ -1,9 +1,9 @@
diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni
index fec4479cbc6398a2e1c348f22b98339ae38a31be..894e500220b141fd77b88d2f7eb63c4d3e1e08ce 100644
index bc608ab9820fd21c1010432ce25a2a63517e1d9f..6ece31bc8f8fcc733e29b8929a4c8748f3eadd7c 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -1173,6 +1173,7 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl",
@@ -1175,6 +1175,7 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl",
],
"abspath")
+static_idl_files_in_modules += get_path_info(brave_static_idl_files_in_modules, "abspath")