From 8d85bfa7d0aaa85f1c38ca942963574c3d4d4305 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Tue, 18 Feb 2020 07:50:35 +0100
Subject: [PATCH] Release 80.0.3987.109

---
 CHANGELOG.md                                   |  3 +++
 .../Allow-building-without-feed-support.patch  | 18 ++++++++++--------
 .../Automated-domain-substitution.patch        |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b27754ae..e4b8aa88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 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)
diff --git a/build/patches/Allow-building-without-feed-support.patch b/build/patches/Allow-building-without-feed-support.patch
index ae480aa0..8912ddb4 100644
--- a/build/patches/Allow-building-without-feed-support.patch
+++ b/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()));
diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch
index 051f3215..db494184 100644
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
@@ -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.