Skip to content

Commit

Permalink
autorebase for 114.0.5735.199
Browse files Browse the repository at this point in the history
bump to 114.0.5735.199
  • Loading branch information
uazo authored Jun 27, 2023
2 parents e6055a9 + a45043a commit e98862d
Show file tree
Hide file tree
Showing 21 changed files with 59 additions and 90 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
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
@@ -969,6 +969,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext,
@@ -965,6 +965,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext,
"ScopeMemoryCachePerContext",
base::FEATURE_DISABLED_BY_DEFAULT);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Require: Timezone-customization.patch
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -7217,6 +7217,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7221,6 +7221,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kFileHandlingIconsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(blink::features::kFileHandlingIcons)},

Expand Down
4 changes: 2 additions & 2 deletions build/patches/00Fonts-fingerprinting-mitigation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -9763,6 +9763,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -9758,6 +9758,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kClipboardUnsanitizedContentDescription, kOsAll,
FEATURE_VALUE_TYPE(blink::features::kClipboardUnsanitizedContent)},

Expand Down Expand Up @@ -155,7 +155,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea

// Enable defer commits to avoid flash of unstyled content, for same origin
// navigation only.
@@ -1550,6 +1550,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent,
@@ -1546,6 +1546,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent,
"ClipboardUnsanitizedContent",
base::FEATURE_DISABLED_BY_DEFAULT);

Expand Down
2 changes: 1 addition & 1 deletion build/patches/00Internal-firewall.patch
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#include "services/media_session/public/cpp/features.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/network_switches.h"
@@ -7863,6 +7864,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7858,6 +7859,11 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)},
#endif // !BUILDFLAG(IS_ANDROID)

Expand Down
24 changes: 0 additions & 24 deletions build/patches/00WIN-ADDTO-Eyeo-Adblock.patch

This file was deleted.

