summaryrefslogtreecommitdiff
path: root/chromium/android_webview/browser
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-16 11:45:35 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-17 08:59:23 +0000
commit552906b0f222c5d5dd11b9fd73829d510980461a (patch)
tree3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/android_webview/browser
parent1b05827804eaf047779b597718c03e7d38344261 (diff)
downloadqtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/android_webview/browser')
-rw-r--r--chromium/android_webview/browser/BUILD.gn35
-rw-r--r--chromium/android_webview/browser/gfx/BUILD.gn9
-rw-r--r--chromium/android_webview/browser/lifecycle/BUILD.gn17
-rw-r--r--chromium/android_webview/browser/metrics/BUILD.gn13
4 files changed, 50 insertions, 24 deletions
diff --git a/chromium/android_webview/browser/BUILD.gn b/chromium/android_webview/browser/BUILD.gn
index 643e623bb51..207926d3039 100644
--- a/chromium/android_webview/browser/BUILD.gn
+++ b/chromium/android_webview/browser/BUILD.gn
@@ -42,8 +42,6 @@ source_set("browser") {
"aw_contents_client_bridge.h",
"aw_contents_io_thread_client.cc",
"aw_contents_io_thread_client.h",
- "aw_contents_lifecycle_notifier.cc",
- "aw_contents_lifecycle_notifier.h",
"aw_contents_statics.cc",
"aw_cookie_access_policy.cc",
"aw_cookie_access_policy.h",
@@ -66,6 +64,8 @@ source_set("browser") {
"aw_javascript_dialog_manager.h",
"aw_media_url_interceptor.cc",
"aw_media_url_interceptor.h",
+ "aw_pac_processor.cc",
+ "aw_pac_processor.h",
"aw_pdf_exporter.cc",
"aw_pdf_exporter.h",
"aw_permission_manager.cc",
@@ -187,6 +187,7 @@ source_set("browser") {
"//android_webview:browser_jni_headers",
"//android_webview:generate_components_strings",
"//android_webview/browser/gfx",
+ "//android_webview/browser/lifecycle",
"//android_webview/browser/metrics",
"//android_webview/common",
"//android_webview/common:common_mojom",
@@ -199,9 +200,10 @@ source_set("browser") {
# Called via JNI in CrashpadMain
"//components/crash/android:crashpad_main",
- "//components/crash/content/app",
"//components/crash/content/browser",
+ "//components/crash/core/app",
"//components/embedder_support/android:web_contents_delegate",
+ "//components/embedder_support/android/metrics",
"//components/google/core/common",
"//components/heap_profiling",
"//components/metrics",
@@ -215,18 +217,20 @@ source_set("browser") {
"//components/printing/browser",
"//components/printing/common",
"//components/printing/common:mojo_interfaces",
- "//components/safe_browsing",
- "//components/safe_browsing:features",
- "//components/safe_browsing:ping_manager",
"//components/safe_browsing/android:remote_database_manager",
- "//components/safe_browsing/browser",
- "//components/safe_browsing/browser:network_context",
- "//components/safe_browsing/common",
- "//components/safe_browsing/db:database_manager",
- "//components/safe_browsing/db:safebrowsing_proto",
- "//components/safe_browsing/triggers",
- "//components/safe_browsing/web_ui",
- "//components/safe_browsing/web_ui:constants",
+ "//components/safe_browsing/content",
+ "//components/safe_browsing/content/browser",
+ "//components/safe_browsing/content/common:interfaces",
+ "//components/safe_browsing/content/web_ui",
+ "//components/safe_browsing/core:features",
+ "//components/safe_browsing/core:ping_manager",
+ "//components/safe_browsing/core/browser",
+ "//components/safe_browsing/core/browser:network_context",
+ "//components/safe_browsing/core/common",
+ "//components/safe_browsing/core/db:database_manager",
+ "//components/safe_browsing/core/db:safebrowsing_proto",
+ "//components/safe_browsing/core/triggers",
+ "//components/safe_browsing/core/web_ui:constants",
"//components/security_interstitials/content:security_interstitial_page",
"//components/security_interstitials/core",
"//components/services/heap_profiling/public/cpp",
@@ -244,10 +248,11 @@ source_set("browser") {
"//media/mojo:buildflags",
"//printing",
"//services/preferences/tracked",
+ "//services/proxy_resolver:lib",
+ "//third_party/blink/public/mojom/frame",
"//third_party/crashpad/crashpad/client",
"//ui/android",
"//ui/gl",
- "//ui/native_theme",
"//ui/resources",
"//ui/touch_selection",
]
diff --git a/chromium/android_webview/browser/gfx/BUILD.gn b/chromium/android_webview/browser/gfx/BUILD.gn
index 227523bece4..5b0d2358fdc 100644
--- a/chromium/android_webview/browser/gfx/BUILD.gn
+++ b/chromium/android_webview/browser/gfx/BUILD.gn
@@ -7,18 +7,24 @@ import("//build/config/android/rules.gni")
source_set("gfx") {
sources = [
+ "aw_attaching_to_window_recorder.cc",
+ "aw_attaching_to_window_recorder.h",
"aw_draw_fn_impl.cc",
"aw_draw_fn_impl.h",
"aw_gl_functor.cc",
"aw_gl_functor.h",
"aw_gl_surface.cc",
"aw_gl_surface.h",
+ "aw_gl_surface_external_stencil.cc",
+ "aw_gl_surface_external_stencil.h",
"aw_picture.cc",
"aw_picture.h",
"aw_render_thread_context_provider.cc",
"aw_render_thread_context_provider.h",
"aw_vulkan_context_provider.cc",
"aw_vulkan_context_provider.h",
+ "begin_frame_source_webview.cc",
+ "begin_frame_source_webview.h",
"browser_view_renderer.cc",
"browser_view_renderer.h",
"browser_view_renderer_client.h",
@@ -28,6 +34,8 @@ source_set("gfx") {
"compositor_frame_producer.h",
"deferred_gpu_command_service.cc",
"deferred_gpu_command_service.h",
+ "display_scheduler_webview.cc",
+ "display_scheduler_webview.h",
"gpu_service_web_view.cc",
"gpu_service_web_view.h",
"hardware_renderer.cc",
@@ -67,6 +75,7 @@ source_set("gfx") {
deps = [
"//android_webview:browser_jni_headers",
"//android_webview/common",
+ "//android_webview/public",
"//base",
"//components/ui_devtools:buildflags",
"//components/viz/service",
diff --git a/chromium/android_webview/browser/lifecycle/BUILD.gn b/chromium/android_webview/browser/lifecycle/BUILD.gn
new file mode 100644
index 00000000000..a7f4f47a46e
--- /dev/null
+++ b/chromium/android_webview/browser/lifecycle/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("lifecycle") {
+ sources = [
+ "aw_contents_lifecycle_notifier.cc",
+ "aw_contents_lifecycle_notifier.h",
+ "webview_app_state_observer.cc",
+ "webview_app_state_observer.h",
+ ]
+ deps = [
+ "//android_webview:browser_jni_headers",
+ "//base",
+ "//content/public/browser",
+ ]
+}
diff --git a/chromium/android_webview/browser/metrics/BUILD.gn b/chromium/android_webview/browser/metrics/BUILD.gn
index 3283d27db92..c2610878a63 100644
--- a/chromium/android_webview/browser/metrics/BUILD.gn
+++ b/chromium/android_webview/browser/metrics/BUILD.gn
@@ -4,25 +4,20 @@
source_set("metrics") {
sources = [
- "aw_metrics_log_uploader.cc",
- "aw_metrics_log_uploader.h",
"aw_metrics_service_client.cc",
"aw_metrics_service_client.h",
- "memory_metrics_logger.cc",
- "memory_metrics_logger.h",
+ "aw_stability_metrics_provider.cc",
+ "aw_stability_metrics_provider.h",
]
deps = [
"//android_webview:browser_jni_headers",
+ "//android_webview/browser/lifecycle",
"//android_webview/common",
"//base",
+ "//components/embedder_support/android/metrics",
"//components/metrics",
- "//components/metrics:gpu",
- "//components/metrics:net",
- "//components/metrics:ui",
"//components/prefs",
- "//components/version_info",
"//components/version_info/android:channel_getter",
"//content/public/browser",
- "//services/resource_coordinator/public/cpp/memory_instrumentation:browser",
]
}