Skip to content

Commit

Permalink
Update Chromium Webview to 128.0.6613.88
Browse files Browse the repository at this point in the history
Change-Id: I29d6ac97efe70b916176dd272e50793819dbbecf
  • Loading branch information
haggertk committed Aug 23, 2024
1 parent 3e66b09 commit 3dac5df
Show file tree
Hide file tree
Showing 12 changed files with 578 additions and 321 deletions.
14 changes: 7 additions & 7 deletions 0001-Add-support-for-getting-updates-for-theme-color-chan.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b7dce51a850a6b0e87c4aa02d25e078bca76b790 Mon Sep 17 00:00:00 2001
From 67681a96b6074e1c10169827d52304e8eb015920 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
Expand All @@ -14,7 +14,7 @@ Subject: [PATCH 01/11] Add support for getting updates for theme color
6 files changed, 76 insertions(+)

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
index a25dceee51a40..d54142963c36f 100644
index d5bba2951a379..ba1833cb940fb 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java
@@ -10,6 +10,7 @@ import android.content.Intent;
Expand All @@ -33,7 +33,7 @@ index a25dceee51a40..d54142963c36f 100644
import org.chromium.url.GURL;

import java.io.BufferedWriter;
@@ -1823,6 +1825,13 @@ class WebViewChromium
@@ -1851,6 +1853,13 @@ class WebViewChromium
}
}

Expand All @@ -48,7 +48,7 @@ index a25dceee51a40..d54142963c36f 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 55845a75d7c67..edf77de8e00de 100644
index a02f8d1c28ed2..f6aa487879929 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 55845a75d7c67..edf77de8e00de 100644
// See //android_webview/docs/how-does-on-create-window-work.md for more details.
mUiThreadHandler =
new Handler() {
@@ -1081,6 +1097,24 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
@@ -1087,6 +1103,24 @@ class WebViewContentsClientAdapter extends SharedWebViewContentsClientAdapter {
}
}

Expand Down Expand Up @@ -164,10 +164,10 @@ index fe29c88d38009..625ac490c2db0 100644
DoUpdateVisitedHistoryInfo info = new DoUpdateVisitedHistoryInfo(url, isReload);
mHandler.sendMessage(mHandler.obtainMessage(MSG_DO_UPDATE_VISITED_HISTORY, info));
diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
index c6546b76d7c18..d45e8c54f976d 100644
index 1df145fd2c699..cb28b2a0f7745 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
@@ -176,12 +176,27 @@ public class AwWebContentsObserver extends WebContentsObserver {
@@ -184,12 +184,27 @@ public class AwWebContentsObserver extends WebContentsObserver {
});
}

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,4 +1,4 @@
From 205daafbfc248f15b58eb3067b56a29721e19366 Mon Sep 17 00:00:00 2001
From 0a1bb6b834dfea499b7af2ce7d7d89409d18e51f 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
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 02/11] Add xxxhdpi icon_webview.png to BUILD.gn
1 file changed, 1 insertion(+)

diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
index 659630eae3bcd..daf76d40104b4 100644
index 7f710b1747102..cc28b07a0f33e 100644
--- a/android_webview/nonembedded/BUILD.gn
+++ b/android_webview/nonembedded/BUILD.gn
@@ -223,6 +223,7 @@ android_resources("icon_resources") {
Expand Down
8 changes: 4 additions & 4 deletions 0003-webview-Hard-no-to-persistent-histograms.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 81267d894589fbdf50d42b2110106fe45e5fdf45 Mon Sep 17 00:00:00 2001
From 99056b5bded3d256b95e2ab59fe9e4a22466804a 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
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 7ef99018011a4..0e1d19e1caff8 100644
index 3d249bc4dd149..68559ed290244 100644
--- a/android_webview/browser/aw_field_trials.cc
+++ b/android_webview/browser/aw_field_trials.cc
@@ -62,6 +62,7 @@ class AwFeatureOverrides {
@@ -91,6 +91,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)) {
@@ -69,6 +70,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
@@ -98,6 +99,7 @@ void AwFieldTrials::OnVariationsSetupComplete() {
} else {
NOTREACHED_IN_MIGRATION();
}
Expand Down
6 changes: 3 additions & 3 deletions 0004-disable-autofill-server-communication-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 986e761e83b4fe8bf8e76e952ecd3c6fadfd0059 Mon Sep 17 00:00:00 2001
From a5a8825c2b7490a4263f980ebba0ed7f29810e5b 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
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH 04/11] disable autofill server communication by default
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 db915b5ad02ff..991af89b9332d 100644
index e7ce36f5825e3..5e0715dcbf908 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -868,7 +868,7 @@ const base::FeatureParam<std::string>
@@ -923,7 +923,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,4 +1,4 @@
From 476dad893077b5c0367a35f836ce5b7c6a8f947d Mon Sep 17 00:00:00 2001
From f6d4ba92504e5702047013e47040ec26941c256e 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
Expand Down
6 changes: 3 additions & 3 deletions 0006-disable-WebView-variations-support.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8943cebae9b973360318a2286a49706feba459cc Mon Sep 17 00:00:00 2001
From 3e3bdf8ffffb2956125c969030ee5fc278c44f1e 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
Expand Down Expand Up @@ -26,10 +26,10 @@ index f8fca3ff457ee..9e2191c8560d0 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 724325b335a29..ba01cc68e672d 100644
index 3fee8af683063..2afc2347d2a84 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
@@ -518,10 +518,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
@@ -520,10 +520,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
}

