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

Commit d304119e authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge tag 87.0.4280.81 from bromite 



d4dd2dd6 Release 87.0.4280.81
aecf9624 Merge pull request #823 from uazo/fix-819
b42ba1ae Merge pull request #825 from uazo/fix-autoplay
b93b06ed Merge pull request #821 from zhmars/i18n
fd0b637e fix autoplay setting
92111e3b - correctly passed user agent to blink - in settings, flag assigned at focus of the control - loading of overrides at startup
a5fe3a57 Update zh_CN translations
e9a29a5f Current version of the user agent customization patch

Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parents 32efc5d0 d4dd2dd6

CHANGELOG.md

+7 −2
Original line number Diff line number Diff line 
# 87.0.4280.81

* fix text fragment not disabled by default, unexpire flag (fixes https://github.com/bromite/bromite/issues/803)

* turn AImageReader off by default on ARM64 (fixes https://github.com/bromite/bromite/issues/814)

* fix issue with global autoplay settings (thanks to @uazo, https://github.com/bromite/bromite/pull/825)

* fix issues with user agent customization (thanks to @uazo, https://github.com/bromite/bromite/pull/823)

* updated zh_CN translations (thanks to @zhmars, https://github.com/bromite/bromite/pull/821)



# 87.0.4280.68

* user agent customization (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/798)

* fix for Qualcomm AImageReader crashes on A9 (fixes https://github.com/bromite/bromite/issues/814)

* fix disable-scroll-to-text-fragment patch (fixes https://github.com/bromite/bromite/issues/803)

* fix for intent handling for local apps on Android 11 (https://github.com/bromite/bromite/pull/816)



# 87.0.4280.67

README.md

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ Flags which have been retired from upstream Chromium but are still available in 
* `#enable-search-ready-omnibox`

* `#darken-websites-checkbox-in-themes-setting`

* `#simplified-ntp`

* `#enable-text-fragment-anchor`



New flags:

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
87.0.4280.68
 
87.0.4280.81

build/bromite_patches_list.txt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ Disable-support-for-RAR-files-inspection.patch 
Add-history-support-in-incognito-mode.patch

Enable-darken-websites-checkbox-in-themes.patch

Remove-blocklisted-URLs-upon-bookmark-creation.patch

Disable-scroll-to-text-fragment.patch

Disable-the-DIAL-repeating-discovery.patch

Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch

Hardening-against-incognito-mode-detection.patch
@@ -147,4 +146,5 @@ User-agent-customization.patch 
Restore-Simplified-NTP-launch.patch

Revert-the-removal-of-an-option-to-block-autoplay.patch

android-upstream-missed-manifest-changes-for-Q-R.patch

Disable-text-fragments-by-default.patch

Automated-domain-substitution.patch

build/patches/AImageReader-CFI-crash-mitigations.patch

+43 −54
Original line number Diff line number Diff line
@@ -19,18 +19,19 @@ See discussions at: 
* https://github.com/bromite/bromite/issues/445

* https://github.com/bromite/bromite/issues/814

---

 base/android/android_image_reader_compat.cc |  8 +++++-

 base/android/android_image_reader_compat.h  |  4 +++

 gpu/config/gpu_driver_bug_list.json         | 32 +++++++++++++++++++++

 gpu/config/gpu_finch_features.cc            |  8 ++++++

 base/android/android_image_reader_compat.cc |  8 +++++++-

 base/android/android_image_reader_compat.h  |  4 ++++

 chrome/browser/flag-metadata.json           |  2 +-

 gpu/config/gpu_driver_bug_list.json         | 16 ++++++++++++++++

 gpu/config/gpu_finch_features.cc            | 10 +++++++++-

 gpu/config/gpu_finch_features.h             |  1 +

 gpu/config/gpu_util.cc                      |  8 ++++++

 gpu/config/gpu_util.cc                      |  8 ++++++++

 gpu/config/gpu_workaround_list.txt          |  1 +

 gpu/ipc/service/gpu_init.cc                 | 11 +++++++

 gpu/ipc/service/stream_texture_android.cc   | 11 ++++++-

 media/base/media_switches.cc                |  8 ++++++

 gpu/ipc/service/gpu_init.cc                 |  5 +++++

 gpu/ipc/service/stream_texture_android.cc   | 11 ++++++++++-

 media/base/media_switches.cc                |  4 ++++

 media/base/media_switches.h                 |  1 +

 11 files changed, 91 insertions(+), 2 deletions(-)

 12 files changed, 67 insertions(+), 4 deletions(-)



diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc

--- a/base/android/android_image_reader_compat.cc
@@ -79,10 +80,22 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 
   friend class base::NoDestructor<AndroidImageReader>;

 

   AndroidImageReader();

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -1681,7 +1681,7 @@

   {

     "name": "enable-image-reader",

     "owners": [ "vikassoni", "khushalsagar" ],

-    "expiry_milestone": 90

+    "expiry_milestone": -1

   },

   {

     "name": "enable-immersive-fullscreen-toolbar",

diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

--- a/gpu/config/gpu_driver_bug_list.json

+++ b/gpu/config/gpu_driver_bug_list.json

@@ -3287,6 +3287,38 @@

@@ -3287,6 +3287,22 @@

         "dont_delete_source_texture_for_egl_image"

       ]

     },
@@ -101,22 +114,6 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis 
+      "features": [

+        "disable_aimagereader"

+      ]

+    },

+    {

+      "id":330,

+      "cr_bugs": [1051705],

+      "description": "Disable AImageReader on Qualcomm GPUs",

+      "os": {

+        "type": "android",

+        "version": {

+          "op": "<",

+          "value": "10"

+        }

+      },

+      "gl_vendor": "Qualcomm.*",

+      "features": [

+        "disable_aimagereader"

+      ]

+    },

     {

       "id": 336,
@@ -124,21 +121,30 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis 
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

--- a/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

@@ -13,6 +13,14 @@

@@ -13,6 +13,10 @@

 

 namespace features {

 

+// Use android AImageReader when playing videos with MediaPlayer.

+const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",

+#ifdef ARCH_CPU_ARM64

+                                             base::FEATURE_DISABLED_BY_DEFAULT};

+#else

+                                  base::FEATURE_ENABLED_BY_DEFAULT};

+#endif

+

 #if defined(OS_ANDROID)

 // Used to limit GL version to 2.0 for skia raster on Android.

 const base::Feature kUseGles2ForOopR{"UseGles2ForOopR",

@@ -26,7 +30,11 @@ const base::Feature kAndroidSurfaceControl{"AndroidSurfaceControl",

 

 // Use AImageReader for MediaCodec and MediaPlyer on android.

 const base::Feature kAImageReader{"AImageReader",

-                                  base::FEATURE_ENABLED_BY_DEFAULT};

+#ifdef ARCH_CPU_ARM64

+                                             base::FEATURE_DISABLED_BY_DEFAULT};

+#else

+                                             base::FEATURE_ENABLED_BY_DEFAULT};

+#endif

 #endif

 

 // Enable GPU Rasterization by default. This can still be overridden by

diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

--- a/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h
@@ -189,31 +195,18 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list 
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

--- a/gpu/ipc/service/gpu_init.cc

+++ b/gpu/ipc/service/gpu_init.cc

@@ -727,6 +727,12 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line,

     AdjustInfoToSwiftShader();

@@ -467,6 +467,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

     }

   }

 

+#if defined(OS_ANDROID)

+  // Disable AImageReader if the workaround is enabled.

+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {

+    base::android::AndroidImageReader::DisableSupport();

+  }

+#endif

 #if defined(USE_OZONE)

   if (features::IsUsingOzonePlatform()) {

     const std::vector<gfx::BufferFormat>

@@ -746,6 +752,11 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line,

     gl::DirectCompositionSurfaceWin::DisableDecodeSwapChain();

 #endif

 

+  // Disable AImageReader if the workaround is enabled.

+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {

+    base::android::AndroidImageReader::DisableSupport();

+  }

+

   UMA_HISTOGRAM_ENUMERATION("GPU.GLImplementation", gl::GetGLImplementation());

 }

 #endif  // OS_ANDROID

   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=

           kGpuFeatureStatusEnabled ||

       !InitializeVulkan()) {

diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc

--- a/gpu/ipc/service/stream_texture_android.cc

+++ b/gpu/ipc/service/stream_texture_android.cc
@@ -245,17 +238,13 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ 
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

--- a/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

@@ -566,6 +566,14 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",

@@ -566,6 +566,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",

 const base::Feature kMediaDrmPreprovisioningAtStartup{

     "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};

 

+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)

+const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",

+#ifdef ARCH_CPU_ARM64

+                                             base::FEATURE_DISABLED_BY_DEFAULT};

+#else

+                                             base::FEATURE_ENABLED_BY_DEFAULT};

+#endif

+

 // Prevents using SurfaceLayer for videos. This is meant to be used by embedders

 // that cannot support SurfaceLayer at the moment.