jamlee-t · pull · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021
diff --git a/DEPS b/DEPS
@@ -209,7 +209,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': 'd8c2750cf607df6b765b1efe51dcb6d90e294cbf',
+  'skia_revision': 'd9bf97c5e249f3335fec5718049eb49e9d0c43d2',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -288,7 +288,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling devtools-frontend
   # and whatever else without interference from each other.
-  'devtools_frontend_revision': 'ebb3e438e158ee238e5a4f82b129b7ec06f25629',
+  'devtools_frontend_revision': '59f258ec574a1ef29db15d8f1298d675db4eae75',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libprotobuf-mutator
   # and whatever else without interference from each other.
@@ -725,7 +725,7 @@ deps = {
     'packages': [
       {
           'package': 'chromium/third_party/androidx',
-          'version': 'h0wFbCr3sCo3a0_4n7N2JCIXAWCjFGsyqE3uXm1OKvIC',
+          'version': 'TQPaiJPJlYLM4nLuOGMYKI2oD6z18BE_5i_LP65y44wC',
       },
     ],
     'condition': 'checkout_android',
@@ -1333,7 +1333,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + '671be8888eb6b6547675c0bf90fb27d915414544',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + '7c32f529837711488b3c626cf1b0ae9eba72996f',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
@@ -1547,7 +1547,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '9dd7f1e157c609c8056f7f8b9c04e627611ef937',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '0d3c09a8fe5f12dfbc9f1bcd5790fda8830624ec',
+    Var('webrtc_git') + '/src.git' + '@' + '8546666cb9db79a39ddded7048bb5f82e9f4af87',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1608,7 +1608,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@f5d426f2dbb2b9f341be077f6e65b8f7a00c412c',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@2cdc811d32dc45eab64c918217ae39396b386b64',
     'condition': 'checkout_src_internal',
   },
 

