Release 80.0.3987.109

Bugfix for AImageReader crash on Android10/arm64

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 80.0.3987.109
+* restored GPU workaround for the ARM/ARM64 AImageReader crash (https://github.com/bromite/bromite/issues/445)
+
+# 80.0.3987.95
+* enable user-agent freeze (fixes https://github.com/bromite/bromite/issues/483)
+* fix issue with AMP (fixes https://github.com/bromite/bromite/issues/488)
+* fix crash on home page (fixes https://github.com/bromite/bromite/issues/484)
+
 # 80.0.3987.78
 * removed ungoogled-chromium patch for non-remote developer tools resources
 * removed patch for 64-bit webview (it is now a default from upstream)

FAQ.md

@@ -1,4 +1,4 @@
-# F.A.Q.
+# Frequently Asked Questions
 
 ## Does Google Sync/Translate/Data saver work?
 No.
@@ -63,7 +63,7 @@ No; Bromite will support extensions only if upstream (Chromium) does, or similar
 ## Why do push notifications not work on this website?
 
 The [Chromium Blink engine](https://www.chromium.org/blink) uses [GCM](https://en.wikipedia.org/wiki/Google_Cloud_Messaging) to deliver messages
-when websites use the [Push API](https://w3c.github.io/push-api/); this will not work because cloud integrations are disabled in Bromite (GCM in this case).
+when websites use the [Push API](https://w3c.github.io/push-api/); this will not work in Bromite because cloud integrations are disabled (GCM in this case).
 
 [ServiceWorker notifications](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration/showNotification) do work instead since they use
 [android.app.Notification](https://developer.android.com/guide/topics/ui/notifiers/notifications).

README.md

@@ -12,6 +12,8 @@ Bromite is only available for Android v4.4 and above.
 
 For the Frequently Asked Questions see [F.A.Q.](./FAQ.md).
 
+For documentation see the [wiki](https://github.com/bromite/bromite/wiki).
+
 # Goals
 
 Bromite aims at providing a no-clutter browsing experience without privacy-invasive features and with the addition of a fast ad-blocking engine.
@@ -47,7 +49,7 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines available by default
 * flags to disable custom intents and clear session on exit
 * flags to toggle anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
-* use fixed User-Agent to conceal real model and browser version
+* use frozen User-Agent to conceal real model and browser version
 * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
 * security enhancement patches from [GrapheneOS](https://github.com/GrapheneOS) project
 

build/bromite_patches_list.txt

@@ -52,7 +52,6 @@ Add-flag-to-control-video-playback-resume-feature.patch
 Open-YouTube-links-in-Bromite.patch
 Add-exit-menu-item.patch
 Remove-help-menu-item.patch
-User-Agent-anonymize.patch
 AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
 Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
 Add-flags-to-disable-device-motion-and-orientation-APIs.patch
@@ -116,7 +115,7 @@ Disable-search-ready-omnibox-by-default.patch
 disable-AdsBlockedInfoBar.patch
 Bromite-AdBlockUpdaterService.patch
 Add-option-to-configure-the-ad-blocker-filters-URL.patch
-Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
+Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch
 Replace-DoH-probe-domain-with-RIPE-domain.patch
 Increase-number-of-autocomplete-matches-from-5-to-10.patch
 Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
@@ -136,4 +135,5 @@ Restore-enable-horizontal-tab-switcher-flag.patch
 Use-a-minimum-DoH-timeout-of-400ms.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
+Enable-user-agent-freeze-by-default.patch
 Automated-domain-substitution.patch

build/patches/Add-option-to-use-home-page-as-NTP.patch

@@ -21,7 +21,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
  <PreferenceScreen
      xmlns:android="http://schemas.android.com/apk/res/android">
  
-+    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
++    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
 +        android:key="ntp_is_homepage_switch"
 +        android:summaryOn="@string/options_ntp_is_homepage_label"
 +        android:summaryOff="@string/options_ntp_is_homepage_label" />

build/patches/Allow-building-without-feed-support.patch

@@ -3,14 +3,14 @@ Date: Thu, 19 Dec 2019 22:52:53 +0100
 Subject: Allow building without feed support
 
 ---
- .../start_surface/StartSurfaceCoordinator.java    |  5 -----
- .../start_surface/StartSurfaceMediator.java       | 15 ---------------
- 2 files changed, 20 deletions(-)
+ .../start_surface/StartSurfaceCoordinator.java  |  5 -----
+ .../start_surface/StartSurfaceMediator.java     | 17 -----------------
+ 2 files changed, 22 deletions(-)
 
 diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
 --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
 +++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
-@@ -211,11 +211,6 @@ public class StartSurfaceCoordinator implements StartSurface {
+@@ -214,11 +214,6 @@ public class StartSurfaceCoordinator implements StartSurface {
              mBottomBarCoordinator = new BottomBarCoordinator(
                      mActivity, mActivity.getCompositorViewHolder(), mPropertyModel);
          }
@@ -25,14 +25,15 @@ diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromiu
 diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 +++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -403,14 +403,6 @@ class StartSurfaceMediator
+@@ -415,15 +415,6 @@ class StartSurfaceMediator
              assert (isShownState(shownState));
              setOverviewState(shownState);
  
 -            // Make sure FeedSurfaceCoordinator is built before the explore surface is showing by
 -            // default.
 -            if (mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)
--                    && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null) {
+-                    && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null
+-                    && !mActivityStateChecker.isFinishingOrDestroyed()) {
 -                mPropertyModel.set(FEED_SURFACE_COORDINATOR,
 -                        mFeedSurfaceCreator.createFeedSurfaceCoordinator(
 -                                mNightModeStateProvider.isInNightMode()));
@@ -40,12 +41,13 @@ diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromiu
              mTabModelSelector.addObserver(mTabModelSelectorObserver);
  
              if (mFullScreenListener != null) {
-@@ -523,13 +515,6 @@ class StartSurfaceMediator
+@@ -536,14 +527,6 @@ class StartSurfaceMediator
      private void setExploreSurfaceVisibility(boolean isVisible) {
          if (isVisible == mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)) return;
  
 -        if (isVisible && mPropertyModel.get(IS_SHOWING_OVERVIEW)
--                && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null) {
+-                && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null
+-                && !mActivityStateChecker.isFinishingOrDestroyed()) {
 -            mPropertyModel.set(FEED_SURFACE_COORDINATOR,
 -                    mFeedSurfaceCreator.createFeedSurfaceCoordinator(
 -                            mNightModeStateProvider.isInNightMode()));

build/patches/Automated-domain-substitution.patch

@@ -14193,7 +14193,7 @@ diff --git a/chrome/browser/notifications/notification_permission_context.h b/ch
 diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm
 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm
 +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm
-@@ -479,7 +479,7 @@ bool NotificationPlatformBridgeMac::VerifyNotificationData(
+@@ -489,7 +489,7 @@ bool NotificationPlatformBridgeMac::VerifyNotificationData(
  // Overriden from _NSUserNotificationCenterDelegatePrivate.
  // Emitted when a user closes a notification from the notification center.
  // This is an undocumented method introduced in 10.8 according to
@@ -38278,7 +38278,7 @@ diff --git a/components/sync_bookmarks/PRESUBMIT.py b/components/sync_bookmarks/
 diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc
 --- a/components/sync_bookmarks/bookmark_model_merger.cc
 +++ b/components/sync_bookmarks/bookmark_model_merger.cc
-@@ -624,7 +624,7 @@ void BookmarkModelMerger::ProcessLocalCreation(
+@@ -622,7 +622,7 @@ void BookmarkModelMerger::ProcessLocalCreation(
    DCHECK(parent_entity);
  
    // Similar to the directory implementation here:
@@ -39409,7 +39409,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
  
  base::LazyInstance<std::vector<
      WebContentsImpl::FriendWrapper::CreatedCallback>>::DestructorAtExit
-@@ -6160,7 +6160,7 @@ void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host,
+@@ -6158,7 +6158,7 @@ void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host,
      return;
  
    // TODO(evan): make use of title_direction.

build/patches/Enable-user-agent-freeze-by-default.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 10 Feb 2020 23:13:13 +0100
+Subject: Enable user-agent freeze by default
+
+---
+ third_party/blink/common/features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
+--- a/third_party/blink/common/features.cc
++++ b/third_party/blink/common/features.cc
+@@ -46,7 +46,7 @@ const base::Feature kFreezePurgeMemoryAllPagesFrozen{
+ 
+ // Freezes the user-agent as part of https://github.com/WICG/ua-client-hints.
+ const base::Feature kFreezeUserAgent{"FreezeUserAgent",
+-                                     base::FEATURE_DISABLED_BY_DEFAULT};
++                                     base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ // When enabled, the compositing of trivial 3D transforms is disabled.
+ const base::Feature kDoNotCompositeTrivial3D{"DoNotCompositeTrivial3D",
+-- 
+2.17.1
+

build/patches/Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch

@@ -0,0 +1,37 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 15 Feb 2020 08:20:40 +0100
+Subject: Restore GPU bug blacklist for AImageReader on ARM CPUs
+
+Restore the AImageReader blacklist for ARM/ARM64 devices which causes
+crashes on Android 9 and 10 (at different code locations).
+
+See discussion at https://github.com/bromite/bromite/issues/445
+---
+ gpu/config/gpu_driver_bug_list.json | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+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
+@@ -2891,6 +2891,18 @@
+         "reset_base_mipmap_level_before_texstorage"
+       ]
+     },
++    {
++      "id":275,
++      "cr_bugs": [838725],
++      "description": "Disable AImageReader on ARM GPUs as its buggy.",
++      "os": {
++        "type": "android"
++      },
++      "gl_vendor": "ARM.*",
++      "features": [
++        "disable_aimagereader"
++      ]
++    },
+     {
+       "id": 277,
+       "description": "Direct composition path is buggy on certain AMD devices/drivers",
+-- 
+2.17.1
+

build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch

@@ -1,85 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 14 Oct 2019 20:27:33 +0200
-Subject: Revert "[Merge to M78] Enable AImageReader by default."
-
-This reverts commit 60c3d4531b180b911767fb3ea7c3553d7f408c25.
-
-Automatically disable hardware acceleration for Android Q on arm64
----
- chrome/browser/android/chrome_startup_flags.cc | 2 ++
- gpu/config/gpu_finch_features.cc               | 2 +-
- gpu/ipc/service/gpu_init.cc                    | 8 ++------
- media/base/media_switches.cc                   | 2 +-
- 4 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
---- a/chrome/browser/android/chrome_startup_flags.cc
-+++ b/chrome/browser/android/chrome_startup_flags.cc
-@@ -6,6 +6,7 @@
- 
- #include "chrome/browser/android/chrome_startup_flags.h"
- 
-+#include "base/android/build_info.h"
- #include "base/android/jni_android.h"
- #include "base/android/jni_string.h"
- #include "base/android/scoped_java_ref.h"
-@@ -16,6 +17,7 @@
- #include "chrome/common/chrome_switches.h"
- #include "components/browser_sync/browser_sync_switches.h"
- #include "components/dom_distiller/core/dom_distiller_switches.h"
-+#include "content/public/common/content_switches.h"
- #include "media/base/media_switches.h"
- 
- namespace {
-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
-@@ -31,7 +31,7 @@ bool FieldIsInBlacklist(const char* current_value, std::string blacklist_str) {
- #if defined(OS_ANDROID)
- // Use android AImageReader when playing videos with MediaPlayer.
- const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
--                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Use android SurfaceControl API for managing display compositor's buffer queue
- // and using overlays on Android.
-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
-@@ -491,9 +491,7 @@ 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();
--  }
-+  base::android::AndroidImageReader::DisableSupport();
- #endif
- #if defined(USE_OZONE)
-   gpu_feature_info_.supported_buffer_formats_for_allocation_and_texturing =
-@@ -522,9 +520,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line,
-   default_offscreen_surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size());
- 
-   // Disable AImageReader if the workaround is enabled.
--  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
--    base::android::AndroidImageReader::DisableSupport();
--  }
-+  base::android::AndroidImageReader::DisableSupport();
- 
-   UMA_HISTOGRAM_ENUMERATION("GPU.GLImplementation", gl::GetGLImplementation());
- }
-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
-@@ -487,7 +487,7 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
- 
- // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
- const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
--                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Prevents using SurfaceLayer for videos. This is meant to be used by embedders
- // that cannot support SurfaceLayer at the moment.
--- 
-2.17.1
-

build/patches/User-Agent-anonymize.patch

@@ -1,59 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 21 Mar 2018 14:15:28 +0100
-Subject: User Agent: anonymize
-
-Use a fixed device name and product version with the goal of not
-disclosing the specific build of Bromite.
----
- components/version_info/version_info.cc |  3 ++-
- content/common/user_agent.cc            | 15 ++++-----------
- 2 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
---- a/components/version_info/version_info.cc
-+++ b/components/version_info/version_info.cc
-@@ -16,7 +16,8 @@
- namespace version_info {
- 
- std::string GetProductNameAndVersionForUserAgent() {
--  return "Chrome/" + GetVersionNumber();
-+  // latest stable version
-+  return "Chrome/79.0.3945.136";
- }
- 
- std::string GetProductName() {
-diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
---- a/content/common/user_agent.cc
-+++ b/content/common/user_agent.cc
-@@ -87,7 +87,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
-       architecture_token = "; Win64; IA64";
-   }
- #elif defined(OS_ANDROID)
--  std::string android_version_str = base::SysInfo::OperatingSystemVersion();
-+  std::string android_version_str = "9.0.0";
-   std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
- #elif defined(OS_POSIX) && !defined(OS_MACOSX)
-   // Should work on any Posix system.
-@@ -159,16 +159,9 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
- }
- 
- std::string GetAndroidOSInfo(bool include_android_build_number) {
--  std::string android_info_str;
--
--  // Send information about the device.
--  bool semicolon_inserted = false;
--  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
--  std::string android_device_name = base::SysInfo::HardwareModelName();
--  if (!android_device_name.empty() && "REL" == android_build_codename) {
--    android_info_str += "; " + android_device_name;
--    semicolon_inserted = true;
--  }
-+  // Send spoofed information about the device.
-+  std::string android_info_str = "; SM-G955U";
-+  bool semicolon_inserted = true;
- 
-   // Append the build ID.
-   if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) ||
--- 
-2.17.1
-