summaryrefslogtreecommitdiff
path: root/chromium/chromeos/memory
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-20 09:47:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-07 11:15:42 +0000
commit189d4fd8fad9e3c776873be51938cd31a42b6177 (patch)
tree6497caeff5e383937996768766ab3bb2081a40b2 /chromium/chromeos/memory
parent8bc75099d364490b22f43a7ce366b366c08f4164 (diff)
downloadqtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chromeos/memory')
-rw-r--r--chromium/chromeos/memory/BUILD.gn6
-rw-r--r--chromium/chromeos/memory/userspace_swap/BUILD.gn4
2 files changed, 6 insertions, 4 deletions
diff --git a/chromium/chromeos/memory/BUILD.gn b/chromium/chromeos/memory/BUILD.gn
index ece96974fa6..2f505dacd07 100644
--- a/chromium/chromeos/memory/BUILD.gn
+++ b/chromium/chromeos/memory/BUILD.gn
@@ -18,14 +18,13 @@ component("memory") {
":chromeos_implementation",
"//build/config/linux/nss:system_nss_no_ssl_config",
]
-
- public_deps = [ "//chromeos/constants" ]
deps = [
"//base",
"//base/util/memory_pressure",
"//chromeos:chromeos_export",
"//chromeos/dbus",
"//chromeos/dbus/constants",
+ "//crypto",
"//services/resource_coordinator/public/cpp/memory_instrumentation",
]
sources = [
@@ -33,6 +32,8 @@ component("memory") {
"kstaled.h",
"memory.cc",
"memory.h",
+ "memory_ablation_study.cc",
+ "memory_ablation_study.h",
"pagemap.cc",
"pagemap.h",
"pressure/pressure.cc",
@@ -58,6 +59,7 @@ source_set("unit_tests") {
"//testing/gtest",
]
sources = [
+ "memory_ablation_study_unittest.cc",
"pagemap_unittest.cc",
"pressure/pressure_unittest.cc",
"pressure/system_memory_pressure_evaluator_unittest.cc",
diff --git a/chromium/chromeos/memory/userspace_swap/BUILD.gn b/chromium/chromeos/memory/userspace_swap/BUILD.gn
index 48e07737a37..a579e16a49c 100644
--- a/chromium/chromeos/memory/userspace_swap/BUILD.gn
+++ b/chromium/chromeos/memory/userspace_swap/BUILD.gn
@@ -27,8 +27,6 @@ component("userspace_swap") {
":chromeos_implementation",
"//build/config/linux/nss:system_nss_no_ssl_config",
]
-
- public_deps = [ "//chromeos/constants" ]
deps = [
":mojom",
"//base",
@@ -51,6 +49,8 @@ component("userspace_swap") {
"userfaultfd.h",
"userspace_swap.cc",
"userspace_swap.h",
+ "userspace_swap_renderer_initialization_impl.cc",
+ "userspace_swap_renderer_initialization_impl.h",
]
}