summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/controller
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-17 17:24:03 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-06-22 07:51:41 +0000
commit774f54339e5db91f785733232d3950366db65d07 (patch)
tree068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/third_party/blink/renderer/controller
parentf7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff)
downloadqtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/controller')
-rw-r--r--chromium/third_party/blink/renderer/controller/BUILD.gn1
-rw-r--r--chromium/third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.cc2
-rw-r--r--chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc6
-rw-r--r--chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h4
-rw-r--r--chromium/third_party/blink/renderer/controller/highest_pmf_reporter.cc2
-rw-r--r--chromium/third_party/blink/renderer/controller/highest_pmf_reporter.h1
-rw-r--r--chromium/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc1
-rw-r--r--chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc1
-rw-r--r--chromium/third_party/blink/renderer/controller/performance_manager/v8_worker_memory_reporter.cc3
-rw-r--r--chromium/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h1
10 files changed, 15 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/controller/BUILD.gn b/chromium/third_party/blink/renderer/controller/BUILD.gn
index a789586193e..8fd0fb4ad9c 100644
--- a/chromium/third_party/blink/renderer/controller/BUILD.gn
+++ b/chromium/third_party/blink/renderer/controller/BUILD.gn
@@ -197,6 +197,7 @@ source_set("blink_bindings_test_sources") {
"//third_party/blink/renderer/core:testing",
"//third_party/blink/renderer/core:unit_test_support",
"//third_party/blink/renderer/modules:modules",
+ "//third_party/blink/renderer/modules/mediastream:test_support",
"//third_party/blink/renderer/platform:platform",
"//third_party/blink/renderer/platform:test_support",
]
diff --git a/chromium/third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.cc b/chromium/third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.cc
index 7720c756eea..c0259841980 100644
--- a/chromium/third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.cc
+++ b/chromium/third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.cc
@@ -31,7 +31,7 @@ CrashMemoryMetricsReporterImpl& CrashMemoryMetricsReporterImpl::Instance() {
}
CrashMemoryMetricsReporterImpl::CrashMemoryMetricsReporterImpl() {
- base::SetPartitionAllocOomCallback(
+ ::partition_alloc::SetPartitionAllocOomCallback(
CrashMemoryMetricsReporterImpl::OnOOMCallback);
}
diff --git a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc
index da695d4860b..de57128d27d 100644
--- a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc
+++ b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.cc
@@ -30,6 +30,8 @@
#include "third_party/blink/renderer/controller/dev_tools_frontend_impl.h"
+#include <utility>
+
#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_dev_tools_host.h"
#include "third_party/blink/renderer/core/exported/web_view_impl.h"
@@ -127,9 +129,9 @@ void DevToolsFrontendImpl::SetupDevToolsExtensionAPI(
api_script_ = extension_api;
}
-void DevToolsFrontendImpl::SendMessageToEmbedder(base::Value message) {
+void DevToolsFrontendImpl::SendMessageToEmbedder(base::Value::Dict message) {
if (host_.is_bound())
- host_->DispatchEmbedderMessage(std::move(message));
+ host_->DispatchEmbedderMessage(base::Value(std::move(message)));
}
void DevToolsFrontendImpl::DestroyOnHostGone() {
diff --git a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h
index b2b457960cb..3e486095669 100644
--- a/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h
+++ b/chromium/third_party/blink/renderer/controller/dev_tools_frontend_impl.h
@@ -31,13 +31,13 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CONTROLLER_DEV_TOOLS_FRONTEND_IMPL_H_
#define THIRD_PARTY_BLINK_RENDERER_CONTROLLER_DEV_TOOLS_FRONTEND_IMPL_H_
+#include "base/values.h"
#include "third_party/blink/public/mojom/devtools/devtools_frontend.mojom-blink.h"
#include "third_party/blink/renderer/core/inspector/inspector_frontend_client.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
#include "third_party/blink/renderer/platform/mojo/heap_mojo_associated_receiver.h"
#include "third_party/blink/renderer/platform/mojo/heap_mojo_associated_remote.h"
#include "third_party/blink/renderer/platform/supplementable.h"
-#include "third_party/blink/renderer/platform/wtf/hash_map.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace blink {
@@ -82,7 +82,7 @@ class DevToolsFrontendImpl final
void SetupDevToolsExtensionAPI(const String& extension_api) override;
// InspectorFrontendClient implementation.
- void SendMessageToEmbedder(base::Value) override;
+ void SendMessageToEmbedder(base::Value::Dict) override;
Member<DevToolsHost> devtools_host_;
String api_script_;
diff --git a/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.cc b/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.cc
index e0771025d08..44ddae01026 100644
--- a/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.cc
+++ b/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.cc
@@ -120,7 +120,7 @@ void HighestPmfReporter::OnReportMetrics() {
peak_resident_bytes_at_current_highest_pmf_ = 0.0;
webpage_counts_at_current_highest_pmf_ = 0;
report_count_++;
- if (report_count_ >= base::size(time_to_report)) {
+ if (report_count_ >= std::size(time_to_report)) {
// Stop observing the MemoryUsageMonitor once there's no more histogram to
// report.
MemoryUsageMonitor::Instance().RemoveObserver(this);
diff --git a/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.h b/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.h
index d5e2ff10f8a..279de35ce2c 100644
--- a/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.h
+++ b/chromium/third_party/blink/renderer/controller/highest_pmf_reporter.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CONTROLLER_HIGHEST_PMF_REPORTER_H_
#define THIRD_PARTY_BLINK_RENDERER_CONTROLLER_HIGHEST_PMF_REPORTER_H_
+#include "base/time/time.h"
#include "third_party/blink/renderer/controller/controller_export.h"
#include "third_party/blink/renderer/controller/memory_usage_monitor.h"
#include "third_party/blink/renderer/platform/timer.h"
diff --git a/chromium/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc b/chromium/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc
index 90a3927e1b1..0b9b655037b 100644
--- a/chromium/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc
+++ b/chromium/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc
@@ -8,6 +8,7 @@
#include "base/memory/ptr_util.h"
#include "base/test/test_mock_time_task_runner.h"
+#include "base/time/time.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/features.h"
diff --git a/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc b/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc
index 8dcc8b0777f..a91a68ef72e 100644
--- a/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc
+++ b/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc
@@ -4,6 +4,7 @@
#include "third_party/blink/renderer/controller/memory_usage_monitor.h"
+#include "base/observer_list.h"
#include "third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h"
#include "third_party/blink/renderer/platform/heap/process_heap.h"
#include "third_party/blink/renderer/platform/scheduler/public/thread.h"
diff --git a/chromium/third_party/blink/renderer/controller/performance_manager/v8_worker_memory_reporter.cc b/chromium/third_party/blink/renderer/controller/performance_manager/v8_worker_memory_reporter.cc
index 9f14c75f8ee..244872c9ea9 100644
--- a/chromium/third_party/blink/renderer/controller/performance_manager/v8_worker_memory_reporter.cc
+++ b/chromium/third_party/blink/renderer/controller/performance_manager/v8_worker_memory_reporter.cc
@@ -17,7 +17,8 @@
#include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h"
#include "third_party/blink/renderer/platform/scheduler/public/thread.h"
#include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
-#include "third_party/blink/renderer/platform/wtf/cross_thread_copier.h"
+#include "third_party/blink/renderer/platform/wtf/cross_thread_copier_base.h"
+#include "third_party/blink/renderer/platform/wtf/cross_thread_copier_std.h"
#include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
#include "third_party/blink/renderer/platform/wtf/functional.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
diff --git a/chromium/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h b/chromium/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h
index 3bd01768cf0..51001a227c2 100644
--- a/chromium/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h
+++ b/chromium/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CONTROLLER_USER_LEVEL_MEMORY_PRESSURE_SIGNAL_GENERATOR_H_
#define THIRD_PARTY_BLINK_RENDERER_CONTROLLER_USER_LEVEL_MEMORY_PRESSURE_SIGNAL_GENERATOR_H_
+#include "base/time/time.h"
#include "third_party/blink/renderer/controller/controller_export.h"
#include "third_party/blink/renderer/controller/memory_usage_monitor.h"
#include "third_party/blink/renderer/platform/scheduler/public/rail_mode_observer.h"