Skip to content

Commit

Permalink
Update Chromium Webview to 131.0.6778.81
Browse files Browse the repository at this point in the history
Change-Id: Ib340bc5f9d596566d43e27e8f04b88564776d59b
  • Loading branch information
haggertk committed Nov 20, 2024
1 parent 9108113 commit 4c757e7
Show file tree
Hide file tree
Showing 14 changed files with 819 additions and 428 deletions.
10 changes: 5 additions & 5 deletions 0001-Add-support-for-getting-updates-for-theme-color-chan.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 53d180517c51ff50b6cd192da1d4486e9f41e7e4 Mon Sep 17 00:00:00 2001
From 750f90c9535cd6193324f8d4fbf3554aa62eaf51 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Thu, 18 May 2017 11:04:40 +0200
Subject: [PATCH 01/11] Add support for getting updates for theme color
Subject: [PATCH 01/13] Add support for getting updates for theme color
changes.

---
Expand Down Expand Up @@ -48,7 +48,7 @@ index a03aa4cb833d3..83c6470e1021e 100644
public int getContentHeight() {
try (TraceEvent event = TraceEvent.scoped("WebView.APICall.Framework.GET_CONTENT_HEIGHT")) {
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
index a02f8d1c28ed2..f6aa487879929 100644
index ca112dd360d3d..380dcb6d8f0c2 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java
@@ -62,6 +62,8 @@ import org.chromium.components.embedder_support.util.WebResourceResponseInfo;
Expand Down Expand Up @@ -88,7 +88,7 @@ index a02f8d1c28ed2..f6aa487879929 100644
// See //android_webview/docs/how-does-on-create-window-work.md for more details.
mUiThreadHandler =
new Handler() {
@@ -1087,6 +1103,24 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
@@ -1089,6 +1105,24 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
}
}

Expand All @@ -114,7 +114,7 @@ index a02f8d1c28ed2..f6aa487879929 100644
private AwHttpAuthHandler mAwHandler;

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
index 7e5775a10403e..9cb5da4d80961 100644
index 8504d195be606..5f223eabe4ee4 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -177,6 +177,8 @@ public abstract class AwContentsClient {
Expand Down
4 changes: 2 additions & 2 deletions 0002-Add-xxxhdpi-icon_webview.png-to-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bc664b537c3cde54a0da7894b885a659e148bc48 Mon Sep 17 00:00:00 2001
From e24fedd2a5b564430fb95c7a8ddb87b9cd4ee6cd Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Tue, 19 May 2020 17:21:42 -0600
Subject: [PATCH 02/11] Add xxxhdpi icon_webview.png to BUILD.gn
Subject: [PATCH 02/13] Add xxxhdpi icon_webview.png to BUILD.gn

---
android_webview/nonembedded/BUILD.gn | 1 +
Expand Down
10 changes: 5 additions & 5 deletions 0003-webview-Hard-no-to-persistent-histograms.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From eab015e269aca5808c52506074a3bad48769c3f6 Mon Sep 17 00:00:00 2001
From 2788a3fccff4e258d16e9863a8526879b6bbfb8a Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Sun, 27 Dec 2020 09:42:54 -0700
Subject: [PATCH 03/11] webview: Hard no to persistent histograms
Subject: [PATCH 03/13] webview: Hard no to persistent histograms

* It's probably some kind of bug somewhere that these are never
deleted, but they don't really add value to us in the first
Expand All @@ -15,18 +15,18 @@ Subject: [PATCH 03/11] webview: Hard no to persistent histograms
1 file changed, 2 insertions(+)

diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc
index 01506b9623043..220c14b41d844 100644
index 73641807044ad..0db485266564e 100644
--- a/android_webview/browser/aw_field_trials.cc
+++ b/android_webview/browser/aw_field_trials.cc
@@ -91,6 +91,7 @@ class AwFeatureOverrides {
@@ -92,6 +92,7 @@ class AwFeatureOverrides {
} // namespace

void AwFieldTrials::OnVariationsSetupComplete() {
+#if 0
// Persistent histograms must be enabled ASAP, but depends on Features.
base::FilePath metrics_dir;
if (base::PathService::Get(base::DIR_ANDROID_APP_DATA, &metrics_dir)) {
@@ -98,6 +99,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
@@ -99,6 +100,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
} else {
NOTREACHED();
}
Expand Down
8 changes: 4 additions & 4 deletions 0004-disable-autofill-server-communication-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From f5edf184d496cb5ee7c0705848bbc8f074ed3c57 Mon Sep 17 00:00:00 2001
From 568e417b979e754eff5c6a2828f84462fb417f68 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 1 Dec 2020 00:56:57 -0500
Subject: [PATCH 04/11] disable autofill server communication by default
Subject: [PATCH 04/13] disable autofill server communication by default

---
components/autofill/core/common/autofill_features.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/autofill/core/common/autofill_features.cc b/components/autofill/core/common/autofill_features.cc
index d84b4ee51c503..905929cdf5ee1 100644
index 8e616f6b72a0a..6504fca4a8d33 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -871,7 +871,7 @@ const base::FeatureParam<std::string>
@@ -847,7 +847,7 @@ const base::FeatureParam<std::string>
// i.e., https://other.autofill.server:port/tbproxy/af/
BASE_FEATURE(kAutofillServerCommunication,
"AutofillServerCommunication",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0728acebc118cbb7573f0c6a6cd9249d0b3ad659 Mon Sep 17 00:00:00 2001
From 8880b35b1c8e5617a18b9a44c17a2ffb3be6ea81 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Tue, 28 Sep 2021 08:43:01 -0600
Subject: [PATCH 05/11] webview: Disable autofill metadata uploads by default
Subject: [PATCH 05/13] webview: Disable autofill metadata uploads by default

* [haggertk - 2021-11-16] - Update per d85f6c03db147
(Reland "[Autofill] Inline kAutofillMetadataUploads")
Expand Down
12 changes: 6 additions & 6 deletions 0006-disable-WebView-variations-support.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From aeb310a84499714bb172d13d73a976920a628eb4 Mon Sep 17 00:00:00 2001
From 5dd9a6c6a8babcf693af81abb2b175a7ae072c5f Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 10 Dec 2020 10:09:18 -0500
Subject: [PATCH 06/11] disable WebView variations support
Subject: [PATCH 06/13] disable WebView variations support

---
.../com/android/webview/chromium/WebViewChromiumAwInit.java | 6 ------
.../webview/chromium/WebViewChromiumFactoryProvider.java | 4 ----
2 files changed, 10 deletions(-)

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
index 9df9ef610213e..561b1a3dab4aa 100644
index d29791a711736..d486d2b49c3e7 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
@@ -244,12 +244,6 @@ public class WebViewChromiumAwInit {
@@ -249,12 +249,6 @@ public class WebViewChromiumAwInit {

AwBrowserProcess.configureChildProcessLauncher();

Expand All @@ -26,10 +26,10 @@ index 9df9ef610213e..561b1a3dab4aa 100644

// TODO(crbug.com/332706093): See if this can be moved before loading native.
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 19e48c392e3a8..f6dcb9545c067 100644
index a96d6c75b7130..2dbf906d9b5c9 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -521,10 +521,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
@@ -522,10 +522,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
}

Expand Down
4 changes: 2 additions & 2 deletions 0007-disable-component-updater-pings-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b24d6e2613f498c80694f5ef8656bdd4c72f5099 Mon Sep 17 00:00:00 2001
From 0531834280e0dd1b4ba971c1f60f1d7b22c00b3c Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Fri, 27 Nov 2020 03:56:29 -0500
Subject: [PATCH 07/11] disable component updater pings by default
Subject: [PATCH 07/13] disable component updater pings by default

---
.../component_updater_command_line_config_policy.h | 2 +-
Expand Down
6 changes: 3 additions & 3 deletions 0008-Revert-Allow-uses-library-android.ext.adservices.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From fe09be5b1351da34ec433ef82e638bfea1b53272 Mon Sep 17 00:00:00 2001
From 306555c1f4ceeb3942abba07d13503256be7c346 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Sat, 2 Mar 2024 08:55:45 -0700
Subject: [PATCH 08/11] Revert "Allow uses-library android.ext.adservices"
Subject: [PATCH 08/13] Revert "Allow uses-library android.ext.adservices"

This reverts commit 0c3ae92dd16b763625a4d8c3f05012d9813dee2d.
---
Expand Down Expand Up @@ -216,7 +216,7 @@ index 0000000000000..da6c78ff7b0cc
+ </application>
+</manifest>
diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/customizations.gni
index 1574c3aa57496..a181dde8426ed 100644
index 03b231888adc3..5a2773db2739b 100644
--- a/third_party/androidx/customizations.gni
+++ b/third_party/androidx/customizations.gni
@@ -65,6 +65,12 @@ template("_androidx_prebuilt") {
Expand Down
8 changes: 4 additions & 4 deletions 0009-bromite-build-utils.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7fa1e72594f3c3e519ff2d9b67add4bff5a69e3e Mon Sep 17 00:00:00 2001
From 50f946715b1260f8e91ddd98def73723103c5e9f Mon Sep 17 00:00:00 2001
From: uazo <uazo@users.noreply.github.com>
Date: Fri, 9 Jun 2023 15:11:46 +0000
Subject: [PATCH 09/11] bromite build utils
Subject: [PATCH 09/13] bromite build utils

Change-Id: I341ca819f305782864b36de15b42e2da3849897d
---
Expand Down Expand Up @@ -445,7 +445,7 @@ index c9a3ce41465b3..b35add9bb3222 100644
# ACTION OVERRIDE
# =============================================================================
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 95c8860589046..3640b61ce1b62 100644
index aa6a2fe716646..47261d84d6152 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -208,7 +208,7 @@ if (!is_robolectric && enable_java_templates) {
Expand Down Expand Up @@ -485,7 +485,7 @@ index 69cfc1ea44f49..89cf50ec65786 100644
public class ChromeAccessibilitySettingsDelegate implements AccessibilitySettingsDelegate {
private static class TextSizeContrastAccessibilityDelegate
diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
index f9510952f325e..908db42b13788 100644
index a25f8691324d7..719aa454915d7 100644
--- a/chrome/browser/flags/BUILD.gn
+++ b/chrome/browser/flags/BUILD.gn
@@ -6,7 +6,8 @@ import("//build/config/android/rules.gni")
Expand Down
Loading

0 comments on commit 4c757e7

Please sign in to comment.