jamlee-t · pull · Oct 3, 2021 · Oct 3, 2021 · Oct 3, 2021 · Oct 3, 2021
diff --git 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
@@ -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<v8::TaskRunner> GetForegroundTaskRunner(

diff --git 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<v8::TaskRunner> 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
@@ -1 +1 @@
-607bc74e06b156378666c4a114fecd6b2ab1d1ac
+0c79a8549cae39717eed3938f66a1df61cdec23c
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
@@ -1 +1 @@
-b89001ad687c4bc68f8329ebc6cfb931cdc7e7f5
+f43cfb4d1eada68555576edc12fe82721dc32551
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
@@ -1 +1 @@
-afa070a14d743c0c18a11d09c760f9c0170bd495
+83118f1c680e2a7a2aa21bd28e4d5f9d40169fa8
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
@@ -1 +1 @@
-138590c38d81c616d3e8ac2a89d6b5dc9d2fe74c
+0c555bf6e521341bac9fe7cbd6592fe8c89b1613
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
@@ -1 +1 @@
-083c5fc06183d2a63bb2b5e40c1022a06f4ef218
+8da5ee51371e01e06ed6e918e3d871a617304a24
diff --git a/...gle_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 b/...gle_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@
-1385b8434c73be4d0328fff20215ba6a41a184d0
+b95c18da08d13d46a820c83603daa52e9a824a11
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
@@ -1 +1 @@
-b481a19e01deb28df98f966e1abafaf6b25ced45
+d298669c1c2eae6d78f3222b4999d16a17a27fe0
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
@@ -1 +1 @@
-b4a1b6bb75087037008ad7db78cfded9dfee9424
+4f10d0700a61a8b23bf1aba00426810c04813d13
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
@@ -1 +1 @@
-8baead2529a29c1943e528e54d9aa7fdcca59328
+00f11aa2095bda6c252978ba504311b99187051c
diff --git a/...oogle_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/...oogle_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@
-584c03a9996c0368df7b249b46ffe78769293470
+ed6eda6145a6275aed4b7e4ea3e2403c2c0dcbba
diff --git 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.
 </histogram>
 
 <histogram name="Media.MicrophoneMuted" enum="MicrophoneMuteResult"
-    expires_after="2021-10-31">
+    expires_after="2022-10-31">
   <owner>[email protected]</owner>
   <owner>[email protected]</owner>
   <summary>
     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.
   </summary>
 </histogram>
 

diff --git 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 @@
 <iron-iconset-svg name="multidevice-setup-icons-20" size="20">
   <svg>
     <defs>
-      <g id="messages" fill="none" fill-rule="evenodd">
-        <path d="M16.3107503,3 L3.66666667,3 C2.75,3 2,3.75 2,4.66666667 L2,18.3161621 L5.33333333,15 L16.3107503,15 C17.227417,15 17.977417,14.2328288 17.977417,13.3161621 L17.977417,4.66666667 C17.977417,3.75 17.227417,3 16.3107503,3 Z M16,13 L4,13 L4,5 L16,5 L16,13 Z M6,8 L8,8 L8,10 L6,10 L6,8 Z M9,8 L11,8 L11,10 L9,10 L9,8 Z M12,8 L14,8 L14,10 L12,10 L12,8 Z" fill="#1E88E5"></path>
+      <g id="messages" fill-rule="evenodd">
+        <path d="M16.3107503,3 L3.66666667,3 C2.75,3 2,3.75 2,4.66666667 L2,18.3161621 L5.33333333,15 L16.3107503,15 C17.227417,15 17.977417,14.2328288 17.977417,13.3161621 L17.977417,4.66666667 C17.977417,3.75 17.227417,3 16.3107503,3 Z M16,13 L4,13 L4,5 L16,5 L16,13 Z M6,8 L8,8 L8,10 L6,10 L6,8 Z M9,8 L11,8 L11,10 L9,10 L9,8 Z M12,8 L14,8 L14,10 L12,10 L12,8 Z"></path>
       </g>
-      <g id="notifications" fill="none" fill-rule="evenodd">
-        <path d="M11,3.10001812 C13.2822403,3.56328845 15,5.58104209 15,8 C15,10.7614237 15,13 15,13 L17,13 L17,15 L3,15 L3,13 L5,13 C5,13 5,9.9021552 5,8 C5,5.58104209 6.71775968,3.56328845 9,3.10001812 L9,2.5 C9,1.94771525 9.44771525,1.5 10,1.5 C10.5522847,1.5 11,1.94771525 11,2.5 L11,3.10001812 Z M7,8 L7,13 L13,13 L13,8 C13,6.34314575 11.6568542,5 10,5 C8.34314575,5 7,6.34314575 7,8 Z M10,18 C8.8954305,18 8,17.1045695 8,16 L12,16 C12,17.1045695 11.1045695,18 10,18 Z" fill="#1E88E5"></path>
+      <g id="notifications" fill-rule="evenodd">
+        <path d="M11,3.10001812 C13.2822403,3.56328845 15,5.58104209 15,8 C15,10.7614237 15,13 15,13 L17,13 L17,15 L3,15 L3,13 L5,13 C5,13 5,9.9021552 5,8 C5,5.58104209 6.71775968,3.56328845 9,3.10001812 L9,2.5 C9,1.94771525 9.44771525,1.5 10,1.5 C10.5522847,1.5 11,1.94771525 11,2.5 L11,3.10001812 Z M7,8 L7,13 L13,13 L13,8 C13,6.34314575 11.6568542,5 10,5 C8.34314575,5 7,6.34314575 7,8 Z M10,18 C8.8954305,18 8,17.1045695 8,16 L12,16 C12,17.1045695 11.1045695,18 10,18 Z"></path>
       </g>
-      <g id="wifi" fill="none" fill-rule="evenodd">
-        <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill="#1E88E5" fill-opacity=".3"></path>
-        <path d="M2.942 9.143l7.05 8.85L10 18l.008-.008 7.05-8.85C16.7 8.867 14.008 6.668 10 6.668s-6.7 2.2-7.058 2.476z" fill="#1E88E5"></path>
+      <g id="wifi" fill-rule="evenodd">
+        <path d="M10.01 17.99L20 5.46C19.613 5.164 15.765 2 10 2 4.227 2 .387 5.165 0 5.46l9.99 12.53.01.01.01-.01z" fill-opacity=".3"></path>
+        <path d="M2.942 9.143l7.05 8.85L10 18l.008-.008 7.05-8.85C16.7 8.867 14.008 6.668 10 6.668s-6.7 2.2-7.058 2.476z"></path>
       </g>
-      <g id="downloads" fill="none" fill-rule="evenodd">
-        <path d="M2,13 L4,13 L4,16 L16,16 L16,13 L18,13 L18,16 C18,17.1 17.1,18 16,18 L4,18 C2.9,18 2,17.1 2,16 L2,13 Z M13.59,7.59 L11,10.17 L11,2 L9,2 L9,10.17 L6.41,7.59 L5,9 L10,14 L15,9 L13.59,7.59 Z" fill="#1E88E5"></path>
+      <g id="downloads" fill-rule="evenodd">
+        <path d="M2,13 L4,13 L4,16 L16,16 L16,13 L18,13 L18,16 C18,17.1 17.1,18 16,18 L4,18 C2.9,18 2,17.1 2,16 L2,13 Z M13.59,7.59 L11,10.17 L11,2 L9,2 L9,10.17 L6.41,7.59 L5,9 L10,14 L15,9 L13.59,7.59 Z"></path>
       </g>
-      <g id="features" fill="none" fill-rule="evenodd">
-        <path d="M5,5 L18,5 L18,3.5 L5.16080729,3.5 C4.24414063,3.5 3.49414062,4.23125 3.49414062,5.125 L3.49414062,14 L1,14 L1,17 L11,17 L11,14 L5,14 L5,5 Z M18.1666667,6.49829102 L13.3713582,6.49829102 C12.9130249,6.49829102 12.5,6.86391602 12.5,7.31079102 L12.5,16.171875 C12.5,16.61875 12.9130249,17 13.3713582,17 L18.1666667,17 C18.625,17 19,16.61875 19,16.171875 L19,7.31079102 C19,6.86391602 18.625,6.49829102 18.1666667,6.49829102 Z M17.5,14 L14,14 L14,8.5 L17.5,8.5 L17.5,14 Z" fill="#1E88E5"></path>
+      <g id="features" fill-rule="evenodd">
+        <path d="M5,5 L18,5 L18,3.5 L5.16080729,3.5 C4.24414063,3.5 3.49414062,4.23125 3.49414062,5.125 L3.49414062,14 L1,14 L1,17 L11,17 L11,14 L5,14 L5,5 Z M18.1666667,6.49829102 L13.3713582,6.49829102 C12.9130249,6.49829102 12.5,6.86391602 12.5,7.31079102 L12.5,16.171875 C12.5,16.61875 12.9130249,17 13.3713582,17 L18.1666667,17 C18.625,17 19,16.61875 19,16.171875 L19,7.31079102 C19,6.86391602 18.625,6.49829102 18.1666667,6.49829102 Z M17.5,14 L14,14 L14,8.5 L17.5,8.5 L17.5,14 Z"></path>
       </g>
     </defs>
   </svg>

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
@@ -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/...ebui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html b/...ebui/resources/cr_components/chromeos/multidevice_setup/multidevice_setup_shared_css.html
@@ -23,7 +23,7 @@
   <template>
     <style include="iron-flex cr-shared-style md-select">
       a {
-        color: var(--google-blue-600);
+        color: var(--cr-link-color);
         text-decoration: none;
       }
     </style>

diff --git a/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html b/ui/webui/resources/cr_components/chromeos/multidevice_setup/password_page.html
@@ -12,7 +12,7 @@
     <style include="multidevice-setup-shared">
       #user-info-container  {
         align-items: center;
-        color: var(--paper-grey-600);
+        color: var(--cr-secondary-text-color);
         display: flex;
         padding-top: 32px;
       }

