Skip to content

Commit

Permalink
Update Chromium Webview to 129.0.6668.70
Browse files Browse the repository at this point in the history
Change-Id: I7a7e336d0aad8854c93255756fe23ba1a8dd3c19
  • Loading branch information
haggertk committed Sep 25, 2024
1 parent 3dac5df commit 4b12947
Show file tree
Hide file tree
Showing 12 changed files with 185 additions and 185 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 67681a96b6074e1c10169827d52304e8eb015920 Mon Sep 17 00:00:00 2001
From 86f3c5b71275ee465c82e8d481a21bba57dc6c75 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 d5bba2951a379..ba1833cb940fb 100644
index a03aa4cb833d3..83c6470e1021e 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 @@ -25,15 +25,15 @@ index d5bba2951a379..ba1833cb940fb 100644
import android.graphics.Paint;
import android.graphics.Picture;
import android.graphics.Rect;
@@ -81,6 +82,7 @@ import org.chromium.components.embedder_support.application.ClassLoaderContextWr
@@ -80,6 +81,7 @@ import org.chromium.components.embedder_support.application.ClassLoaderContextWr
import org.chromium.content_public.browser.MessagePayload;
import org.chromium.content_public.browser.NavigationHistory;
import org.chromium.content_public.browser.SmartClipProvider;
+import org.chromium.content_public.browser.WebContents;
import org.chromium.url.GURL;

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

