Release 83.0.4103.76

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 83.0.4103.76
+* fixed inverted Omnibox flag
+* fixed LocationBarPhone/LocationBarTablet crash (fixes https://github.com/bromite/bromite/issues/565)
+
 # 83.0.4103.53
 * updated zh_CN translations
 * mitigation for LocationBarPhone crash (https://github.com/bromite/bromite/issues/565)

README.md

@@ -117,6 +117,7 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags
 
 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.
 
+The Chromium version tag used as base for the patches is available here: [RELEASE](./build/RELEASE); this is always corresponding to the git tag for every release.
 The GN args used to build Bromite are available here: [GN_ARGS](./build/GN_ARGS).
 The patches are to be applied second the order specified in the `bromite_patches_list.txt` file (you can use `git am`).
 

build/GN_ARGS

@@ -22,7 +22,7 @@ enable_resource_whitelist_generation=false
 enable_vr=false
 fieldtrial_testing_like_official_build=true
 icu_use_data_file=true
-is_cfi=false
+is_cfi=true
 is_component_build=false
 is_debug=false
 is_official_build=true

build/RELEASE

@@ -0,0 +1 @@
+83.0.4103.76

build/patches/Bromite-AdBlockUpdaterService.patch

@@ -13,7 +13,7 @@ Download filters by checking Last-Modified header first
  chrome/browser/browser_process_impl.h         |   3 +
  chrome/browser/chrome_browser_main.cc         |   2 +
  .../browser/chrome_content_browser_client.cc  |  16 --
- components/component_updater/BUILD.gn         |   6 +
+ components/component_updater/BUILD.gn         |   8 +
  .../adblock_updater_service.cc                | 249 ++++++++++++++++++
  .../adblock_updater_service.h                 |  99 +++++++
  .../download_filters_task.cc                  | 221 ++++++++++++++++
@@ -27,7 +27,7 @@ Download filters by checking Last-Modified header first
  .../browser/subresource_filter_features.cc    | 113 +-------
  .../core/common/common_features.cc            |   2 +-
  .../frame_host/navigation_throttle_runner.cc  |   5 -
- 20 files changed, 806 insertions(+), 138 deletions(-)
+ 20 files changed, 808 insertions(+), 138 deletions(-)
  create mode 100644 components/component_updater/adblock_updater_service.cc
  create mode 100644 components/component_updater/adblock_updater_service.h
  create mode 100644 components/component_updater/download_filters_task.cc
@@ -219,6 +219,15 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
      "component_updater_service.cc",
      "component_updater_service.h",
      "component_updater_service_internal.h",
+@@ -36,6 +42,8 @@ static_library("component_updater") {
+     "//third_party/boringssl:boringssl",
+     "//ui/base",
+     "//url",
++    "//services/network/public/mojom",
++    "//services/network/public/mojom:trust_tokens_interface",
+   ]
+ }
+ 
 diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
 new file mode 100644
 --- /dev/null

build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch

@@ -670,7 +670,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
 diff --git a/device/BUILD.gn b/device/BUILD.gn
 --- a/device/BUILD.gn
 +++ b/device/BUILD.gn
-@@ -382,8 +382,6 @@ if (is_android) {
+@@ -385,8 +385,6 @@ if (is_android) {
    junit_binary("device_junit_tests") {
      sources = [ "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java" ]
      deps = [

build/patches/Remove-dependency-on-fido-iid-instantapps-and-location.patch

@@ -399,7 +399,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/device/BUILD.gn b/device/BUILD.gn
 --- a/device/BUILD.gn
 +++ b/device/BUILD.gn
-@@ -384,7 +384,6 @@ if (is_android) {
+@@ -387,7 +387,6 @@ if (is_android) {
      deps = [
        "$google_play_services_package:google_play_services_base_java",
        "$google_play_services_package:google_play_services_basement_java",

build/patches/Restore-Search-Ready-Omnibox-flag.patch

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest
          mNativeInitialized = true;
  
 +        // Destroy coordinator if the feature is disabled.
-+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) {
++        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) {
 +            mEditUrlProcessor.destroy();
 +            mEditUrlProcessor = null;
 +        }

build/patches/Workaround-for-startup-crash.patch

@@ -1,167 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 13 May 2020 19:50:08 +0200
-Subject: Workaround for startup crash
-
-Disable some buggy experiment code, unused anyways
----
- .../browser/omnibox/LocationBarPhone.java     | 110 +-----------------
- 1 file changed, 6 insertions(+), 104 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarPhone.java
-@@ -64,39 +64,8 @@ public class LocationBarPhone extends LocationBarLayout {
-                 shouldShowSearchEngineLogo, isSearchEngineGoogle, searchEngineUrl);
- 
-         // The search engine icon will be the first visible focused view when it's showing.
--        shouldShowSearchEngineLogo = SearchEngineLogoUtils.shouldShowSearchEngineLogo(
--                getToolbarDataProvider().isIncognito());
--
--        // This branch will be hit if the search engine logo experiment is enabled.
--        // This value can never revert back to false, so it's safe to initialize mStatusView here
--        // without a corresponding else that nulls it out.
--        if (SearchEngineLogoUtils.isSearchEngineLogoEnabled()) {
--            // Setup the padding once we're loaded, the focused padding changes will happen with
--            // post-layout positioning via setTranslation. This is a byproduct of the way we do the
--            // omnibox un/focus animation which is by writing a function f(x) where x ranges from
--            // 0 (totally unfocused) to 1 (totally focused). Positioning the location bar and it's
--            // children this way doesn't affect the views' bounds (including hit rect). But these
--            // hit rects are preserved for the views that matter (the icon and the url actions
--            // container).
--            int lateralPadding = getResources().getDimensionPixelOffset(
--                    R.dimen.sei_location_bar_lateral_padding);
--            setPaddingRelative(lateralPadding, getPaddingTop(), lateralPadding, getPaddingBottom());
--            updateUrlBarPaddingForSearchEngineIcon();
--            mStatusView = findViewById(R.id.location_bar_status);
--        }
-+        shouldShowSearchEngineLogo = false;
- 
--        // This branch will be hit if the search engine logo experiment is enabled and we should
--        // show the logo.
--        if (shouldShowSearchEngineLogo) {
--            mStatusView.updateSearchEngineStatusIcon(
--                    shouldShowSearchEngineLogo, isSearchEngineGoogle, searchEngineUrl);
--            mFirstVisibleFocusedView = mStatusView;
--            updateUrlBarPaddingForSearchEngineIcon();
--
--            // When the search engine icon is enabled, icons are translations into the parent view's
--            // padding area. Set clip padding to false to prevent them from getting clipped.
--            setClipToPadding(false);
--        }
-         setShowIconsWhenUrlFocused(shouldShowSearchEngineLogo);
-     }
- 
-@@ -110,12 +79,7 @@ public class LocationBarPhone extends LocationBarLayout {
-             // TODO(crbug.com/1019019): Come up with a better solution for M80 or M81.
-             // This padding prevents the UrlBar's content from extending past the available space
-             // and into the next view while focused.
--            final int endPadding = SearchEngineLogoUtils.shouldShowSearchEngineLogo(
--                                           mToolbarDataProvider.isIncognito())
--                            && hasFocus()
--                    ? mStatusView.getEndPaddingPixelSizeForFocusState(true)
--                            - mStatusView.getEndPaddingPixelSizeForFocusState(false)
--                    : 0;
-+            final int endPadding = 0;
- 
-             mUrlBar.setPaddingRelative(mUrlBar.getPaddingStart(), mUrlBar.getPaddingTop(),
-                     endPadding, mUrlBar.getPaddingBottom());
-@@ -169,24 +133,7 @@ public class LocationBarPhone extends LocationBarLayout {
-         if (mStatusView == null) return 0;
- 
-         // No offset is required if the experiment is disabled.
--        if (!SearchEngineLogoUtils.shouldShowSearchEngineLogo(
--                    getToolbarDataProvider().isIncognito())) {
--            return 0;
--        }
--
--        // On non-NTP pages, there will always be an icon when unfocused.
--        if (mToolbarDataProvider.getNewTabPageForCurrentTab() == null) return 0;
--
--        // This offset is only required when the focus animation is running.
--        if (!hasFocus) return 0;
--
--        // We're on the NTP with the fakebox showing.
--        // The value returned changes based on if the layout is LTR OR RTL.
--        // For LTR, the value is negative because we are making space on the left-hand side.
--        // For RTL, the value is positive because we are pushing the icon further to the
--        // right-hand side.
--        int offset = mStatusViewCoordinator.getStatusIconWidth() - getAdditionalOffsetForNTP();
--        return getLayoutDirection() == LAYOUT_DIRECTION_RTL ? offset : -offset;
-+        return 0;
-     }
- 
-     /**
-@@ -204,42 +151,7 @@ public class LocationBarPhone extends LocationBarLayout {
-         if (mStatusView == null) return 0;
- 
-         // No offset is required if the experiment is disabled.
--        if (!SearchEngineLogoUtils.shouldShowSearchEngineLogo(
--                    getToolbarDataProvider().isIncognito())) {
--            return 0;
--        }
--
--        boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
--        // The calculation here is:  the difference in padding between the focused vs unfocused
--        // states and also accounts for the translation that the status icon will do. In the end,
--        // this translation will be the distance that the url bar needs to travel to arrive at the
--        // desired padding when focused.
--        float translation = urlExpansionPercent
--                * (mStatusView.getEndPaddingPixelSizeForFocusState(true)
--                        - mStatusView.getEndPaddingPixelSizeForFocusState(false));
--
--        if (!hasFocus && mStatusView.isSearchEngineStatusIconVisible()
--                && SearchEngineLogoUtils.currentlyOnNTP(mToolbarDataProvider)) {
--            // When:
--            // 1. unfocusing the LocationBar on the NTP.
--            // 2. scrolling the fakebox to the LocationBar on the NTP.
--            // The status icon and the URL bar text overlap in the animation.
--            //
--            // This branch calculates the negative distance the URL bar needs to travel to
--            // completely overlap the status icon and end up in a state that matches the fakebox.
--            float overStatusIconTranslation = translation
--                    - (1f - urlExpansionPercent)
--                            * (mStatusViewCoordinator.getStatusIconWidth()
--                                    - getAdditionalOffsetForNTP());
--            // The value returned changes based on if the layout is LTR or RTL.
--            // For LTR, the value is negative because the status icon is left of the url bar on the
--            // x/y plane.
--            // For RTL, the value is positive because the status icon is right of the url bar on the
--            // x/y plane.
--            return isRtl ? -overStatusIconTranslation : overStatusIconTranslation;
--        }
--
--        return isRtl ? -translation : translation;
-+        return 0;
-     }
- 
-     /**
-@@ -336,8 +248,7 @@ public class LocationBarPhone extends LocationBarLayout {
-     public void updateVisualsForState() {
-         super.updateVisualsForState();
-         boolean isIncognito = getToolbarDataProvider().isIncognito();
--        boolean shouldShowSearchEngineLogo =
--                SearchEngineLogoUtils.shouldShowSearchEngineLogo(isIncognito);
-+        boolean shouldShowSearchEngineLogo = false;
-         setShowIconsWhenUrlFocused(shouldShowSearchEngineLogo);
-         mFirstVisibleFocusedView = shouldShowSearchEngineLogo ? mStatusView : mUrlBar;
- 
-@@ -357,15 +268,6 @@ public class LocationBarPhone extends LocationBarLayout {
- 
-     /** Update the status visibility according to the current state held in LocationBar. */
-     private void updateStatusVisibility() {
--        boolean incognito = getToolbarDataProvider().isIncognito();
--        if (!SearchEngineLogoUtils.shouldShowSearchEngineLogo(incognito)) {
--            return;
--        }
--
--        if (SearchEngineLogoUtils.currentlyOnNTP(mToolbarDataProvider)) {
--            mStatusViewCoordinator.setStatusIconShown(hasFocus());
--        } else {
--            mStatusViewCoordinator.setStatusIconShown(true);
--        }
-+        return;
-     }
- }
--- 
-2.17.1
-