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

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

Rebase to 145 (#2694) 

Rebase to 145
parents 2ba21150 de48f820

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
144.0.7559.97
 
 No newline at end of file
 
145.0.7632.46
 
 No newline at end of file

build/cromite_patches_list.txt

+1 −5
Original line number Diff line number Diff line 
Do-not-link-with-libatomic.patch

Force-use-vpython3-for-all-scripts.patch

bromite-build-utils.patch

Add-cromite-flags-support.patch

Force-use-vpython3-for-some-scripts.patch

Permit-PGO-for-debug-builds.patch

Fix-chromium-vanilla.patch

Final-patch-for-chromium-vanilla.patch
@@ -154,7 +154,6 @@ Invalidate-components-public-key.patch 
Improve-plain-text-rendering-on-mobile.patch

Remove-segmentation-platform.patch

Remove-window-name-on-cross-origin-navigation.patch

Remove-preload-of-com.google.android.gms.fonts.patch

Partition-Blink-memory-cache.patch

Remove-navigator.connection-info.patch

Disable-PrivacyGuide.patch
@@ -166,7 +165,6 @@ Remove-HTTP-referrals-in-cross-origin-navigation.patch 
Enable-third-party-storage-partitioning.patch

Restore-adaptive-button-in-top-toolbar-customization.patch

Add-kill-switch-for-unsupported-clangd-flags.patch



WIN-enable-pdf-plugin.patch

WIN-disable-annotate-downloads.patch

Enable-HighEfficiencyMode-by-default.patch
@@ -176,7 +174,6 @@ WIN-Disable-updater.patch 
WIN-Disable-first-run.patch

WIN-Add-some-prefs-to-secure-preferences.patch

WIN-Disable-search-for-image.patch



AudioBuffer-AnalyserNode-fp-mitigations.patch

add-browser-policy.patch

Always-open-browser-controls-in-new-tab.patch
@@ -319,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

Temp-Backport-Fix-CtrlW-to-close-current-tab.patch



# adblock patches

eyeo-133.0.6943.49-base.patch

build/patches/Add-AllowUserCertificates-flag.patch

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

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

@@ -260,6 +260,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;

@@ -1096,6 +1097,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -1118,6 +1119,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -41,9 +41,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
--- a/chrome/browser/flags/android/chrome_feature_list.cc

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

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

     &feed::kFeedNoViewCache,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedRecyclerBinderUnmountOnDetach,

     &feed::kFeedShowSignInCommand,

+    &kAllowUserCertificates,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kInterestFeedV2,
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -166,6 +166,7 @@ public abstract class ChromeFeatureList {

@@ -167,6 +167,7 @@ public abstract class ChromeFeatureList {

             "AccountForSuppressedKeyboardInsets";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

             "AdaptiveButtonInTopToolbarCustomizationV2";
@@ -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 ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =

@@ -820,6 +821,8 @@ public abstract class ChromeFeatureList {

@@ -795,6 +796,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 =

@@ -1136,6 +1139,7 @@ public abstract class ChromeFeatureList {

@@ -1121,6 +1124,7 @@ public abstract class ChromeFeatureList {

                     // keep-sorted start

                     sAccountForSuppressedKeyboardInsets,

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidAnimatedProgressBarInViz,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationMultiDataSource,
@@ -111,8 +111,8 @@ new file mode 100644 
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java

--- a/net/android/java/src/org/chromium/net/X509Util.java

+++ b/net/android/java/src/org/chromium/net/X509Util.java

@@ -537,6 +537,8 @@ public class X509Util {

         return userRootBytes.toArray(new byte[0][]);

@@ -472,6 +472,8 @@ public class X509Util {

         return result;

     }

 

+    public static boolean AllowUserCertificates = false;
@@ -120,7 +120,7 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j 
     public static AndroidCertVerifyResult verifyServerCertificates(

             byte[][] certChain,

             String authType,

@@ -639,6 +641,9 @@ public class X509Util {

@@ -649,6 +651,9 @@ public class X509Util {

                 X509Certificate root = verifiedChain.get(verifiedChain.size() - 1);

                 isIssuedByKnownRoot = isKnownRoot(root);

             }

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

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

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

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

build/patches/Add-IsCleartextPermitted-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ new file mode 100644 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -400,6 +400,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

@@ -401,6 +401,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

       }

     }