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

Unverified Commit 63e4fcb1 authored by uazo's avatar uazo Committed by GitHub
Browse files

Rebase to v147 (#2788) 

Rebase to v147
parents 416bb7c5 27190067

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
146.0.7680.111
 
 No newline at end of file
 
147.0.7727.56
 
 No newline at end of file

build/cromite_patches_list.txt

+0 −1
Original line number Diff line number Diff line
@@ -316,7 +316,6 @@ Block-leakage-of-urls-in-sandbox-iframes.patch 
Fix-chromium-build-bugs.patch

Try-to-fix-2082.patch

Temp-use-PREVIEW-for-IDCompositionDevice5.patch

Enable-Socket-Pool-Limit-Randomization.patch

Disable-integration-with-Gemini.patch



# adblock patches

build/patches/Add-AllowUserCertificates-flag.patch

+5 −5
Original line number Diff line number Diff line
@@ -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;

@@ -1125,6 +1126,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -1134,6 +1135,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

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

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

     &feed::kFeedNoViewCache,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,
@@ -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";

     // Don't clean up this flag yet, BCIV is launched, so this needs to be enabled by

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

@@ -801,6 +802,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,10 +68,10 @@ 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 =

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

                     // keep-sorted start

@@ -1154,6 +1157,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidApb144Patch1,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationMultiDataSource,

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,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/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

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

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

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

+1 −1
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

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

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

   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);

 }