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

Unverified Commit 851be937 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Rebase to 142.0.7444.138

parent 26d25d0a

build/patches/Add-cromite-flags-support.patch

+8 −8
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 namespace about_flags {

 

 namespace {

@@ -4966,6 +4970,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

@@ -4977,6 +4981,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

      std::size(kSeamlessSigninPromoTypeTwoButtons), nullptr}};

 #endif  // BUILDFLAG(IS_ANDROID)
@@ -676,7 +676,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 
 // RECORDING USER METRICS FOR FLAGS:

 // -----------------------------------------------------------------------------

 // The first line of the entry is the internal name.

@@ -4992,6 +5000,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

@@ -5003,6 +5011,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {

 const FeatureEntry kFeatureEntries[] = {

 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and

 // //tools/flags/generate_unexpire_flags.py.
@@ -2024,18 +2024,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h 
diff --git a/net/base/features.cc b/net/base/features.cc

--- a/net/base/features.cc

+++ b/net/base/features.cc

@@ -839,4 +839,5 @@ BASE_FEATURE_PARAM(size_t,

                    "cache_size",

                    64);

@@ -852,4 +852,5 @@ BASE_FEATURE_PARAM(std::string,

                    "quic_options",

                    "");

 

+#include "cromite_flags/net_base_features_cc.inc"

 }  // namespace net::features

diff --git a/net/base/features.h b/net/base/features.h

--- a/net/base/features.h

+++ b/net/base/features.h

@@ -935,6 +935,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kDnsFilteringDetails);

 NET_EXPORT BASE_DECLARE_FEATURE(kUpdateIsMainFrameOriginRecentlyAccessed);

 NET_EXPORT BASE_DECLARE_FEATURE_PARAM(size_t, kRecentlyAccessedOriginCacheSize);

@@ -946,6 +946,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kTryQuicByDefault);

 // separate the values with a comma (e.g. "ABCD,EFGH").

 NET_EXPORT BASE_DECLARE_FEATURE_PARAM(std::string, kQuicOptions);

 

+#include "cromite_flags/net_base_features_h.inc"

 }  // namespace net::features

build/patches/Add-option-to-force-tablet-UI.patch

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over 
 import org.chromium.ui.base.LocalizationUtils;

 import org.chromium.ui.base.WindowAndroid;

 import org.chromium.ui.util.ColorUtils;

@@ -5039,8 +5040,13 @@ public class StripLayoutHelper

@@ -5040,8 +5041,13 @@ public class StripLayoutHelper

         mCloseButtonMenu.setAnchorView(tabView);

         // 3. Set the vertical offset to align the close button menu with bottom of the tab strip

         int tabHeight = mManagerHost.getHeight();

build/patches/Android-Pixel-Perfect-Mode.patch

+6 −6
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ 
 #include "third_party/blink/public/mojom/input/input_handler.mojom.h"

 #include "third_party/perfetto/include/perfetto/tracing/track.h"

 #include "third_party/skia/include/core/SkBitmap.h"

@@ -971,7 +972,7 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(

@@ -972,7 +973,7 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(

                                 ? SK_ColorTRANSPARENT

                                 : metadata.root_background_color.toSkColor());
@@ -1097,7 +1097,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ 
     overscroll_controller_->OnFrameMetadataUpdated(

         metadata.page_scale_factor, metadata.device_scale_factor,

         metadata.scrollable_viewport_size, metadata.root_layer_size,

@@ -1273,6 +1274,12 @@ gfx::Size RenderWidgetHostViewAndroid::GetRequestedRendererSizeDevicePx() {

@@ -1274,6 +1275,12 @@ gfx::Size RenderWidgetHostViewAndroid::GetRequestedRendererSizeDevicePx() {

                      default_bounds_dip_.height() * scale_factor);

   }
@@ -1110,7 +1110,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ 
   const float scale_factor = GetDeviceScaleFactor() / view_.GetDipScale();

   return gfx::ScaleToCeiledSize(view_.GetSizeDevicePx(), scale_factor);

 }

@@ -1298,6 +1305,10 @@ void RenderWidgetHostViewAndroid::SetInsets(const gfx::Insets& insets) {

@@ -1299,6 +1306,10 @@ void RenderWidgetHostViewAndroid::SetInsets(const gfx::Insets& insets) {

   NOTREACHED();

 }
@@ -1121,7 +1121,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ 
 gfx::Size RenderWidgetHostViewAndroid::GetCompositorViewportPixelSize() {

   if (!view_.parent()) {

     if (default_bounds_dip_.IsEmpty()) {

@@ -1433,7 +1444,7 @@ viz::SurfaceId RenderWidgetHostViewAndroid::GetCurrentSurfaceId() const {

@@ -1434,7 +1445,7 @@ viz::SurfaceId RenderWidgetHostViewAndroid::GetCurrentSurfaceId() const {

                                : viz::SurfaceId();

 }
@@ -1130,7 +1130,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ 
     const gfx::PointF& point,

     RenderWidgetHostViewInput* target_view,

     gfx::PointF* transformed_point) {

@@ -1849,7 +1860,7 @@ bool RenderWidgetHostViewAndroid::HasFallbackSurface() const {

@@ -1850,7 +1861,7 @@ bool RenderWidgetHostViewAndroid::HasFallbackSurface() const {

   return delegated_frame_host_->HasFallbackSurface();

 }
@@ -2029,7 +2029,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c 
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5

+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -5992,6 +5992,10 @@

@@ -6001,6 +6001,10 @@

       // If enabled, the `getDisplayMedia()` family of APIs will ask for NV12

       // frames, which should trigger a zero-copy path in the tab capture code.

       name: "ZeroCopyTabCapture",

build/patches/Android-fonts-fingerprinting-mitigation.patch

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java

--- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java

+++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java

@@ -1003,6 +1003,9 @@ public final class ProductionSupportedFlagList {

@@ -1009,6 +1009,9 @@ public final class ProductionSupportedFlagList {

                 "Hides user preference on the system keyboard by setting the standard "

                  + "eng layout and removing the layout information from the "

                  + "javascript keyboard events."),

build/patches/Disable-GetInstalledRelatedApps-API.patch

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ new file mode 100644 
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5

+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -2879,9 +2879,8 @@

@@ -2880,9 +2880,8 @@

       status: "stable",

     },

     {