diff --git a/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html b/ui/webui/resources/cr_components/chromeos/multidevice_setup/start_setup_page.html
@@ -19,18 +19,12 @@
         display: inline-block;
       }
 
-      .feature-detail iron-icon {
-        --iron-icon-height: 20px;
-        --iron-icon-width: 20px;
-        min-width: 20px;
-      }
-
       #singleDeviceName {
-        color: var(--google-grey-900);
+        color: var(--cr-primary-text-color);
       }
 
       .offline-device-name {
-        color: var(--google-grey-700);
+        color: var(--cr-secondary-text-color);
       }
 
       #animation-container {
@@ -82,7 +76,7 @@
       }
 
       #feature-details-container {
-        color: var(--google-grey-900);
+        color: var(--cr-primary-text-color);
         padding-top: 40px;
       }
 
@@ -91,9 +85,19 @@
       }
 
       .feature-detail iron-icon {
+        --iron-icon-fill-color: var(--google-blue-600);
+        --iron-icon-height: 20px;
+        --iron-icon-width: 20px;
+        min-width: 20px;
         padding: 0 20px;
       }
 
+      @media (prefers-color-scheme: dark) {
+        .feature-detail iron-icon {
+          --iron-icon-fill-color: var(--google-blue-300);
+        }
+      }
+
       /* Hide the animation when not enough space in vertical mode. */
       @media screen and (max-height: 1048px) {
         :host-context([orientation=vertical][screen=oobe])

diff --git a/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html b/ui/webui/resources/cr_components/chromeos/multidevice_setup/ui_page.html
@@ -46,7 +46,7 @@
       }
 
       h1 {
-        color: var(--google-grey-900);
+        color: var(--cr-primary-text-color);
         font-family: 'Google Sans', Roboto, sans-serif;
         font-size: 28px;
         font-weight: normal;
@@ -57,7 +57,7 @@
       }
 
       #message-container {
