From 5e24b55c97ca47a41f8dff102794237143fdc600 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Fri, 25 Nov 2022 20:55:02 +0100 Subject: [PATCH] fix patch list --- build/bromite_patches_list.txt | 2 - .../patches/Disable-all-predictors-code.patch | 14 ++++-- .../Move-navigation-bar-to-bottom.patch | 47 +++++++++++++++++-- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index f8a88ffa..7553a30d 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -243,9 +243,7 @@ Fix-WebWorker-requestAnimationFrame.patch 00Fix-windows-build.patch 00ungoogled-chr-no-special-hosts-domains--add-fixup-.patch 00Disable-fetching-of-all-field-trials--add-fixup-.patch -00Move-navigation-bar-to-bottom--add-fixup-.patch 00Add-menu-item-to-view-source--add-fixup-.patch 00Add-AudioContextAPI-flags.patch -00Client-hints-overrides--add-fixup-.patch 00Disable-Component-Updates.patch 00wip-add-browser-policy.patch \ No newline at end of file diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index 68703eae..6940ddae 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -9,7 +9,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../optimization_guide_keyed_service.cc | 1 - chrome/common/chrome_features.cc | 6 ++--- .../optimization_guide/core/hints_fetcher.cc | 1 + - .../optimization_guide/core/hints_manager.cc | 4 ++++ + .../optimization_guide/core/hints_manager.cc | 5 ++++ .../core/optimization_guide_features.cc | 24 +++++++++---------- .../core/prediction_model_download_manager.cc | 6 +++-- .../core/prediction_model_fetcher_impl.cc | 1 + @@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/permissions/features.cc | 8 +++---- .../segmentation_platform/public/features.cc | 2 +- third_party/blink/common/features.cc | 2 +- - 12 files changed, 33 insertions(+), 27 deletions(-) + 12 files changed, 34 insertions(+), 27 deletions(-) diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc --- a/chrome/browser/optimization_guide/chrome_hints_manager.cc @@ -86,7 +86,15 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op switch (optimization_type_decision) { case OptimizationTypeDecision::kAllowedByOptimizationFilter: case OptimizationTypeDecision::kAllowedByHint: -@@ -1263,6 +1264,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( +@@ -1056,6 +1057,7 @@ void HintsManager::CanApplyOptimizationOnDemand( + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + // TODO(crbug/1275612): Check whether we have consent to fetch. ++ if ((true)) return; // no consent on bromite + + // This set contains URLs that require some information to be fetched, whether + // that be a URL-keyed hint or a host-keyed hint. +@@ -1263,6 +1265,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization( proto::OptimizationType optimization_type, OptimizationMetadata* optimization_metadata) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index ad33a782..749bcd02 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -50,6 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../StatusIndicatorSceneLayer.java | 7 ++- .../browser/toolbar/ToolbarManager.java | 37 +++++++++++-- .../chrome/browser/ui/BottomContainer.java | 19 +++++++ + .../ui/system/StatusBarColorController.java | 9 ++++ chrome/browser/about_flags.cc | 5 ++ .../scene_layer/tab_strip_scene_layer.cc | 16 ++++-- .../BrowserControlsMarginSupplier.java | 6 +++ @@ -60,7 +61,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../flags/android/chrome_feature_list.cc | 2 + .../browser/flags/CachedFeatureFlags.java | 19 +++++++ .../browser/flags/ChromeFeatureList.java | 4 ++ - .../chrome/browser/ui/appmenu/AppMenu.java | 25 +++++++++ + .../chrome/browser/ui/appmenu/AppMenu.java | 30 +++++++++++ .../ui/appmenu/AppMenuHandlerImpl.java | 11 ++++ .../omnibox/LocationBarCoordinator.java | 9 +++- .../browser/omnibox/UrlBarCoordinator.java | 11 +++- @@ -85,7 +86,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../accessibility/AccessibilitySettings.java | 16 ++++++ .../AccessibilitySettingsDelegate.java | 6 +++ .../render_widget_host_view_android.cc | 3 ++ - 73 files changed, 770 insertions(+), 57 deletions(-) + 74 files changed, 784 insertions(+), 57 deletions(-) diff --git a/cc/base/features.cc b/cc/base/features.cc --- a/cc/base/features.cc @@ -1495,6 +1496,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai float offsetFromControls = mBrowserControlsStateProvider.getBottomControlOffset() - mBrowserControlsStateProvider.getBottomControlsHeight(); offsetFromControls -= mViewportInsetSupplier.get(); +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java +@@ -13,6 +13,9 @@ import android.view.Window; + import androidx.annotation.ColorInt; + import androidx.annotation.Nullable; + ++import org.chromium.chrome.browser.flags.ChromeFeatureList; ++import org.chromium.chrome.browser.flags.CachedFeatureFlags; ++ + import org.chromium.base.ApiCompatibilityUtils; + import org.chromium.base.CallbackController; + import org.chromium.base.supplier.ObservableSupplier; +@@ -370,6 +373,12 @@ public class StatusBarColorController + boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color); + ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons); + ApiCompatibilityUtils.setStatusBarColor(mWindow, color); ++ if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) && ++ Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { ++ UiUtils.setNavigationBarIconColor(mWindow.getDecorView().getRootView(), ++ needsDarkStatusBarIcons); ++ mWindow.setNavigationBarColor(color); ++ } + } + + /** diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1760,7 +1787,19 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int footerHeight = inflateFooter(footerResourceId, contentView, menuWidth); int headerHeight = inflateHeader(headerResourceId, contentView, menuWidth); -@@ -349,6 +357,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -302,6 +310,11 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler + if (popupHeight + popupPosition[1] > visibleDisplayFrame.bottom) { + mPopup.setHeight(visibleDisplayFrame.height()); + } ++ if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) { ++ // due to some unknown behaviour, the popup must be resized to ++ // allow selection without leaving touch ++ mPopup.setHeight(popupHeight-1); ++ } + + try { + mPopup.showAtLocation(anchorView.getRootView(), Gravity.NO_GRAVITY, popupPosition[0], +@@ -349,6 +362,14 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler int anchorViewX = tempLocation[0]; int anchorViewY = tempLocation[1]; @@ -1775,7 +1814,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch int[] offsets = new int[2]; // If we have a hardware menu button, locate the app menu closer to the estimated // hardware menu button location. -@@ -539,6 +555,15 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -539,6 +560,15 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler } int availableScreenSpace = Math.max( anchorViewY, appDimensions.height() - anchorViewY - anchorViewImpactHeight);