Commit 187fe11c authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch '4996-all-upstreamBrowser' into 'master'

Browser: Bump to version 100.0.4896.57

See merge request !45
parents 221d246a 453791f1
Pipeline #176215 passed with stages
in 549 minutes and 21 seconds
bromite @ 692764d0
Subproject commit 35e91703127cc39bf917bc5b51bc947be4729561
Subproject commit 692764d0733a5a3d62e383cd4b8d378d611cdf24
......@@ -58,7 +58,9 @@ function patch() {
PATCHES_LIST=$(cat "${ROOT_DIR}/bromite/build/bromite_patches_list.txt" "${ROOT_DIR}/build/e_patches_list.txt")
for file in $PATCHES_LIST; do
echo " -> Apply $file"
git apply "${ROOT_DIR}/bromite/build/patches/$file"
git config --global user.name "John Doe"
git config --global user.email "johndoe@example.com"
git am < "${ROOT_DIR}/bromite/build/patches/$file"
echo " "
done
gclient runhooks
......@@ -67,7 +69,7 @@ function patch() {
function build() {
local out="out/${BUILDID}_${ARCH}"
echo ">> [$(date)] Build for ${ARCH}"
gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/bromite.gn_args) target_cpu=\"${ARCH}\" " "$out"
gn gen --args="$(cat "${ROOT_DIR}"/build/browser.gn_args) target_cpu=\"${ARCH}\" " "$out"
autoninja -C "$out" chrome_public_apk system_webview_apk
cp "$out/apks/ChromePublic.apk" "${ROOT_DIR}/apks/ChromePublic_$ARCH.apk"
cp "$out/apks/SystemWebView.apk" "${ROOT_DIR}/apks/SystemWebView_$ARCH.apk"
......
android_channel="stable"
blink_symbol_level=1
build_contextual_search=false
build_with_tflite_lib=false
chrome_pgo_phase=0
dcheck_always_on=false
debuggable_apks=false
dfmify_dev_ui=false
disable_android_lint=true
disable_autofill_assistant_dfm=true
disable_fieldtrial_testing_config=true
disable_tab_ui_dfm=true
enable_av1_decoder=true
enable_dav1d_decoder=true
enable_gvr_services=false
enable_hangout_services_extension=false
enable_iterator_debugging=false
enable_mdns=false
enable_mse_mpeg2ts_stream_parser=true
enable_nacl=false
enable_platform_dolby_vision=true
enable_platform_hevc=true
enable_remoting=false
enable_reporting=false
enable_supervised_users=false
enable_vr=false
exclude_unwind_tables=false
ffmpeg_branding="Chrome"
icu_use_data_file=true
is_cfi=true
is_component_build=false
is_debug=false
is_official_build=true
proprietary_codecs=true
rtc_build_examples=false
safe_browsing_mode=0
symbol_level=1
system_webview_package_name="com.android.webview"
target_os="android"
use_cfi_cast=true
use_debug_fission=true
use_errorprone_java_compiler=false
use_gnome_keyring=false
use_official_google_api_keys=false
use_rtti=false
use_sysroot=false
webview_includes_weblayer=false
......@@ -4,12 +4,10 @@
0004-Browser-Point-to-our-default-popular-sites.patch
0005-Browser-Enable-do-not-track-by-default.patch
0006-Browser-Add-provider-to-share-default-search-engine.patch
0007-Browser-Disable-async-DNS-by-default-on-Android.patch
0008-Browser-Enable-custom-tabs-by-default.patch
0009-Browser-Enable-search-suggestion-by-default.patch
0010-Browser-Hide-and-disable-touch-to-search-option.patch
0011-Browser-Modify-default-search-engines.patch
0012-Browser-Redirect-users-to-e-foundation-docs.patch
0013-Revert-Bromite-auto-updater.patch
0014-Revert-Block-gateway-attacks-via-websockets.patch
0015-Revert-Disable-unified-autoplay-feature.patch
0007-Browser-Enable-custom-tabs-by-default.patch
0008-Browser-Enable-search-suggestion-by-default.patch
0009-Browser-Modify-default-search-engines.patch
0010-Browser-Redirect-users-to-e-foundation-docs.patch
0011-Revert-Bromite-auto-updater.patch
0012-Revert-Block-gateway-attacks-via-websockets.patch
0013-Revert-Disable-unified-autoplay-feature.patch
From 66fb1b82194577018afe73475fd5dac22e4d5b6a Mon Sep 17 00:00:00 2001
From 8aefc955dec1242bc7671d961f3fca2661bdacd7 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 05:39:25 +0000
Subject: [PATCH 01/15] Browser: Change app and package name to browser
Subject: [PATCH 01/13] Browser: Change app and package name to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -10,10 +10,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 465896c955bf0..da21f309f2e78 100644
index db951d4f1470a..0697a16792cf2 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
@@ -44,16 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
assert(current_toolchain != android_secondary_abi_toolchain)
}
......@@ -31,7 +31,7 @@ index 465896c955bf0..da21f309f2e78 100644
declare_args() {
# Android package name to use when compiling the public chrome targets
@@ -64,7 +55,7 @@ declare_args() {
@@ -65,7 +56,7 @@ declare_args() {
# for details.
chrome_public_manifest_package = _default_package
}
......
From 2b2222b83bc5d7a1dee12620214d3c79bb7bc25f Mon Sep 17 00:00:00 2001
From 3bfd9c07913dbc4e9129f53449c0d856dd3f28d1 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:12:30 +0000
Subject: [PATCH 03/15] Browser: Rename strings to browser
Subject: [PATCH 03/13] Browser: Rename strings to browser
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -81,7 +81,7 @@ index 68f0aab29c05d..1808959db4eb9 100644
android:key="application_version"
android:title="@string/application_version_title" />
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
index 9ffac62f8eba4..96b71187ea2f0 100644
index 82e16ba250327..d404521b5cba3 100644
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -110,6 +110,6 @@
......@@ -93,7 +93,7 @@ index 9ffac62f8eba4..96b71187ea2f0 100644
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
index 182e2078b87c8..1fad9b8cd920c 100644
index c874a07351712..6fd881230db7f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
@@ -36,7 +36,7 @@ public class AboutChromeSettings
......@@ -128,7 +128,7 @@ index 182e2078b87c8..1fad9b8cd920c 100644
ChromeSwitchPreference allowInlineUpdate =
(ChromeSwitchPreference) findPreference(PREF_ALLOW_INLINE_UPDATE);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java
index 69f2ba955ca4e..308181c06128e 100644
index a78a720298bb4..69863b791ccc2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java
@@ -86,7 +86,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli
......@@ -159,20 +159,20 @@ index 69f2ba955ca4e..308181c06128e 100644
}
}
diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
index bdad48714fd0a..d37700a9cf527 100644
index e92bc2b2739c2..af6d85d9da4cd 100644
--- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
+++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
@@ -106,7 +106,7 @@ public class WebContentsDarkModeMessageController {
Resources resources = activity.getResources();
boolean optOut = ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING, OPT_OUT_PARAM, true);
- String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title)
+ String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title_e)
: resources.getString(R.string.auto_dark_message_opt_in_title);
PropertyModel message =
new PropertyModel.Builder(MessageBannerProperties.ALL_KEYS)
@@ -129,7 +129,7 @@ public class WebContentsDarkModeMessageController {
.with(MessageBannerProperties.ICON_TINT_COLOR,
MessageBannerProperties.TINT_NONE)
.with(MessageBannerProperties.TITLE,
- resources.getString(R.string.auto_dark_message_title))
+ resources.getString(R.string.auto_dark_message_title_e))
.with(MessageBannerProperties.DESCRIPTION, description)
.with(MessageBannerProperties.PRIMARY_BUTTON_TEXT,
resources.getString(R.string.auto_dark_message_button))
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 465e988c4b538..2bb1965e7faad 100644
index 09dbbf7ac668d..af8fdbc61351a 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -198,6 +198,8 @@ CHAR_LIMIT guidelines:
......
From 652fee781e167e3f31866b4aa5461da890f7c06c Mon Sep 17 00:00:00 2001
From 2fa7ca2f795dc034501c6d6231668a58b1a71330 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:29:59 +0000
Subject: [PATCH 04/15] Browser: Point to our default popular sites
Subject: [PATCH 04/13] Browser: Point to our default popular sites
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From d3807831da08fd4b8b57b42ad15137e67507c4c4 Mon Sep 17 00:00:00 2001
From 1c2531bb6e1354cce238ae1b20d13cf0041c7a82 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:34:57 +0000
Subject: [PATCH 05/15] Browser: Enable do not track by default
Subject: [PATCH 05/13] Browser: Enable do not track by default
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -9,7 +9,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 5a0ab16f3bd41..e182299bbc871 100644
index 81c32af81d6a5..868d0d3e9b603 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -88,7 +88,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
......@@ -19,7 +19,7 @@ index 5a0ab16f3bd41..e182299bbc871 100644
- prefs::kEnableDoNotTrack, false,
+ prefs::kEnableDoNotTrack, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_ANDROID)
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
registry->RegisterBooleanPref(prefs::kPrintPreviewUseSystemDefaultPrinter,
--
2.25.1
......
From 4d2a1341f13ec9d599673a4b76521e49d3adf5b8 Mon Sep 17 00:00:00 2001
From 0ce1b87a84dda67444c50e735d09fdb01ba8b2f0 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:03:13 +0000
Subject: [PATCH 06/15] Browser: Add provider to share default search engine
Subject: [PATCH 06/13] Browser: Add provider to share default search engine
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -12,10 +12,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 0f7d00b646f24..3345822fc5528 100644
index c5e9e64823521..16c2479ac3019 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1264,6 +1264,12 @@ by a child template that "extends" this file.
@@ -1259,6 +1259,12 @@ by a child template that "extends" this file.
android:readPermission="android.permission.GLOBAL_SEARCH" />
</provider>
......
From 5354ab198a304d8808ade53e594b54aa8571b902 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 08:26:03 +0000
Subject: [PATCH 07/15] Browser: Disable async DNS by default on Android
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
chrome/common/chrome_features.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 2e4055d0a2ac3..68c2fd6b25348 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -102,7 +102,7 @@ const base::Feature kArcPiGhostWindow{"ArcPiGhostWindow",
// Enables the built-in DNS resolver.
const base::Feature kAsyncDns {
"AsyncDns",
-#if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_ANDROID)
+#if defined(OS_CHROMEOS) || defined(OS_MAC)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
--
2.25.1
From 640e5044eddae6bac3b3b4c39be8d04af9b8017d Mon Sep 17 00:00:00 2001
From bbeef442401a2b4ea85c0d1698fd56fbe4cdbef9 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:37:37 +0000
Subject: [PATCH 08/15] Browser: Enable custom tabs by default
Subject: [PATCH 07/13] Browser: Enable custom tabs by default
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
......@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
index 7ecd27f213a60..1dbf8ac3662f5 100644
index 4f5751b297aba..92c13bd579f6b 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -69,7 +69,7 @@
@@ -70,7 +70,7 @@
android:key="allow_custom_tab_intents"
android:title="@string/allow_custom_tab_intents_title"
android:summary="@string/allow_custom_tab_intents_summary"
......
From 7d046c35475890e9571b91f2b80bf4ca606b30db Mon Sep 17 00:00:00 2001
From 8da94cb4b036764ee70399523f33cf1f8946023f Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:39:21 +0000
Subject: [PATCH 09/15] Browser: Enable search suggestion by default
Subject: [PATCH 08/13] Browser: Enable search suggestion by default
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
......@@ -9,17 +9,17 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 43ae6997d3616..0dc159f23aff9 100644
index ac4c9d25ccd8b..c196f5d2fe85a 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -277,7 +277,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
@@ -275,7 +275,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
- false,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if defined(OS_ANDROID)
#if BUILDFLAG(IS_ANDROID)
registry->RegisterStringPref(
--
2.25.1
......
From 4b1579888cc0e39a06645bbc03020531e1cb5b2e Mon Sep 17 00:00:00 2001
From b8b9c69eadda5428b758be90cde4be89ad88a1fb Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Thu, 18 Mar 2021 13:42:44 +0100
Subject: [PATCH 11/15] Browser: Modify default search engines
Subject: [PATCH 09/13] Browser: Modify default search engines
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......@@ -94,10 +94,10 @@ index f0ee14d25c73a..9aa4ca1056519 100644
LocaleTemplateUrlLoader(const LocaleTemplateUrlLoader&) = delete;
LocaleTemplateUrlLoader& operator=(const LocaleTemplateUrlLoader&) = delete;
diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java
index 8afdf8a188da6..91e38d859ded6 100644
index b9d3925f030c9..416a8a7834852 100644
--- a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java
+++ b/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/LocaleManagerDelegate.java
@@ -155,7 +155,6 @@ public class LocaleManagerDelegate {
@@ -154,7 +154,6 @@ public class LocaleManagerDelegate {
*/
private void revertDefaultSearchEngineOverride() {
if (!isSearchEngineAutoSwitchEnabled() || isSpecialLocaleEnabled()) return;
......@@ -188,7 +188,7 @@ index ecbd15614ef0a..20b6bc09e1029 100644
// First check the main search URL.
if (SameDomain(
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index cec97482174c0..cd4139699416f 100644
index 44784f4915414..78bd426a5fbb8 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -29,9 +29,7 @@ namespace {
......
From d6d54702aa37d9527984ba4c1dc5973230dc1be0 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 29 Nov 2021 03:54:44 +0000
Subject: [PATCH 10/15] Browser: Hide and disable touch to search option
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
chrome/android/java/res/xml/privacy_preferences.xml | 3 ++-
.../contextualsearch/ContextualSearchPreferenceFragment.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
index 1dbf8ac3662f5..e1d80fcf744f0 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -92,7 +92,8 @@
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="contextual_search"
android:title="@string/contextual_search_title"
- android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
+ android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"
+ app:isPreferenceVisible="false" />
</PreferenceCategory>
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
index 27f7461a76ad7..58c41debb8450 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java
@@ -44,8 +44,9 @@ public class ContextualSearchPreferenceFragment extends PreferenceFragmentCompat
ChromeSwitchPreference seeBetterResultsSwitch =
(ChromeSwitchPreference) findPreference(PREF_WAS_FULLY_ENABLED_SWITCH);
- boolean isContextualSearchEnabled = !ContextualSearchPolicy.isContextualSearchDisabled();
+ boolean isContextualSearchEnabled = false;
contextualSearchSwitch.setChecked(isContextualSearchEnabled);
+ contextualSearchSwitch.setEnabled(isContextualSearchEnabled);
contextualSearchSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
ContextualSearchPolicy.setContextualSearchState((boolean) newValue);
--
2.25.1
From 6243f3b57e789be15e3cb28e55108645752880e5 Mon Sep 17 00:00:00 2001
From 657c1971c631d686671672be542beb8fdd5341ba Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 11 May 2021 14:22:00 +0200
Subject: [PATCH 12/15] Browser: Redirect users to e foundation docs
Subject: [PATCH 10/13] Browser: Redirect users to e foundation docs
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
......
From e741136669c4e8dd30556797cfd12b9392d94926 Mon Sep 17 00:00:00 2001
From 8e120aa0470ed9c9967787dd630aca7e0e02bfa3 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 22 Feb 2022 06:15:22 +0000
Subject: [PATCH 14/15] Revert "Block gateway attacks via websockets"
Date: Tue, 22 Mar 2022 08:34:04 +0000
Subject: [PATCH 12/13] Revert "Block gateway attacks via websockets"
This reverts commit 76950e51abb18a33a26f7b92dcd48466b54ca086.
This reverts commit eed9daba155d6440f85a55d4ebbf4da3914eedde.
---
.../renderer/core/loader/base_fetch_context.h | 1 -
.../core/loader/frame_fetch_context.cc | 20 --------------
.../core/loader/frame_fetch_context.cc | 20 -------------
.../core/loader/frame_fetch_context.h | 1 -
.../core/loader/worker_fetch_context.cc | 21 ---------------
.../core/loader/worker_fetch_context.cc | 21 --------------
.../core/loader/worker_fetch_context.h | 1 -
.../background_fetch_manager.cc | 2 ++
.../background_fetch_manager.cc | 4 +--
.../websockets/websocket_channel_impl.cc | 5 ----
.../modules/websockets/websocket_common.cc | 27 -------------------
.../modules/websockets/websocket_common.cc | 29 -------------------
.../modules/websockets/websocket_common.h | 4 ---
9 files changed, 2 insertions(+), 80 deletions(-)
9 files changed, 2 insertions(+), 84 deletions(-)
diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h
index 1b99b3e337b7d..d17fba746796f 100644
index 5a560cf29b2c6..36997bb271d63 100644
--- a/third_party/blink/renderer/core/loader/base_fetch_context.h
+++ b/third_party/blink/renderer/core/loader/base_fetch_context.h
@@ -83,7 +83,6 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
......@@ -29,10 +29,10 @@ index 1b99b3e337b7d..d17fba746796f 100644
CreateWebSocketHandshakeThrottle() = 0;
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
index 03548807c147c..05f9979d0220f 100644
index dae7e3d0cea4b..c0b819535f1ef 100644
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
@@ -563,26 +563,6 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
@@ -558,26 +558,6 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
return should_block_request;
}
......@@ -60,10 +60,10 @@ index 03548807c147c..05f9979d0220f 100644
const ResourceRequest& resource_request,
const ResourceLoaderOptions& options,
diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
index be8c5f9d53d04..29d45f66f409f 100644
index 4c1e572df5ab2..06e0907b666d0 100644
--- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
@@ -179,7 +179,6 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
@@ -178,7 +178,6 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
override;
......@@ -123,18 +123,22 @@ index 04eaa276e28e9..52afb756db1db 100644
mojom::blink::RequestContextType request_context,
const absl::optional<ResourceRequest::RedirectInfo>& redirect_info,
diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
index 25273eada64b3..f4f354e335042 100644
index bd653a0ea510e..f4f354e335042 100644
--- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
+++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
@@ -104,6 +104,7 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
@@ -104,10 +104,9 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
const KURL& request_url) {
+ if (RuntimeEnabledFeatures::CorsRFC1918Enabled()) {
network::mojom::IPAddressSpace requestor_space =
execution_context->AddressSpace();
- if (requestor_space == network::mojom::IPAddressSpace::kUnknown)
- requestor_space = network::mojom::IPAddressSpace::kPublic;
@@ -120,6 +121,7 @@ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
// TODO(mkwst): This only checks explicit IP addresses. We'll have to move
// all this up to //net and //content in order to have any real impact on
@@ -122,6 +121,7 @@ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
bool is_external_request = requestor_space > target_space;
if (is_external_request)
return true;
......@@ -143,7 +147,7 @@ index 25273eada64b3..f4f354e335042 100644
return false;
}
diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
index 049807b8ee5a1..7c239642442c6 100644
index f71e9501dfa36..8bb6ff33644d7 100644
--- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
@@ -274,11 +274,6 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
......@@ -159,10 +163,10 @@ index 049807b8ee5a1..7c239642442c6 100644
feature_handle_for_scheduler_ = scheduler->RegisterFeature(
SchedulingPolicy::Feature::kWebSocket,
diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
index 95c141bbe6c1b..2ea9b38c93a72 100644
index 1f53747c74409..2ea9b38c93a72 100644
--- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
@@ -124,36 +124,9 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
@@ -124,38 +124,9 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
return ConnectResult::kException;
}
......@@ -182,6 +186,8 @@ index 95c141bbe6c1b..2ea9b38c93a72 100644
- // TODO(mkwst): This only checks explicit IP addresses. We'll have to move
- // all this up to //net and //content in order to have any real impact on
- // gateway attacks. That turns out to be a TON of work (crbug.com/378566).
- if (requestor_space == network::mojom::IPAddressSpace::kUnknown)
- requestor_space = network::mojom::IPAddressSpace::kPublic;
- network::mojom::IPAddressSpace target_space =
- network::mojom::IPAddressSpace::kPublic;
- if (network_utils::IsReservedIPAddress(request_url.Host()))
......
From 4d3fa0e80e7bd910dcbb326b20e3155f76e4449a Mon Sep 17 00:00:00 2001
From 56a2259f1167e8defc5ab0e0048ca07a37f3694e Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 22 Feb 2022 06:16:17 +0000
Subject: [PATCH 15/15] Revert "Disable unified autoplay feature"
Date: Tue, 22 Mar 2022 08:34:28 +0000
Subject: [PATCH 13/13] Revert "Disable unified autoplay feature"
This reverts commit 528913dad9e9b92436c44de87fa95dcdaf560d19.
This reverts commit a2e273b85e59dc44fb312047ca0cc07692114d3b.
---
media/base/media_switches.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index c81dc5642b702..de0a5fbb23ee2 100644
index 656f1aa83e03f..e210d524f4658 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -464,7 +464,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
@@ -469,7 +469,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
// Enables the Unified Autoplay policy by overriding the platform's default
// autoplay policy.
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
- base::FEATURE_DISABLED_BY_DEFAULT};
+ base::FEATURE_ENABLED_BY_DEFAULT};
#if defined(OS_LINUX)
#if BUILDFLAG(IS_LINUX)
// Enable vaapi video decoding on linux. This is already enabled by default on
--
2.25.1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment