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

Unverified Commit 5f64f842 authored by uazo's avatar uazo Committed by GitHub
Browse files

Rebase to 141 (#2366) 

Rebase to 141
parents 275c67cc d053c285

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
140.0.7339.186
 
 No newline at end of file
 
141.0.7390.55
 
 No newline at end of file

build/cromite_patches_list.txt

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ Temp-guard-FileSystemAccessPersistentPermissions.patch 
Never-treat-Proguard-warnings-as-errors.patch

Temp-disable-experimental-web-platform-features.patch

Block-leakage-of-urls-in-sandbox-iframes.patch

Temporarily-disable-Tab-Group-Sync-Android.patch

Fix-chromium-build-bugs.patch

Try-to-fix-2082.patch

build/patches/Add-AllowUserCertificates-flag.patch

+7 −7
Original line number Diff line number Diff line
@@ -20,7 +20,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/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -236,6 +236,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

@@ -239,6 +239,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -985,6 +986,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -999,6 +1000,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -184,6 +184,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

@@ -768,6 +769,8 @@ public abstract class ChromeFeatureList {

@@ -796,6 +797,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,9 +68,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAppSpecificHistoryViewIntent =

             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);

     public static final CachedFlag sAsyncNotificationManager =

@@ -1080,6 +1083,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAllowTabClosingUponMinimization,

@@ -1131,6 +1134,7 @@ public abstract class ChromeFeatureList {

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidAnimatedProgressBarInViz,

                     sAndroidAppIntegration,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

+10 −9
Original line number Diff line number Diff line
@@ -4,18 +4,19 @@ Subject: Add Alt+D hotkey to focus address bar 


License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 .../src/org/chromium/chrome/browser/KeyboardShortcuts.java   | 5 +++++

 1 file changed, 5 insertions(+)

 .../src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 6 ++++++

 1 file changed, 6 insertions(+)



diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

@@ -890,6 +890,11 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_B,

                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));

@@ -895,6 +895,12 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

+        addShortcut(context,

+            shortcutGroupsById.get(R.string.keyboard_shortcut_chrome_feature_group_header),

+                    shortcutGroupsById,

+                    R.string.keyboard_shortcut_chrome_feature_group_header,

+                    R.string.keyboard_shortcut_address_bar,

+                    KeyEvent.KEYCODE_D,

+                    KeyEvent.META_ALT_ON);

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/base/features.cc b/base/features.cc

--- a/base/features.cc

+++ b/base/features.cc

@@ -149,6 +149,10 @@ bool IsReducePPMsEnabled() {

@@ -129,6 +129,10 @@ bool IsReducePPMsEnabled() {

   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);

 }
@@ -29,15 +29,15 @@ diff --git a/base/features.cc b/base/features.cc 
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc

--- a/content/renderer/render_process_impl.cc

+++ b/content/renderer/render_process_impl.cc

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

 #pragma allow_unsafe_libc_calls

 #endif

@@ -2,6 +2,7 @@

 // Use of this source code is governed by a BSD-style license that can be

 // found in the LICENSE file.

 

+#include "base/features.h"

 #include "content/renderer/render_process_impl.h"

 

 #include "build/build_config.h"

@@ -127,10 +128,18 @@ RenderProcessImpl::RenderProcessImpl()

@@ -122,10 +123,18 @@ RenderProcessImpl::RenderProcessImpl()

       base::CommandLine::ForCurrentProcess()->HasSwitch(

           switches::kDisallowV8FeatureFlagOverrides);

   if (!disallow_v8_feature_flag_overrides) {