diff --git a/WATCHLISTS b/WATCHLISTS
@@ -2175,8 +2175,7 @@
     'blink_css_flexbox': ['[email protected]'],
     'blink_css_fragmentation_tests': ['[email protected]'],
     'blink_css_grid_layout': ['[email protected]',
-                              '[email protected]',
-                              '[email protected]'],
+                              '[email protected]'],
     'blink_custom_elements': ['[email protected]'],
     'blink_device_orientation': ['[email protected]',
                                  '[email protected]',

diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
@@ -661,6 +661,12 @@ const base::Feature kSplitSettingsSync{"SplitSettingsSync",
 const base::Feature kSystemLatinPhysicalTyping{
     "SystemLatinPhysicalTyping", base::FEATURE_DISABLED_BY_DEFAULT};
 
+// Enables the Chrome OS system-proxy daemon, only for system services. This
+// means that system services like tlsdate, update engine etc. can opt to be
+// authenticated to a remote HTTP web proxy via system-proxy.
+const base::Feature kSystemProxyForSystemServices{
+    "SystemProxyForSystemServices", base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Enables Chrome OS Telemetry Extension.
 const base::Feature kTelemetryExtension{"TelemetryExtension",
                                         base::FEATURE_DISABLED_BY_DEFAULT};

diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
@@ -297,6 +297,8 @@ extern const base::Feature kSplitSettingsSync;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kSystemLatinPhysicalTyping;
 COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const base::Feature kSystemProxyForSystemServices;
+COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kTelemetryExtension;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kUpdatedCellularActivationUi;

diff --git a/ash/shortcut_viewer/strings/shortcut_viewer_strings_eu.xtb b/ash/shortcut_viewer/strings/shortcut_viewer_strings_eu.xtb
@@ -9,11 +9,11 @@
 <translation id="1251638888133819822">Aktibatu edo desaktibatu pantaila osoko lupa</translation>
 <translation id="1290373024480130896"><ph name="MODIFIER1" /><ph name="SEPARATOR1" /><ph name="MODIFIER2" /><ph name="SEPARATOR2" /><ph name="MODIFIER3" /><ph name="SEPARATOR3" /><ph name="KEY" /></translation>
 <translation id="1293699935367580298">Ihes</translation>
-<translation id="1299858300159559687">Inprimatu uneko orria</translation>
+<translation id="1299858300159559687">Inprimatu oraingo orria</translation>
 <translation id="1383876407941801731">Bilaketa</translation>
 <translation id="1454364489140280055"><ph name="CTRL" /><ph name="SEPARATOR1" /><ph name="SHIFT1" /><ph name="SEPARATOR2" /><ph name="G" /> edo <ph name="SHIFT2" /><ph name="SEPARATOR3" /><ph name="ENTER" /></translation>
 <translation id="1477442857810932985">Joan lerroaren amaierara</translation>
-<translation id="1499072997694708844">Itxi irekita dauden bilaketa-leihoak edo utzi uneko orria kargatzeari</translation>
+<translation id="1499072997694708844">Itxi irekita dauden bilaketa-leihoak edo utzi oraingo orria kargatzeari</translation>
 <translation id="1510238584712386396">Abiarazlea</translation>
 <translation id="152892567002884378">Igo bolumena</translation>
 <translation id="1560480564179555003"><ph name="SHIFT" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" /> eta, gero, <ph name="ESC" /></translation>
@@ -24,7 +24,7 @@
 <translation id="1732295673545939435"><ph name="MODIFIER1" /><ph name="SEPARATOR1" /><ph name="MODIFIER2" /><ph name="SEPARATOR2" /><ph name="KEY" /></translation>
 <translation id="1733525068429116555">Gehitu www. eta .com helbide-barran idatzi duzunari eta, gero, ireki orria</translation>
 <translation id="1768987374400973299">Egin pantaila-argazki edo grabaketa bat</translation>
-<translation id="1872219238824176091">Kendu uneko lan-eremua</translation>
+<translation id="1872219238824176091">Kendu oraingo lan-eremua</translation>
 <translation id="1920446759863417809"><ph name="SHIFT1" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" /> eta, gero, <ph name="SHIFT2" /><ph name="SEPARATOR3" /><ph name="TAB" /> edo <ph name="LEFT" /></translation>
 <translation id="1996162290124031907">Joan hurrengo fitxara</translation>
 <translation id="2010818616644390445">Joan leihoko azken fitxara</translation>
@@ -54,7 +54,7 @@
 <translation id="2574014812750545982">Berrezarri orriko zoom-maila</translation>
 <translation id="2596078834055697711">Atera leihoaren pantaila-argazkia</translation>
 <translation id="2685170433750953446"><ph name="SHIFT" /><ph name="SEPARATOR1" /><ph name="ALT" /><ph name="SEPARATOR2" /><ph name="L" /> eta, gero, <ph name="TAB" /> edo <ph name="RIGHT" /></translation>
-<translation id="2750942583782703988">Kargatu berriro uneko orria</translation>
+<translation id="2750942583782703988">Kargatu berriro oraingo orria</translation>
 <translation id="2764005613199379871">Fokuratu helbide-barra</translation>
 <translation id="2774822903829597107">Sortu lan-eremu bat</translation>
 <translation id="2789868185375229787">Txikitu orria</translation>
@@ -71,11 +71,11 @@
 <translation id="3126026824346185272">Ktrl</translation>
 <translation id="3140353188828248647">Fokuratu helbide-barra</translation>
 <translation id="3256109297135787951">Utzi apaleko elementu bat nabarmentzeari</translation>
-<translation id="3288816184963444640">Itxi uneko leihoa</translation>
+<translation id="3288816184963444640">Itxi oraingo leihoa</translation>
 <translation id="3407560819924487926">Erakutsi ataza-kudeatzailea</translation>
 <translation id="3417835166382867856">Bilatu fitxak</translation>
 <translation id="3422679037938588196">Itzuli bilaketaren aurreko emaitzara</translation>
-<translation id="353037708190149633">Gorde uneko leihoan irekita dauden orri guztiak laster-marka gisa karpeta berri batean</translation>
+<translation id="353037708190149633">Gorde oraingo leihoan irekita dauden orri guztiak laster-marka gisa karpeta berri batean</translation>
 <translation id="355103131818127604">Ireki esteka beste fitxa batean, atzeko planoan</translation>
 <translation id="3622741593887335780">Handitu (lupa ainguratua EDO pantaila osoko lupa gaituta daudenean)</translation>
 <translation id="3633851487917460983">Ireki arbela</translation>
@@ -84,7 +84,7 @@
 <translation id="3668361878347172356">Berregin azken ekintza</translation>
 <translation id="3710784500737332588">Ireki Laguntza-zentroa</translation>
 <translation id="3720939646656082033">Ireki esteka beste fitxa batean eta joan fitxa horretara</translation>
-<translation id="3725795051337497754">Itxi uneko fitxa</translation>
+<translation id="3725795051337497754">Itxi oraingo fitxa</translation>
 <translation id="3751033133896282964">Desegin azken ekintza</translation>
 <translation id="3792178297143798024">Ireki apaleko elementu nabarmendua</translation>
 <translation id="379295446891231126"><ph name="CTRL" /> <ph name="SEPARATOR" /> 1-8</translation>
@@ -118,15 +118,15 @@
 <translation id="5030659775136592441">Erakutsi laster-marken kudeatzailea</translation>
 <translation id="5034421018520995080">Joan orriaren goialdera</translation>
 <translation id="5042305953558921026">Ikuspegi orokorreko moduaren tekla</translation>
-<translation id="5104462712192763270">Gorde uneko orria</translation>
+<translation id="5104462712192763270">Gorde oraingo orria</translation>
 <translation id="5121628974188116412">Joan orriaren behealdera</translation>
 <translation id="5222676887888702881">Amaitu saioa</translation>
 <translation id="5236674127086649162">Kargatu orria berriro, baina cacheko edukia erabili gabe</translation>
 <translation id="526651782186312376">Hautatu lerroaren hasierako testua</translation>
 <translation id="5316716239522500219">Ispilatu monitoreak</translation>
 <translation id="539072479502328326">Aktibatu edo desaktibatu lupa ainguratua</translation>
 <translation id="5541719484267030947">Sakatu <ph name="ESC" /> fitxa arrastatu bitartean</translation>
-<translation id="5554139136362089836">Bilatu uneko orria</translation>
+<translation id="5554139136362089836">Bilatu oraingo orria</translation>
 <translation id="5563050856984839829">Sakatu <ph name="CTRL" /><ph name="SEPARATOR" /><ph name="SHIFT" /> eta egin klik esteka batean</translation>
 <translation id="561814908794220892">Ireki web-orria beste fitxa batean</translation>
 <translation id="5620219513321115856">Eraman leiho aktiboa eskuineko lan-eremura</translation>

diff --git a/ash/strings/ash_strings_eu.xtb b/ash/strings/ash_strings_eu.xtb
@@ -129,7 +129,7 @@ Hona hemen hasteko egin ditzakezun gauza batzuk.</translation>
 <translation id="1989113344093894667">Ezin da kapturatu edukia</translation>
 <translation id="1993072747612765854">Lortu informazio gehiago <ph name="SYSTEM_APP_NAME" /> aplikazioaren azken eguneratzeari buruz</translation>
 <translation id="1995660704900986789">Itzali</translation>
-<translation id="1998100899771863792">Uneko lan-eremua</translation>
+<translation id="1998100899771863792">Oraingo lan-eremua</translation>
 <translation id="2012624427112548395">Ktrl + Bilatu + H</translation>
 <translation id="2016340657076538683">Idatzi mezu bat</translation>
 <translation id="2018630726571919839">Kontatu txiste bat</translation>
@@ -554,7 +554,7 @@ Jarraitu ahal izateko, erabiltzaile guztiek saioa amaitu behar dute.</translatio
 <translation id="5673434351075758678">Ezarpenak sinkronizatu ondoren, "<ph name="FROM_LOCALE" />" ordez, "<ph name="TO_LOCALE" />" ezarri da hizkuntza gisa.</translation>
 <translation id="5677928146339483299">Blokeatuta</translation>
 <translation id="5679050765726761783">Potentzia txikiko egokigailua konektatuta dago</translation>
-<translation id="5682642926269496722">Google-ren Laguntzailea ez dago erabilgarri uneko erabiltzaile-kontuan.</translation>
+<translation id="5682642926269496722">Google-ren Laguntzailea ez dago erabilgarri oraingo erabiltzaile-kontuan.</translation>
 <translation id="5689633613396158040">Gaueko argia eginbideari esker, ez zaizu egingo horren nekagarria argi gutxiko inguruetan pantailari begira egotea. Sakatu hau Gaueko argia aktibatzeko ordua aldatzeko, edo aukera hori erabat desaktibatzeko.</translation>
 <translation id="5691772641933328258">Ez da ezagutu hatz-marka</translation>
 <translation id="5710450975648804523">Aktibatuta dago ez molestatzeko modua</translation>
@@ -692,7 +692,7 @@ Jarraitu ahal izateko, erabiltzaile guztiek saioa amaitu behar dute.</translatio
 <translation id="6816797338148849397">Eskuragarri dago zure hautapenari buruzko informazioa. Erabili gora egiteko gezi-tekla informazioa atzitzeko.</translation>
 <translation id="6818242057446442178">Joan aurreko hitzera</translation>
 <translation id="6820676911989879663">Hartu atseden</translation>
-<translation id="6850010208275816200">Pantaila osoko moduan dago uneko aplikazioa. Aplikazioak pasahitza eskatzen badizu, lehenik atera pantaila osoko modutik.</translation>
+<translation id="6850010208275816200">Pantaila osoko moduan dago oraingo aplikazioa. Aplikazioak pasahitza eskatzen badizu, lehenik atera pantaila osoko modutik.</translation>
 <translation id="6852052252232534364">Sakatu aktibatzeko</translation>
 <translation id="6857725247182211756"><ph name="SECONDS" /> s</translation>
 <translation id="6857811139397017780">Aktibatu <ph name="NETWORKSERVICE" /></translation>

diff --git a/ash/strings/ash_strings_ky.xtb b/ash/strings/ash_strings_ky.xtb
@@ -83,7 +83,7 @@
 <translation id="1570871743947603115">Bluetooth'ду өчүрүү/күйгүзүү. <ph name="STATE_TEXT" /></translation>
 <translation id="1589090746204042747">Бул сеанста аткарган иш-аракеттериңизди көрөт</translation>
 <translation id="1611993646327628135">Күйүк</translation>
-<translation id="1615402009686901181">Купуя мазмун көрүнүп турганда, Администратордун саясатына ылайык экрандагыны сүрөткө тартып алууга болбойт</translation>
+<translation id="1615402009686901181">Купуя нерселер көрүнүп турганда, Администратордун саясатына ылайык экрандагыны сүрөткө тартып алууга болбойт</translation>
 <translation id="1632985212731562677">Switch Access функциясын Жөндөөлөр &gt; Атайын мүмкүнчүлүктөр бөлүмүнөн өчүрүүгө болот.</translation>
 <translation id="1654477262762802994">Айтып издеп баштоо</translation>
 <translation id="1667964833127753507">Нейтралдуу түс режими тушкагаздан алынган түстөрдү эмес нейтралдуу тондогу жарык жана караңгы өндөрдү колдонот.</translation>
@@ -609,7 +609,7 @@
 <translation id="6062360702481658777"><ph name="LOGOUT_TIME_LEFT" /> ичинен автоматтык түрдө чыгарыласыз.</translation>
 <translation id="6073451960410192870">Жаздырууну токтотуу</translation>
 <translation id="607652042414456612">Компьютериңиз жакын арадагы Bluetooth түзмөктөрүнө көрүнүп, <ph name="ADDRESS" /> дарегиндеги "<ph name="NAME" />" катары күйүп турат.</translation>
-<translation id="6094290315941448991">Купуя мазмун көрүнүп турганда, Администратордун саясатына ылайык экрандагыны видеого жаздырып алууга болбойт</translation>
+<translation id="6094290315941448991">Купуя нерселер көрүнүп турганда, Администратордун саясатына ылайык экрандагыны видеого жаздырып алууга болбойт</translation>
 <translation id="6119360623251949462"><ph name="CHARGING_STATE" />. <ph name="BATTERY_SAVER_STATE" /></translation>
 <translation id="612734058257491180">Google Жардамчысы конок сеансында жеткиликсиз.</translation>
 <translation id="6137566720514957455"><ph name="USER_EMAIL_ADDRESS" /> аккаунтун өчүрүү диалогун ачуу</translation>

diff --git a/base/allocator/partition_allocator/thread_cache.cc b/base/allocator/partition_allocator/thread_cache.cc
@@ -616,6 +616,13 @@ void ThreadCache::Purge() {
   PurgeInternal();
 }
 
+// static
+void ThreadCache::PurgeCurrentThread() {
+  auto* tcache = Get();
+  if (IsValid(tcache))
+    tcache->Purge();
+}
+
 void ThreadCache::PurgeInternal() {
   should_purge_.store(false, std::memory_order_relaxed);
   // TODO(lizeb): Investigate whether lock acquisition should be less frequent.

diff --git a/base/allocator/partition_allocator/thread_cache.h b/base/allocator/partition_allocator/thread_cache.h
@@ -214,9 +214,13 @@ class BASE_EXPORT ThreadCache {
   // The Partition lock must *not* be held when calling this.
   // Must be called from the thread this cache is for.
   void Purge();
+  // Amount of cached memory for this thread's cache, in bytes.
   size_t CachedMemory() const;
   void AccumulateStats(ThreadCacheStats* stats) const;
 
+  // Purge the thread cache of the current thread, if one exists.
+  static void PurgeCurrentThread();
+
   size_t bucket_count_for_testing(size_t index) const {
     return buckets_[index].count;
   }

diff --git a/base/task/thread_pool/pooled_single_thread_task_runner_manager.cc b/base/task/thread_pool/pooled_single_thread_task_runner_manager.cc
@@ -115,6 +115,7 @@ class WorkerThreadDelegate : public WorkerThread::Delegate {
   RegisteredTaskSource GetWork(WorkerThread* worker) override {
     CheckedAutoLock auto_lock(lock_);
     DCHECK(worker_awake_);
+
     auto task_source = GetWorkLockRequired(worker);
     if (!task_source) {
       // The worker will sleep after this returns nullptr.

diff --git a/base/task/thread_pool/worker_thread.cc b/base/task/thread_pool/worker_thread.cc
@@ -6,8 +6,11 @@
 
 #include <stddef.h>
 
+#include <algorithm>
 #include <utility>
 
+#include "base/allocator/buildflags.h"
+#include "base/allocator/partition_allocator/partition_alloc_config.h"
 #include "base/callback_helpers.h"
 #include "base/check_op.h"
 #include "base/compiler_specific.h"
@@ -23,19 +26,50 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \
+    defined(PA_THREAD_CACHE_SUPPORTED)
+#include "base/allocator/partition_allocator/thread_cache.h"
+#endif
+
 namespace base {
 namespace internal {
 
+constexpr TimeDelta WorkerThread::Delegate::kPurgeThreadCacheIdleDelay;
+
 void WorkerThread::Delegate::WaitForWork(WaitableEvent* wake_up_event) {
   DCHECK(wake_up_event);
   const TimeDelta sleep_time = GetSleepTimeout();
-  if (sleep_time.is_max()) {
-    // Calling TimedWait with TimeDelta::Max is not recommended per
-    // http://crbug.com/465948.
-    wake_up_event->Wait();
-  } else {
-    wake_up_event->TimedWait(sleep_time);
+
+  // When a thread goes to sleep, the memory retained by its thread cache is
+  // trapped there for as long as the thread sleeps. To prevent that, we can
+  // either purge the thread cache right before going to sleep, or after some
+  // delay.
+  //
+  // Purging the thread cache incurs a cost on the next task, since its thread
+  // cache will be empty and allocation performance initially lower. As a lot of
+  // sleeps are very short, do not purge all the time (this would also make
+  // sleep / wakeups cycles more costly).
+  //
+  // Instead, sleep for min(timeout, 1s). If the wait times out then purge at
+  // that point, and go to sleep for the remaining of the time. This ensures
+  // that we do no work for short sleeps, and that threads do not get awaken
+  // many times.
+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \
+    defined(PA_THREAD_CACHE_SUPPORTED)
+  bool was_signaled = wake_up_event->TimedWait(
+      std::min(sleep_time, kPurgeThreadCacheIdleDelay));
+
+  // Timed out.
+  if (!was_signaled) {
+    ThreadCache::PurgeCurrentThread();
+
+    if (sleep_time > kPurgeThreadCacheIdleDelay)
+      wake_up_event->TimedWait(sleep_time - kPurgeThreadCacheIdleDelay);
   }
+#else
+  wake_up_event->TimedWait(sleep_time);
+#endif  // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) &&
+        // defined(PA_THREAD_CACHE_SUPPORTED)
 }
 
 WorkerThread::WorkerThread(ThreadPriority priority_hint,