Expand Down Expand Up @@ -114,10 +114,10 @@ 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 62dea874c029d..c3ff92f59ddd5 100644
index 7e5775a10403e..9cb5da4d80961 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClient.java
@@ -178,6 +178,8 @@ public abstract class AwContentsClient {
@@ -177,6 +177,8 @@ public abstract class AwContentsClient {

public abstract void onProgressChanged(int progress);

Expand Down Expand Up @@ -211,5 +211,5 @@ index be8f554e3930e..7e2e11de7b3db 100644
public WebResourceResponseInfo shouldInterceptRequest(
AwContentsClient.AwWebResourceRequest request) {
--
2.46.0
2.46.1

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 0a1bb6b834dfea499b7af2ce7d7d89409d18e51f Mon Sep 17 00:00:00 2001
From d00c57c89ed143f3ec2a81e365e8e5859b4492c4 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 @@ -20,5 +20,5 @@ index 7f710b1747102..cc28b07a0f33e 100644
}

--
2.46.0
2.46.1

6 changes: 3 additions & 3 deletions 0003-webview-Hard-no-to-persistent-histograms.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 99056b5bded3d256b95e2ab59fe9e4a22466804a Mon Sep 17 00:00:00 2001
From f454457e8f42bd2ceb6355d4a70bd5d19e4d4fa3 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,7 +15,7 @@ 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 3d249bc4dd149..68559ed290244 100644
index 7d3e926804d81..2dd8f2e9b6b8f 100644
--- a/android_webview/browser/aw_field_trials.cc
+++ b/android_webview/browser/aw_field_trials.cc
@@ -91,6 +91,7 @@ class AwFeatureOverrides {
Expand All @@ -35,5 +35,5 @@ index 3d249bc4dd149..68559ed290244 100644

// TODO(crbug.com/40271903): Consider to migrate all WebView feature overrides
--
2.46.0
2.46.1

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,4 +1,4 @@
From a5a8825c2b7490a4263f980ebba0ed7f29810e5b Mon Sep 17 00:00:00 2001
From 97d162e1633eaa875facaa4bac01c9d786f59915 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 e7ce36f5825e3..5e0715dcbf908 100644
index bb9121b172455..1511e0e3467dd 100644
--- a/components/autofill/core/common/autofill_features.cc
+++ b/components/autofill/core/common/autofill_features.cc
@@ -923,7 +923,7 @@ const base::FeatureParam<std::string>
@@ -985,7 +985,7 @@ const base::FeatureParam<std::string>
// i.e., https://other.autofill.server:port/tbproxy/af/
BASE_FEATURE(kAutofillServerCommunication,
"AutofillServerCommunication",
Expand All @@ -21,5 +21,5 @@ index e7ce36f5825e3..5e0715dcbf908 100644
// Controls attaching the autofill type predictions to their respective
// element in the DOM.
--
2.46.0
2.46.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f6d4ba92504e5702047013e47040ec26941c256e Mon Sep 17 00:00:00 2001
From 8222b45977e8ebfe197f58dc45af06ee68e3162f 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 All @@ -23,5 +23,5 @@ index 201ecfe1eaa3b..f49a7bc22e8ae 100644
}

--
2.46.0
2.46.1

8 changes: 4 additions & 4 deletions 0006-disable-WebView-variations-support.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3e3bdf8ffffb2956125c969030ee5fc278c44f1e Mon Sep 17 00:00:00 2001
From 7ede8db8c742cac10924e3af2ea4f63411b12f98 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 3fee8af683063..2afc2347d2a84 100644
index 7ed3bff2cb0e9..d55667f684111 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
@@ -520,10 +520,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
@@ -528,10 +528,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
}

Expand All @@ -41,5 +41,5 @@ index 3fee8af683063..2afc2347d2a84 100644

setSingleton(this);
--
2.46.0
2.46.1

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,4 +1,4 @@
From 4590429f40452afd9b38de08e76e8ce3a022c7e2 Mon Sep 17 00:00:00 2001
From ea27c5593e0a488f3fec35912cad345d7391d982 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 All @@ -21,5 +21,5 @@ index 6c16b4e37a753..a627cb7ffd59c 100644

// If non-zero, time interval until the first component update check.
--
2.46.0
2.46.1

24 changes: 12 additions & 12 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 e53876c341aee1be73c5dbd39e184da31821c533 Mon Sep 17 00:00:00 2001
From 970b0de43f25edc42435eb81b66ff5ba5dd8d9e3 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 Down Expand Up @@ -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 03a31a22f4aed..960947fc21849 100644
index daa1573ddbaf4..08780e53843da 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
@@ -759,7 +759,6 @@
@@ -768,7 +768,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -144,10 +144,10 @@ index 03a31a22f4aed..960947fc21849 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 dc2c5beb2687e..9bc62edaed987 100644
index 0925d8cae98d7..b67cf13c0027c 100644
--- a/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_32_public_bundle__base.AndroidManifest.expected
@@ -758,7 +758,6 @@
@@ -767,7 +767,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -156,10 +156,10 @@ index dc2c5beb2687e..9bc62edaed987 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 01950b63778d3..662904f31a79b 100644
index 13be62ae945b8..eda5b1a0fa6b3 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
@@ -758,7 +758,6 @@
@@ -767,7 +767,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -168,10 +168,10 @@ index 01950b63778d3..662904f31a79b 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 666dc5741a94d..49ee1492c9346 100644
index 3c8d943d72b48..b62030e7dfb9f 100644
--- a/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_64_public_bundle__base.AndroidManifest.expected
@@ -758,7 +758,6 @@
@@ -767,7 +767,6 @@
android:process=":sandboxed_process9"
android:visibleToInstantApps="true">
</service> # DIFF-ANCHOR: e2f3bbbd
Expand All @@ -180,7 +180,7 @@ index 666dc5741a94d..49ee1492c9346 100644
</application>
</manifest>
diff --git a/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected b/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected
index 4d28107f5d986..147a50e48e6fc 100644
index 7ee75fd9dca82..87acc29c7b08c 100644
--- a/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_public_bundle__base.AndroidManifest.expected
@@ -737,6 +737,5 @@
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 513570ec0a892..dc130d1916d74 100644
index 3d8b559964824..c97b0c3115e3b 100644
--- a/third_party/androidx/customizations.gni
+++ b/third_party/androidx/customizations.gni
@@ -65,6 +65,12 @@ template("_androidx_prebuilt") {
Expand All @@ -233,5 +233,5 @@ index 513570ec0a892..dc130d1916d74 100644
# Keeps emoji2 code. See http://crbug.com/1205141
ignore_proguard_configs = true
--
2.46.0
2.46.1

10 changes: 5 additions & 5 deletions 0009-bromite-build-utils.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 29597d0234f63728028ea665f213f66ef098eee5 Mon Sep 17 00:00:00 2001
From 6b70f07839ac20309a34266c6b8529f93d6afba9 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
Expand Down Expand Up @@ -445,10 +445,10 @@ index d1a665482c989..1f50d474948f1 100644
# ACTION OVERRIDE
# =============================================================================
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 80f918a81859c..5cfafafa54e64 100644
index 0db0395c6619b..dfcc96574d197 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -207,7 +207,7 @@ if (!is_robolectric && enable_java_templates) {
@@ -208,7 +208,7 @@ if (!is_robolectric && enable_java_templates) {
# }
template("java_cpp_enum") {
action_with_pydeps(target_name) {
Expand All @@ -457,7 +457,7 @@ index 80f918a81859c..5cfafafa54e64 100644

# The sources aren't compiled so don't check their dependencies.
check_includes = false
@@ -218,6 +218,10 @@ if (!is_robolectric && enable_java_templates) {
@@ -219,6 +219,10 @@ if (!is_robolectric && enable_java_templates) {
_rebased_sources = rebase_path(invoker.sources, root_build_dir)

args = [ "--srcjar=$_rebased_srcjar_path" ] + _rebased_sources
Expand Down Expand Up @@ -786,5 +786,5 @@ index 35c1b20bc2c83..6a600ee42da7b 100644
removal_comments_extension = None # None means no removal comments
if args.enable_removal_comments:
--
2.46.0
2.46.1

Loading

0 comments on commit 4b12947

Please sign in to comment.