8 changes: 4 additions & 4 deletions build/patches/Add-an-always-incognito-mode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1929,7 +1929,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -118,10 +118,12 @@ void PrefProvider::RegisterProfilePrefs(
@@ -116,10 +116,12 @@ void PrefProvider::RegisterProfilePrefs(

PrefProvider::PrefProvider(PrefService* prefs,
bool off_the_record,
Expand All @@ -1942,7 +1942,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
store_last_modified_(store_last_modified),
clock_(base::DefaultClock::GetInstance()) {
TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider");
@@ -144,10 +146,14 @@ PrefProvider::PrefProvider(PrefService* prefs,
@@ -142,10 +144,14 @@ PrefProvider::PrefProvider(PrefService* prefs,
WebsiteSettingsRegistry* website_settings =
WebsiteSettingsRegistry::GetInstance();
for (const WebsiteSettingsInfo* info : *website_settings) {
Expand All @@ -1969,7 +1969,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
bool store_last_modified,
bool restore_session);

@@ -96,6 +97,7 @@ class PrefProvider : public UserModifiableProvider {
@@ -93,6 +94,7 @@ class PrefProvider : public UserModifiableProvider {
raw_ptr<PrefService> prefs_;

const bool off_the_record_;
Expand Down Expand Up @@ -2016,7 +2016,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
bool store_last_modified,
bool restore_session,
bool should_record_metrics);
@@ -449,6 +450,8 @@ class HostContentSettingsMap : public content_settings::Observer,
@@ -446,6 +447,8 @@ class HostContentSettingsMap : public content_settings::Observer,
// Whether this settings map is for an incognito or guest session.
bool is_off_the_record_;

Expand Down
7 changes: 3 additions & 4 deletions build/patches/Add-autoplay-site-setting.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Require: Content-settings-infrastructure.patch
.../drawable-xxxhdpi/settings_autoplay.png | Bin 0 -> 1064 bytes
.../impl/BromiteAutoplayContentSetting.java | 92 ++++++++++++++++++
.../bromite_content_settings/autoplay.grdp | 21 ++++
.../bromite_content_settings/autoplay.inc | 13 +++
.../bromite_content_settings/autoplay.inc | 12 +++
.../core/browser/content_settings_registry.cc | 2 +-
.../core/html/media/autoplay_policy.cc | 14 +++
.../core/html/media/autoplay_policy.h | 4 +
11 files changed, 145 insertions(+), 1 deletion(-)
11 files changed, 144 insertions(+), 1 deletion(-)
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_autoplay.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png
Expand Down Expand Up @@ -262,7 +262,7 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/a
new file mode 100644
--- /dev/null
+++ b/components/content_settings/core/browser/bromite_content_settings/autoplay.inc
@@ -0,0 +1,13 @@
@@ -0,0 +1,12 @@
+ content_settings::WebsiteSettingsRegistry::GetInstance()
+ ->GetMutable(ContentSettingsType::AUTOPLAY)
+ ->set_show_into_info_page()
Expand All @@ -275,7 +275,6 @@ new file mode 100644
+ .set_allowed_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_ALLOWED_EXCEPTIONS)
+ .set_blocked_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_BLOCKED_EXCEPTIONS)
+ .set_mid_sentence_ui(IDS_AUTOPLAY_PERMISSION_TITLE);
+
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
Expand Down
20 changes: 10 additions & 10 deletions build/patches/Add-lifetime-options-for-permissions.patch
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
import org.chromium.components.embedder_support.util.Origin;
import org.chromium.content_public.browser.BrowserContextHandle;
import org.chromium.content_public.browser.ContentFeatureList;
@@ -545,6 +546,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -527,6 +528,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
}
}

Expand All @@ -296,7 +296,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
private void setUpClearDataPreference() {
ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
long usage = mSite.getTotalUsage();
@@ -974,6 +980,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
@@ -956,6 +962,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
if (contentType == mHighlightedPermission) {
switchPreference.setBackgroundColor(mHighlightColor);
}
Expand Down Expand Up @@ -371,7 +371,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
--- a/components/browser_ui/strings/android/browser_ui_strings.grd
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
@@ -602,6 +602,11 @@
@@ -600,6 +600,11 @@
<message name="IDS_PAGE_INFO_URL_TRUNCATED" desc="Accessibility announcement when the URL in PageInfo switches from full to truncated display">
URL truncated
</message>
Expand All @@ -397,7 +397,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -191,6 +191,35 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
@@ -182,6 +182,35 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
return base::Time::Now() + duration;
}

Expand Down Expand Up @@ -518,7 +518,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
}
}

@@ -124,13 +129,15 @@ public class PermissionParamsListBuilder {
@@ -123,13 +128,15 @@ public class PermissionParamsListBuilder {
public final String nameMidSentence;
public final int type;
public final @ContentSettingValues int setting;
Expand All @@ -538,7 +538,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
--- a/components/page_info/android/page_info_controller_android.cc
+++ b/components/page_info/android/page_info_controller_android.cc
@@ -164,6 +164,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -153,6 +153,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(

std::map<ContentSettingsType, ContentSetting>
user_specified_settings_to_display;
Expand All @@ -547,7 +547,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp

for (const auto& permission : permission_info_list) {
if (base::Contains(permissions_to_display, permission.type)) {
@@ -172,6 +174,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -161,6 +163,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
if (setting_to_display) {
user_specified_settings_to_display[permission.type] =
*setting_to_display;
Expand All @@ -556,7 +556,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
}
}
}
@@ -188,7 +192,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -177,7 +181,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
ConvertUTF16ToJavaString(env, setting_title),
ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
static_cast<jint>(permission),
Expand All @@ -566,7 +566,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
}
}

@@ -201,7 +206,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
@@ -190,7 +195,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
ConvertUTF16ToJavaString(env, object_title),
static_cast<jint>(chosen_object->ui_info->content_settings_type),
Expand All @@ -579,7 +579,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -1234,6 +1234,8 @@ void PageInfo::PresentSitePermissions() {
@@ -1198,6 +1198,8 @@ void PageInfo::PresentSitePermissions() {
permission_info.source = info.source;
permission_info.is_one_time = (info.metadata.session_model ==
content_settings::SessionModel::OneTime);
Expand Down
7 changes: 3 additions & 4 deletions build/patches/Add-webGL-site-setting.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../impl/BromiteWebGLContentSetting.java | 92 +++++++++++++++++++
.../bromite_content_settings/webgl.grdp | 27 ++++++
.../bromite_content_settings/webgl.inc | 23 +++++
.../bromite_content_settings/webgl.inc | 22 +++++
.../common/bromite_content_settings/WEBGL.inc | 1 +
.../execution_context/execution_context.cc | 7 ++
.../execution_context/execution_context.h | 2 +
.../webgl/webgl_rendering_context_base.cc | 32 +++----
.../webgl/webgl_rendering_context_base.h | 2 +
8 files changed, 167 insertions(+), 19 deletions(-)
8 files changed, 166 insertions(+), 19 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteWebGLContentSetting.java
create mode 100644 components/browser_ui/strings/bromite_content_settings/webgl.grdp
create mode 100644 components/content_settings/core/browser/bromite_content_settings/webgl.inc
Expand Down Expand Up @@ -156,7 +156,7 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/w
new file mode 100644
--- /dev/null
+++ b/components/content_settings/core/browser/bromite_content_settings/webgl.inc
@@ -0,0 +1,23 @@
@@ -0,0 +1,22 @@
+ Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK,
+ WebsiteSettingsInfo::SYNCABLE,
+ /*allowlisted_schemes=*/{},
Expand All @@ -179,7 +179,6 @@ new file mode 100644
+ .set_allowed_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_WEBGL_ALLOWED_EXCEPTIONS)
+ .set_blocked_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_WEBGL_BLOCKED_EXCEPTIONS)
+ .set_mid_sentence_ui(IDS_SITE_SETTINGS_TYPE_WEBGL);
+
diff --git a/components/content_settings/core/common/bromite_content_settings/WEBGL.inc b/components/content_settings/core/common/bromite_content_settings/WEBGL.inc
new file mode 100644
--- /dev/null
Expand Down
7 changes: 3 additions & 4 deletions build/patches/Add-webRTC-site-settings.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../impl/BromiteWebRTCContentSetting.java | 93 +++++++++++++++++++
.../bromite_content_settings/webrtc.grdp | 27 ++++++
.../bromite_content_settings/webrtc.inc | 23 +++++
.../bromite_content_settings/webrtc.inc | 22 +++++
.../bromite_content_settings/WEBRTC.inc | 1 +
.../peer_connection_dependency_factory.cc | 6 ++
.../peerconnection/rtc_rtp_receiver.cc | 10 ++
.../modules/peerconnection/rtc_rtp_sender.cc | 10 ++
7 files changed, 170 insertions(+)
7 files changed, 169 insertions(+)
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteWebRTCContentSetting.java
create mode 100644 components/browser_ui/strings/bromite_content_settings/webrtc.grdp
create mode 100644 components/content_settings/core/browser/bromite_content_settings/webrtc.inc
Expand Down Expand Up @@ -154,7 +154,7 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/w
new file mode 100644
--- /dev/null
+++ b/components/content_settings/core/browser/bromite_content_settings/webrtc.inc
@@ -0,0 +1,23 @@
@@ -0,0 +1,22 @@
+ Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK,
+ WebsiteSettingsInfo::SYNCABLE,
+ /*allowlisted_schemes=*/{},
Expand All @@ -177,7 +177,6 @@ new file mode 100644
+ .set_allowed_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_WEBRTC_ALLOWED_EXCEPTIONS)
+ .set_blocked_exceptions_ui(IDS_SETTINGS_SITE_SETTINGS_WEBRTC_BLOCKED_EXCEPTIONS)
+ .set_mid_sentence_ui(IDS_SITE_SETTINGS_TYPE_WEBRTC_MID_SENTENCE);
+
diff --git a/components/content_settings/core/common/bromite_content_settings/WEBRTC.inc b/components/content_settings/core/common/bromite_content_settings/WEBRTC.inc
new file mode 100644
--- /dev/null
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Block-gateway-attacks-via-websockets.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -781,4 +781,20 @@ void ExecutionContext::WriteIntoTrace(
@@ -758,4 +758,20 @@ void ExecutionContext::WriteIntoTrace(
proto->set_world_type(GetWorldType(*this));
}

Expand All @@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -413,6 +413,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
@@ -408,6 +408,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);

HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
Expand Down
7 changes: 3 additions & 4 deletions build/patches/Content-settings-infrastructure.patch
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Require: bromite-build-utils.patch
.../WebsitePreferenceBridge.java | 3 +-
.../impl/include_all_directory.java | 1 +
...miteCustomContentSettingImplBase.java.tmpl | 48 +++
.../bromite_content_settings/placeholder.txt | 2 +
.../bromite_content_settings/placeholder.txt | 1 +
components/content_settings/android/BUILD.gn | 1 +
.../content_settings/core/browser/BUILD.gn | 7 +
.../bromite_content_settings/placeholder.txt | 1 +
Expand Down Expand Up @@ -72,7 +72,7 @@ Require: bromite-build-utils.patch
.../execution_context/execution_context.cc | 16 +
.../execution_context/execution_context.h | 5 +
.../WebLayerSiteSettingsDelegate.java | 3 +
61 files changed, 1322 insertions(+), 41 deletions(-)
61 files changed, 1321 insertions(+), 41 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting_README.md
Expand Down Expand Up @@ -1794,9 +1794,8 @@ diff --git a/components/browser_ui/strings/bromite_content_settings/placeholder.
new file mode 100644
--- /dev/null
+++ b/components/browser_ui/strings/bromite_content_settings/placeholder.txt
@@ -0,0 +1,2 @@
@@ -0,0 +1 @@
+this file is intentionally empty
+
diff --git a/components/content_settings/android/BUILD.gn b/components/content_settings/android/BUILD.gn
--- a/components/content_settings/android/BUILD.gn
+++ b/components/content_settings/android/BUILD.gn
Expand Down
Loading

0 comments on commit e98862d

Please sign in to comment.