diff --git a/DEPS b/DEPS index 2e95afb2f8e9e8..a03f8cbd767e4e 100644 --- a/DEPS +++ b/DEPS @@ -235,7 +235,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'ce22e059ffeb82abdff47e0cebdb38544fa53813', + 'skia_revision': 'f843d5cf721201be95bfe943ad3243fcb485a39c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h index e5da06566ffef8..c9b535eb083c25 100644 --- a/gin/public/v8_platform.h +++ b/gin/public/v8_platform.h @@ -31,6 +31,7 @@ class GIN_EXPORT V8Platform : public v8::Platform { // verified in the tests for gin::PageAllocator. PageAllocator* GetPageAllocator() override; void OnCriticalMemoryPressure() override; + v8::ZoneBackingAllocator* GetZoneBackingAllocator() override; #endif std::shared_ptr GetForegroundTaskRunner( diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc index aa9d5e0e4ca176..563888e117dd23 100644 --- a/gin/v8_platform.cc +++ b/gin/v8_platform.cc @@ -12,6 +12,7 @@ #include "base/check_op.h" #include "base/debug/stack_trace.h" #include "base/location.h" +#include "base/memory/nonscannable_memory.h" #include "base/rand_util.h" #include "base/system/sys_info.h" #include "base/task/post_job.h" @@ -374,6 +375,16 @@ void V8Platform::OnCriticalMemoryPressure() { base::ReleaseReservation(); #endif } + +v8::ZoneBackingAllocator* V8Platform::GetZoneBackingAllocator() { + static struct Allocator final : v8::ZoneBackingAllocator { + MallocFn GetMallocFn() const override { + return &base::AllocNonQuarantinable; + } + FreeFn GetFreeFn() const override { return &base::FreeNonQuarantinable; } + } allocator; + return &allocator; +} #endif // BUILDFLAG(USE_PARTITION_ALLOC) std::shared_ptr V8Platform::GetForegroundTaskRunner( diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 index 98ea017213bcfb..be3f1349184c60 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -607bc74e06b156378666c4a114fecd6b2ab1d1ac \ No newline at end of file +0c79a8549cae39717eed3938f66a1df61cdec23c \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 index 7e5468bae6ed5b..91cde470a02ec4 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -b89001ad687c4bc68f8329ebc6cfb931cdc7e7f5 \ No newline at end of file +f43cfb4d1eada68555576edc12fe82721dc32551 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 index ff882c87b5d636..5484fde58111b8 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -afa070a14d743c0c18a11d09c760f9c0170bd495 \ No newline at end of file +83118f1c680e2a7a2aa21bd28e4d5f9d40169fa8 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 index 1d5300668b9ef7..190106151a11ae 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -138590c38d81c616d3e8ac2a89d6b5dc9d2fe74c \ No newline at end of file +0c555bf6e521341bac9fe7cbd6592fe8c89b1613 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 index 5aad8d576f9602..f5bb4ee8dc42bd 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -083c5fc06183d2a63bb2b5e40c1022a06f4ef218 \ No newline at end of file +8da5ee51371e01e06ed6e918e3d871a617304a24 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 index 3f957a8bb0823e..204eed63abf91a 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -1385b8434c73be4d0328fff20215ba6a41a184d0 \ No newline at end of file +b95c18da08d13d46a820c83603daa52e9a824a11 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 index b3e27465b1e32c..f2c0153087d6fd 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -b481a19e01deb28df98f966e1abafaf6b25ced45 \ No newline at end of file +d298669c1c2eae6d78f3222b4999d16a17a27fe0 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 index eb5985091e92df..df4aeb8904ab6e 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -b4a1b6bb75087037008ad7db78cfded9dfee9424 \ No newline at end of file +4f10d0700a61a8b23bf1aba00426810c04813d13 \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 index 5ea1bcfe81c0a1..25861067a8a3e7 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -8baead2529a29c1943e528e54d9aa7fdcca59328 \ No newline at end of file +00f11aa2095bda6c252978ba504311b99187051c \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 index f0c93d930a6e34..29daff2c5d089e 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -584c03a9996c0368df7b249b46ffe78769293470 \ No newline at end of file +ed6eda6145a6275aed4b7e4ea3e2403c2c0dcbba \ No newline at end of file diff --git a/tools/metrics/histograms/metadata/media/histograms.xml b/tools/metrics/histograms/metadata/media/histograms.xml index 776349da2af1af..42ec90a3ba87c1 100644 --- a/tools/metrics/histograms/metadata/media/histograms.xml +++ b/tools/metrics/histograms/metadata/media/histograms.xml @@ -2891,12 +2891,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. + expires_after="2022-10-31"> henrika@chromium.org webrtc-audio@google.com Heuristically detects if the user has muted the microphone or not. Measured - approximately four times per minute. + approximately four times per minute while an audio input stream is active. diff --git a/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html b/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html index c8544a0de02662..19a961055a00c5 100644 --- a/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html +++ b/ui/webui/resources/cr_components/chromeos/multidevice_setup/icons.html @@ -22,21 +22,21 @@ - - + + - - + + - - - + + + - - + + - - + + diff --git a/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html b/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html index 8a8f35ec09aa53..50c9d1057ab433 100644 --- a/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html +++ b/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup.html @@ -24,8 +24,9 @@ } #container { + background-color: var(--cr-card-background-color); box-sizing: border-box; - color: var(--google-grey-700); + color: var(--cr-secondary-text-color); display: flex; flex-direction: column; font-size: 13px; diff --git a/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html b/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html index 3d26c8bddd255c..a620ca4faaf2a9 100644 --- a/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html +++ b/ui/webui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html @@ -23,7 +23,7 @@