-        color: var(--google-grey-700);
+        color: var(--cr-secondary-text-color);
         line-height: 18px;
         min-height: 32px;
         overflow-wrap: break-word;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		607bc74e06b156378666c4a114fecd6b2ab1d1ac
		0c79a8549cae39717eed3938f66a1df61cdec23c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b89001ad687c4bc68f8329ebc6cfb931cdc7e7f5
		f43cfb4d1eada68555576edc12fe82721dc32551
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		afa070a14d743c0c18a11d09c760f9c0170bd495
		83118f1c680e2a7a2aa21bd28e4d5f9d40169fa8
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		138590c38d81c616d3e8ac2a89d6b5dc9d2fe74c
		0c555bf6e521341bac9fe7cbd6592fe8c89b1613
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		083c5fc06183d2a63bb2b5e40c1022a06f4ef218
		8da5ee51371e01e06ed6e918e3d871a617304a24
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1385b8434c73be4d0328fff20215ba6a41a184d0
		b95c18da08d13d46a820c83603daa52e9a824a11
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b481a19e01deb28df98f966e1abafaf6b25ced45
		d298669c1c2eae6d78f3222b4999d16a17a27fe0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b4a1b6bb75087037008ad7db78cfded9dfee9424
		4f10d0700a61a8b23bf1aba00426810c04813d13
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8baead2529a29c1943e528e54d9aa7fdcca59328
		00f11aa2095bda6c252978ba504311b99187051c
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		584c03a9996c0368df7b249b46ffe78769293470
		ed6eda6145a6275aed4b7e4ea3e2403c2c0dcbba