Expand Down
2 changes: 1 addition & 1 deletion 0007-disable-component-updater-pings-by-default.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f8e7d401ea8219887b8505c841041fadb69d77e4 Mon Sep 17 00:00:00 2001
From 4590429f40452afd9b38de08e76e8ce3a022c7e2 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
Expand Down
36 changes: 18 additions & 18 deletions 0008-Revert-Allow-uses-library-android.ext.adservices.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b04dfc32ebfbf40537efed13cf70bd55022f8b7b Mon Sep 17 00:00:00 2001
From e53876c341aee1be73c5dbd39e184da31821c533 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"
Expand All @@ -25,7 +25,7 @@ This reverts commit 0c3ae92dd16b763625a4d8c3f05012d9813dee2d.
create mode 100644 third_party/androidx/0_privacysandbox_AndroidManifest.xml

diff --git a/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected
index 3e77b5d794a65..078325de516c8 100644
index db71bbe82ef6d..9939dc472659a 100644
--- a/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_32_64_bundle.AndroidManifest.expected
@@ -508,7 +508,6 @@
Expand All @@ -37,7 +37,7 @@ index 3e77b5d794a65..078325de516c8 100644
</application>
</manifest>
diff --git a/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected
index 78e3cd0d3f94d..b8373d2bf175d 100644
index 99da3f0c68efe..a07878fa0631a 100644
--- a/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_32_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
Expand All @@ -49,7 +49,7 @@ index 78e3cd0d3f94d..b8373d2bf175d 100644
</application>
</manifest>
diff --git a/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected
index 1438dc4b899ee..e37b0a1bba509 100644
index bb7656558f7b8..1ddc946a23c91 100644
--- a/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/system_webview_64_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
Expand All @@ -72,7 +72,7 @@ index 6d36a6755bfde..63d1d32ef65ac 100644
</application>
</manifest>
diff --git a/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected
index b7bfc954d2fca..3d256a6f84f32 100644
index f72bf06cacb0c..eb843b0df2fe1 100644
--- a/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_32_64_bundle.AndroidManifest.expected
@@ -508,7 +508,6 @@
Expand All @@ -84,7 +84,7 @@ index b7bfc954d2fca..3d256a6f84f32 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=31"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected
index a0a36a4447100..7a41ad508b254 100644
index 826cd507b036f..b9f4abad62e73 100644
--- a/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_32_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
Expand All @@ -96,7 +96,7 @@ index a0a36a4447100..7a41ad508b254 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=30"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected
index 46e5dabf914b3..970b5b0b5f091 100644
index 9fbc8e4df3da1..9e5a9d5b6c4f0 100644
--- a/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_64_32_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
Expand All @@ -108,7 +108,7 @@ index 46e5dabf914b3..970b5b0b5f091 100644
<uses-static-library android:name="org.chromium.trichromelibrary" android:certDigest="32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" android:version="OFFSET=33"/>
</application>
diff --git a/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected b/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected
index 587080d312c96..b06c8d8dc0344 100644
index b4cf095753986..6e812228d4831 100644
--- a/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected
+++ b/android_webview/expectations/trichrome_webview_64_bundle.AndroidManifest.expected
@@ -507,7 +507,6 @@
Expand All @@ -132,10 +132,10 @@ index d14d137d67022..3c236904b28cd 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected
index 2db6b9a6c91e3..415c91bc19bb3 100644
index 03a31a22f4aed..960947fc21849 100644
--- a/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_32_64_public_bundle__base.AndroidManifest.expected
@@ -753,7 +753,6 @@
@@ -759,7 +759,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -144,10 +144,10 @@ index 2db6b9a6c91e3..415c91bc19bb3 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
index ece5dea62c11e..0186b3faa0267 100644
index dc2c5beb2687e..9bc62edaed987 100644
--- a/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
@@ -752,7 +752,6 @@
@@ -758,7 +758,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -156,10 +156,10 @@ index ece5dea62c11e..0186b3faa0267 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected
index ee901408a16bb..efed12bed53e9 100644
index 01950b63778d3..662904f31a79b 100644
--- a/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_64_32_public_bundle__base.AndroidManifest.expected
@@ -752,7 +752,6 @@
@@ -758,7 +758,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -168,10 +168,10 @@ index ee901408a16bb..efed12bed53e9 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
index 2a3d1949d3e65..9be4a3d9a1b0b 100644
index 666dc5741a94d..49ee1492c9346 100644
--- a/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
@@ -752,7 +752,6 @@
@@ -758,7 +758,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand Down Expand Up @@ -216,10 +216,10 @@ index 0000000000000..da6c78ff7b0cc
+ </application>
+</manifest>
diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/customizations.gni
index 0d494135d481d..68231fecb853b 100644
index 513570ec0a892..dc130d1916d74 100644
--- a/third_party/androidx/customizations.gni
+++ b/third_party/androidx/customizations.gni
@@ -63,6 +63,12 @@ template("_androidx_prebuilt") {
@@ -65,6 +65,12 @@ template("_androidx_prebuilt") {
# Replace broad library -keep rules with a more limited set in
# chrome/android/java/proguard.flags instead.
ignore_proguard_configs = true
Expand Down
Loading

0 comments on commit 3dac5df

Please sign in to comment.