Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce0831ac authored by csagan5's avatar csagan5 Committed by Carl
Browse files

More v108 patch updates

parent 4d9aeafe

build/patches/Add-webGL-site-setting.patch

+8 −8
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn

--- a/components/browser_ui/site_settings/android/BUILD.gn

+++ b/components/browser_ui/site_settings/android/BUILD.gn

@@ -89,6 +89,9 @@ android_library("java") {

@@ -92,6 +92,9 @@ android_library("java") {

     "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java",

     "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java",

   ]
@@ -222,7 +222,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g 
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

@@ -682,6 +682,20 @@ void ContentSettingsRegistry::Init() {

@@ -669,6 +669,20 @@ void ContentSettingsRegistry::Init() {

            ContentSettingsInfo::INHERIT_IN_INCOGNITO,

            ContentSettingsInfo::PERSISTENT,

            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -258,7 +258,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc 
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc

--- a/components/content_settings/core/common/content_settings.cc

+++ b/components/content_settings/core/common/content_settings.cc

@@ -205,7 +205,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(

@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(

          content_type == ContentSettingsType::AUTOPLAY ||

          content_type == ContentSettingsType::MIXEDSCRIPT ||

          content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
@@ -268,7 +268,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo 
 }

 

 void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(

@@ -217,6 +218,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(

@@ -218,6 +219,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(

   FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url);

   FilterRulesForType(timezone_override_rules, outermost_main_frame_url);

   FilterRulesForType(autoplay_rules, outermost_main_frame_url);
@@ -327,7 +327,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai 
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h

--- a/components/content_settings/core/common/content_settings_types.h

+++ b/components/content_settings/core/common/content_settings_types.h

@@ -276,6 +276,8 @@ enum class ContentSettingsType : int32_t {

@@ -277,6 +277,8 @@ enum class ContentSettingsType : int32_t {

   // site instead of the mobile one.

   REQUEST_DESKTOP_SITE,
@@ -436,7 +436,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context 
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc

--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc

+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc

@@ -244,6 +244,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(

@@ -246,6 +246,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(

   }

 }
@@ -450,7 +450,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba 
 unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {

   base::AutoLock locker(WebGLContextLimitLock());

   DCHECK(webgl_context_limits_initialized_);

@@ -490,25 +497,6 @@ static String ExtractWebGLContextCreationError(

@@ -492,25 +499,6 @@ static String ExtractWebGLContextCreationError(

     const Platform::GraphicsInfo& info) {

   StringBuilder builder;

   builder.Append("Could not create a WebGL context");
@@ -476,7 +476,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba 
   FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),

                           builder);

   builder.Append('.');

@@ -576,6 +564,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(

@@ -578,6 +566,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(

     const CanvasContextCreationAttributesCore& attributes,

     Platform::ContextType context_type,

     Platform::GraphicsInfo* graphics_info) {

build/patches/Add-webRTC-site-settings.patch

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn

--- a/components/browser_ui/site_settings/android/BUILD.gn

+++ b/components/browser_ui/site_settings/android/BUILD.gn

@@ -92,6 +92,9 @@ android_library("java") {

@@ -95,6 +95,9 @@ android_library("java") {

   sources += [

     "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java",

   ]
@@ -218,7 +218,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g 
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

@@ -696,6 +696,20 @@ void ContentSettingsRegistry::Init() {

@@ -683,6 +683,20 @@ void ContentSettingsRegistry::Init() {

            /*show_into_info_page*/ true,

            /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL,

            /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE);
@@ -254,7 +254,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc 
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc

--- a/components/content_settings/core/common/content_settings.cc

+++ b/components/content_settings/core/common/content_settings.cc

@@ -206,7 +206,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(

@@ -207,7 +207,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(

          content_type == ContentSettingsType::MIXEDSCRIPT ||

          content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||

          content_type == ContentSettingsType::TIMEZONE_OVERRIDE ||
@@ -264,7 +264,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo 
 }

 

 void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(

@@ -219,6 +220,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(

@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(

   FilterRulesForType(timezone_override_rules, outermost_main_frame_url);

   FilterRulesForType(autoplay_rules, outermost_main_frame_url);

   FilterRulesForType(webgl_rules, outermost_main_frame_url);
@@ -323,7 +323,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai 
diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h

--- a/components/content_settings/core/common/content_settings_types.h

+++ b/components/content_settings/core/common/content_settings_types.h

@@ -278,6 +278,8 @@ enum class ContentSettingsType : int32_t {

@@ -279,6 +279,8 @@ enum class ContentSettingsType : int32_t {

 

   WEBGL,

build/patches/Bromite-package-name.patch

+12 −10
Original line number Diff line number Diff line
@@ -8,16 +8,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index 432569612196b..b75cfc77f4e54 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -42,7 +42,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {

   assert(current_toolchain != android_secondary_abi_toolchain)

 }

@@ -47,7 +47,7 @@ chrome_jni_registration_header =

 chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"

 

 if (current_toolchain == default_toolchain) {

-  _default_package = "org.chromium.chrome"

+  _default_package = "org.bromite.bromite"

 if (android_channel != "default" && android_channel != "stable") {

   # android-binary-size trybot may checks if an internal Chrome variant's

   # AndroidManifest is as expected by ensuring the differences between its

   if (use_stable_package_name_for_trichrome) {

     _default_package += ".stable"

   } else if (android_channel != "default" && android_channel != "stable") {

-- 

2.25.1
 
2.30.2

build/patches/Content-settings-infrastructure.patch

+15 −15
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn

--- a/components/browser_ui/site_settings/android/BUILD.gn

+++ b/components/browser_ui/site_settings/android/BUILD.gn

@@ -85,6 +85,10 @@ android_library("java") {

@@ -88,6 +88,10 @@ android_library("java") {

     "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java",

     "java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java"

     "java/src/org/chromium/components/browser_ui/site_settings/WebsiteRowPreference.java",

   ]

+  sources += [

+    "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java",
@@ -763,7 +763,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java

--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java

+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java

@@ -41,6 +41,7 @@ import org.chromium.content_public.browser.ContentFeatureList;

@@ -42,6 +42,7 @@ import org.chromium.content_public.browser.ContentFeatureList;

 import java.util.Collection;

 import java.util.HashMap;

 import java.util.Map;
@@ -771,7 +771,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
 

 /**

  * Shows the permissions and other settings for a particular website.

@@ -168,7 +169,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

@@ -171,7 +172,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

             case ContentSettingsType.CLIPBOARD_READ_WRITE:

                 return "clipboard_permission_list";

             default:
@@ -780,7 +780,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
         }

     }

 

@@ -493,7 +494,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

@@ -504,7 +505,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

 

     private void setupContentSettingsPreferences() {

         mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder();
@@ -790,7 +790,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
             Preference preference = new ChromeSwitchPreference(getStyledContext());

             preference.setKey(getPreferenceKey(type));

 

@@ -908,16 +910,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

@@ -945,16 +947,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

 

     private void setupContentSettingsPreference(Preference preference,

             @ContentSettingValues @Nullable Integer value, boolean isEmbargoed) {
@@ -818,7 +818,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
         switchPreference.setOnPreferenceChangeListener(this);

         @ContentSettingsType

         int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());

@@ -1169,7 +1177,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

@@ -1206,7 +1214,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment

         }

 

         mSite.setContentSetting(browserContextHandle, type, permission);
@@ -929,7 +929,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java

--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java

+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java

@@ -260,6 +260,10 @@ public final class Website implements Serializable {

@@ -277,6 +277,10 @@ public final class Website implements WebsiteEntry {

                         /*isEmbargoed=*/false);

                 setContentSettingException(type, exception);

             }
@@ -943,7 +943,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java

--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java

+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java

@@ -89,7 +89,7 @@ public class WebsitePermissionsFetcher {

@@ -92,7 +92,7 @@ public class WebsitePermissionsFetcher {

             case ContentSettingsType.USB_GUARD:

                 return WebsitePermissionsType.CHOSEN_OBJECT_INFO;

             default:
@@ -955,7 +955,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c 
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java

--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java

+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java

@@ -225,7 +225,7 @@ public class WebsitePreferenceBridge {

@@ -246,7 +246,7 @@ public class WebsitePreferenceBridge {

             case ContentSettingsType.TIMEZONE_OVERRIDE:

                 return true;

             default:
@@ -976,7 +976,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. 
 

 #if BUILDFLAG(IS_ANDROID)

 #include "media/base/android/media_drm_bridge.h"

@@ -693,7 +695,10 @@ void ContentSettingsRegistry::Register(

@@ -680,7 +682,10 @@ void ContentSettingsRegistry::Register(

     Platforms platforms,

     ContentSettingsInfo::IncognitoBehavior incognito_behavior,

     ContentSettingsInfo::StorageBehavior storage_behavior,
@@ -988,7 +988,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. 
   // Ensure that nothing has been registered yet for the given type.

   DCHECK(!website_settings_registry_->Get(type));

 

@@ -702,7 +707,9 @@ void ContentSettingsRegistry::Register(

@@ -689,7 +694,9 @@ void ContentSettingsRegistry::Register(

       website_settings_registry_->Register(

           type, name, std::move(default_value), sync_status,

           WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms,
@@ -1173,7 +1173,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

@@ -23,6 +23,7 @@

@@ -24,6 +24,7 @@

 #include "components/browser_ui/util/android/url_constants.h"

 #include "components/browsing_data/content/local_storage_helper.h"

 #include "components/content_settings/browser/page_specific_content_settings.h"
@@ -1181,7 +1181,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. 
 #include "components/content_settings/browser/ui/cookie_controls_controller.h"

 #include "components/content_settings/core/browser/content_settings_registry.h"

 #include "components/content_settings/core/browser/content_settings_utils.h"

@@ -164,6 +165,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,

@@ -167,6 +168,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,

     return true;

   }
@@ -1197,7 +1197,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info. 
   const bool is_incognito = web_contents->GetBrowserContext()->IsOffTheRecord();

 #if BUILDFLAG(IS_ANDROID)

   // Special geolocation DSE settings apply only on Android, so make sure it

@@ -1112,7 +1122,18 @@ void PageInfo::PresentSitePermissions() {

@@ -1150,7 +1160,18 @@ void PageInfo::PresentSitePermissions() {

   PermissionInfo permission_info;

   HostContentSettingsMap* content_settings = GetContentSettings();

   DCHECK(web_contents_);

build/patches/Do-not-compile-QR-code-sharing.patch

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

@@ -97,7 +97,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;

@@ -100,7 +100,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;

 import org.chromium.chrome.browser.share.ShareDelegate;

 import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;

 import org.chromium.chrome.browser.share.ShareUtils;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi 
 import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;

 import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;

 import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;

@@ -496,10 +495,6 @@ public class RootUiCoordinator

@@ -499,10 +498,6 @@ public class RootUiCoordinator

     }

 

     public void onAttachFragment(Fragment fragment) {
@@ -44,17 +44,17 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s 
 import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;

 import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;

 import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;

@@ -312,9 +311,6 @@ public class ChromeProvidedSharingOptionsProvider {

@@ -311,9 +310,6 @@ public class ChromeProvidedSharingOptionsProvider {

                 || !ChromeFeatureList.isEnabled(ChromeFeatureList.SEND_TAB_TO_SELF_SIGNIN_PROMO)) {

             mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption());

         }

-        if (!mIsIncognito) {

-            mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());

-        }

         if (mTabProvider.hasValue() && UserPrefs.get(profile).getBoolean(Pref.PRINTING_ENABLED)) {

         if (mTabProvider.hasValue() && UserPrefs.get(mProfile).getBoolean(Pref.PRINTING_ENABLED)) {

             mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());

         }

@@ -457,21 +453,6 @@ public class ChromeProvidedSharingOptionsProvider {

@@ -456,21 +452,6 @@ public class ChromeProvidedSharingOptionsProvider {

                 .build();

     }