Merge branch 'master' of https://chromium.googlesource.com/chromium/src…

… into master.lion
blueboxd · Jan 2, 2021 · 8170655 · 8170655
2 parents cf237bd + 59d6420
commit 8170655
Show file tree

Hide file tree

Showing 753 changed files with 6,496 additions and 3,607 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -451,6 +451,7 @@ Jared Shumway <[email protected]>
 Jared Sohn <[email protected]>
 Jared Wein <[email protected]>
 Jari Karppanen <[email protected]>
+Jason Gronn <[email protected]>
 Jay Oster <[email protected]>
 Jay Soffian <[email protected]>
 Jeado Ko <[email protected]>

diff --git a/DEPS b/DEPS
@@ -199,23 +199,23 @@ 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': '8f924ac0ce63806886b7297e8be554984a6e7ce5',
+  'skia_revision': 'af35386f2e2845c836fb4d7436292a1553b428cf',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'ef6c61213b14d3cf31e97bbd314e1dda24794a0d',
+  'v8_revision': 'a3f2933bb6d06bd7473ccbed77714874e6bf63b3',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
   'swarming_revision': '1a072711d4388c62e02480fabc26c68c24494be9',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '938399865e720c2e37616cdad64109ef331bb035',
+  'angle_revision': 'bf02c31bec07a549cc8eea26ad0e63143954643d',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
-  'swiftshader_revision': '1cc5b3357d2ff3c81ef7ec0b07a6660796bde5cd',
+  'swiftshader_revision': 'ff29e249d3179766a40c9486183559fe3e5c1456',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFium
   # and whatever else without interference from each other.
@@ -274,7 +274,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': '3b3a5d369325da454bf792730ad8bf3719ea59be',
+  'devtools_frontend_revision': '2ade89ddd0362e74d52f9928f448e448c625937e',
   # 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.
@@ -314,7 +314,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '9a38e5b60dccb9ca6f596adf91328aca9c17e62f',
+  'dawn_revision': '86980018b3f2786aeb5ded1220ec94bc927fa6b2',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -553,7 +553,7 @@ deps = {
   },
 
   'src/ios/third_party/material_components_ios/src': {
-      'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'bdeb1f7e9d23708ab01440cb3f7e9d681c195038',
+      'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '3bc7339b7a8e834a661de78fe3ae9805468f5259',
       'condition': 'checkout_ios',
   },
 
@@ -873,7 +873,7 @@ deps = {
   # Tools used when building Chrome for Chrome OS. This affects both the Simple
   # Chrome workflow, as well as the chromeos-chrome ebuild.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'f3b4fc7437581683a232888df55df0f771c8093f',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '666000a232e013f3639854e07899b5b4aa35211b',
       'condition': 'checkout_chromeos',
   },
 
@@ -893,7 +893,7 @@ deps = {
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '3b39cefc6195f782b655e2c73ac2a73313c28879',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '364205c70ed16c00802b1c264e88d8e03a0b37ae',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
@@ -1262,7 +1262,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'ecce47e1955f9dd366f9d18b7759de225d54fae6',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + 'fc1733482433d326e316c74a374cda64db8b36f8',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
@@ -1514,7 +1514,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '3c2fe3888658d82b47ca831d59a2e07579619c2d',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '167ecc9bc53f00845c7a9dbbb21624f9dcf6de82',
+    Var('webrtc_git') + '/src.git' + '@' + 'e8804b3d39bcdd65314cadb3a47a7109faa66c03',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1552,7 +1552,7 @@ deps = {
       'packages': [
         {
           'package': 'skia/tools/goldctl/linux-amd64',
-          'version': 'NpVnJKqGf0vShIczjp5jLbdX0QQ2ZZV8gmEa927sfrAC',
+          'version': 'h8KxWs4p5Ox0HAM1_xkOEZT6ctPb1Rfi3qeXr_mmL2YC',
         },
       ],
       'dep_type': 'cipd',
@@ -1562,7 +1562,7 @@ deps = {
       'packages': [
         {
           'package': 'skia/tools/goldctl/windows-amd64',
-          'version': 'ryPhRCNJFCeT_33PL_QhlmN8Jjv9RenfHH8y0lgD23wC',
+          'version': 'uyDrAODdxxnyC-OmE4swqMJGVNnO4tK6XpC4VfbZf-gC',
         },
       ],
       'dep_type': 'cipd',
@@ -1572,7 +1572,7 @@ deps = {
       'packages': [
         {
           'package': 'skia/tools/goldctl/mac-amd64',
-          'version': 'WasgZUd345851n2ct6gIUckbtVkDSlQfHoDCpl7dbhcC',
+          'version': 'LNZgcy3MnDuxTfNU14P35CMe60eSA5owlqW81AdRROIC',
         },
       ],
       'dep_type': 'cipd',
@@ -1586,7 +1586,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@4cd389281e5548e82d1d36317bfd908e9450dd8f',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@dbaa11213f8f978f0d50eff0a8fc9aa9322b8903',
     'condition': 'checkout_src_internal',
   },
 
@@ -1605,7 +1605,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': 'gYicacAmlNBTfmj5bqOqzRfHBhSEG6KBAY2UtDyAakQC',
+        'version': 'JsH-brp1hpp16FWovKbCE0YVvDIQbiGmeD04dvEzOgIC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',

diff --git a/WATCHLISTS b/WATCHLISTS
@@ -2086,7 +2086,8 @@
     'about_flags': ['[email protected]',
                     '[email protected]'],
     'accelerator_table': ['[email protected]'],
-    'accessibility': ['[email protected]',
+    'accessibility': ['[email protected]',
+                      '[email protected]',
                       '[email protected]',
                       '[email protected]',
                       '[email protected]',

diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
@@ -1220,6 +1220,9 @@ This file contains the strings for ash.
       <message name="IDS_ASH_PHONE_HUB_LOCATE_BUTTON_NOT_AVAILABLE_TOOLTIP" desc="Tooltip message that indicates to the user that Phone Hub's 'Locate phone' feature is not available because the user disabled alarms that make sounds on their phone.">
         Locate phone is not available when alarm sounds are disabled
       </message>
+      <message name="IDS_ASH_PHONE_HUB_ENABLE_HOTSPOT_NO_RECEPTION_STATE_TOOLTIP" desc="Tooltip message that indicates to the user that the Enable Hotspot feature is disabled because their phone does not have mobile data.">
+        Your phone must have mobile data to provide a hotspot
+      </message>
 
       <message name="IDS_ASH_STYLUS_BATTERY_LOW_LABEL">
         Low

diff --git a/ash/ash_strings_grd/IDS_ASH_PHONE_HUB_ENABLE_HOTSPOT_NO_RECEPTION_STATE_TOOLTIP.png.sha1 b/ash/ash_strings_grd/IDS_ASH_PHONE_HUB_ENABLE_HOTSPOT_NO_RECEPTION_STATE_TOOLTIP.png.sha1
@@ -0,0 +1 @@
+fdb1d2ad6dd867d78bbd82b81cfd20cf7da69ac6
diff --git a/ash/public/cpp/holding_space/holding_space_image.cc b/ash/public/cpp/holding_space/holding_space_image.cc
@@ -14,6 +14,14 @@
 
 namespace ash {
 
+namespace {
+
+// Whether image invalidation should be done without a delay. May be set in
+// tests.
+bool g_use_zero_invalidation_delay_for_testing = false;
+
+}  // namespace
+
 // HoldingSpaceImage::ImageSkiaSource ------------------------------------------
 
 class HoldingSpaceImage::ImageSkiaSource : public gfx::ImageSkiaSource {
@@ -53,6 +61,11 @@ HoldingSpaceImage::HoldingSpaceImage(const base::FilePath& backing_file_path,
 
 HoldingSpaceImage::~HoldingSpaceImage() = default;
 
+// static
+void HoldingSpaceImage::SetUseZeroInvalidationDelayForTesting(bool value) {
+  g_use_zero_invalidation_delay_for_testing = value;
+}
+
 bool HoldingSpaceImage::operator==(const HoldingSpaceImage& rhs) const {
   return gfx::BitmapsAreEqual(*image_skia_.bitmap(), *rhs.image_skia_.bitmap());
 }
@@ -105,7 +118,10 @@ void HoldingSpaceImage::Invalidate() {
   // when multiple image invalidations are requested in quick succession. The
   // delay is selected somewhat arbitrarily to be non trivial but still not
   // easily noticable by the user.
-  invalidate_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(250),
+  invalidate_timer_.Start(FROM_HERE,
+                          g_use_zero_invalidation_delay_for_testing
+                              ? base::TimeDelta()
+                              : base::TimeDelta::FromMilliseconds(250),
                           base::BindOnce(&HoldingSpaceImage::OnInvalidateTimer,
                                          base::Unretained(this)));
 }

diff --git a/ash/public/cpp/holding_space/holding_space_image.h b/ash/public/cpp/holding_space/holding_space_image.h
@@ -37,6 +37,8 @@ class ASH_PUBLIC_EXPORT HoldingSpaceImage {
   HoldingSpaceImage& operator=(const HoldingSpaceImage&) = delete;
   ~HoldingSpaceImage();
 
+  static void SetUseZeroInvalidationDelayForTesting(bool value);
+
   bool operator==(const HoldingSpaceImage& rhs) const;
 
   // Adds `callback` to be notified of changes to the underlying `image_skia_`.
@@ -58,6 +60,7 @@ class ASH_PUBLIC_EXPORT HoldingSpaceImage {
   // the same, and old representations are thus still valid.
   void UpdateBackingFilePath(const base::FilePath& file_path);
 
+  // Fires the image invalidation timer if it's currently running.
   bool FireInvalidateTimerForTesting();
 
  private:

diff --git a/ash/public/cpp/holding_space/holding_space_model.cc b/ash/public/cpp/holding_space/holding_space_model.cc
@@ -119,6 +119,13 @@ void HoldingSpaceModel::RemoveIf(Predicate predicate) {
   }
 }
 
+void HoldingSpaceModel::InvalidateItemImageIf(Predicate predicate) {
+  for (auto& item : items_) {
+    if (predicate.Run(item.get()))
+      item->InvalidateImage();
+  }
+}
+
 void HoldingSpaceModel::RemoveAll() {
   // Clear the item list, but keep the items around until the observers have
   // been notified of the item removal.

diff --git a/ash/public/cpp/holding_space/holding_space_model.h b/ash/public/cpp/holding_space/holding_space_model.h
@@ -68,6 +68,10 @@ class ASH_PUBLIC_EXPORT HoldingSpaceModel {
   using Predicate = base::RepeatingCallback<bool(const HoldingSpaceItem*)>;
   void RemoveIf(Predicate predicate);
 
+  // Invalidates image representations for items for which the specified
+  // `predicate` returns true.
+  void InvalidateItemImageIf(Predicate predicate);
+
   // Removes all the items from the model.
   void RemoveAll();
 

diff --git a/ash/shelf/hotseat_widget.cc b/ash/shelf/hotseat_widget.cc
@@ -1134,7 +1134,7 @@ void HotseatWidget::LayoutHotseatByAnimation(double target_opacity,
   // between hidden and extended state use transform to animate. Clear any
   // transform that may have been set by the previous animation, and update
   // current bounds to match it.
-  gfx::RectF current_bounds_f(hotseat_layer->bounds());
+  gfx::RectF current_bounds_f(GetNativeView()->GetBoundsInScreen());
   hotseat_layer->transform().TransformRect(&current_bounds_f);
   gfx::Rect current_bounds = gfx::ToEnclosingRect(current_bounds_f);
 

diff --git a/ash/strings/ash_strings_ar.xtb b/ash/strings/ash_strings_ar.xtb
@@ -450,6 +450,7 @@
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">التقاط</translation>
 <translation id="495046168593986294">التمرير لأعلى</translation>
+<translation id="4952936045814352993">ميزة "تحديد الموقع الجغرافي للهاتف" غير متاحة لأنّك أوقفت أصوات التنبيهات.</translation>
 <translation id="4961318399572185831">إرسال الشاشة</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> س <ph name="MINUTES" /> د <ph name="SECONDS" /> ث</translation>
 <translation id="4975771730019223894">وضع شارات على رمز التطبيق</translation>

diff --git a/ash/strings/ash_strings_bg.xtb b/ash/strings/ash_strings_bg.xtb
@@ -450,6 +450,7 @@
         <ph name="LOCALE" />.</translation>
 <translation id="4946376291507881335">Заснемане</translation>
 <translation id="495046168593986294">Превъртане нагоре</translation>
+<translation id="4952936045814352993">Функцията за намиране на телефона не е налице, когато звуците на будилниците са деактивирани</translation>
 <translation id="4961318399572185831">Предаване на екрана</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> ч, <ph name="MINUTES" /> мин и <ph name="SECONDS" /> сек</translation>
 <translation id="4975771730019223894">Значки за приложенията</translation>

diff --git a/ash/strings/ash_strings_bs.xtb b/ash/strings/ash_strings_bs.xtb
@@ -450,6 +450,7 @@ Možete isprobati ovih nekoliko stvari da započnete.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Snimi</translation>
 <translation id="495046168593986294">Klizni prema gore</translation>
+<translation id="4952936045814352993">Lociranje telefona nije moguće kad su onemogućeni zvukovi alarma</translation>
 <translation id="4961318399572185831">Emitiraj ekran</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> h <ph name="MINUTES" /> min <ph name="SECONDS" /> s</translation>
 <translation id="4975771730019223894">Označavanje aplikacija</translation>

diff --git a/ash/strings/ash_strings_da.xtb b/ash/strings/ash_strings_da.xtb
@@ -450,6 +450,7 @@ Her er nogle af de ting, du kan prøve for at komme godt i gang.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Tag billeder</translation>
 <translation id="495046168593986294">Rul op</translation>
+<translation id="4952936045814352993">Funktionen "Find telefon" er ikke tilgængelig, når alarmlyde er deaktiveret</translation>
 <translation id="4961318399572185831">Cast skærm</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> t., <ph name="MINUTES" /> min. og <ph name="SECONDS" /> sek.</translation>
 <translation id="4975771730019223894">Appbadges</translation>

diff --git a/ash/strings/ash_strings_el.xtb b/ash/strings/ash_strings_el.xtb
@@ -450,6 +450,7 @@
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Λήψη</translation>
 <translation id="495046168593986294">Κύλιση προς τα επάνω</translation>
+<translation id="4952936045814352993">Ο Εντοπισμός τηλεφώνου δεν είναι διαθέσιμος όταν οι ήχοι ξυπνητηριού είναι απενεργοποιημένοι</translation>
 <translation id="4961318399572185831">Μετάδοση οθόνης</translation>
 <translation id="4969092041573468113"><ph name="HOURS" />ώ. <ph name="MINUTES" />λ. <ph name="SECONDS" />δ.</translation>
 <translation id="4975771730019223894">Προσθήκη σήματος σε εφαρμογές</translation>

diff --git a/ash/strings/ash_strings_en-GB.xtb b/ash/strings/ash_strings_en-GB.xtb
@@ -450,6 +450,7 @@ Here are some things that you can try to get started.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Capture</translation>
 <translation id="495046168593986294">Scroll up</translation>
+<translation id="4952936045814352993">Locate phone is not available when alarm sounds are disabled</translation>
 <translation id="4961318399572185831">Cast screen</translation>
 <translation id="4969092041573468113"><ph name="HOURS" />h <ph name="MINUTES" />m <ph name="SECONDS" />s</translation>
 <translation id="4975771730019223894">App badging</translation>

diff --git a/ash/strings/ash_strings_et.xtb b/ash/strings/ash_strings_et.xtb
@@ -451,6 +451,7 @@ Jätkamiseks peavad kõik kasutajad välja logima.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Jäädvusta</translation>
 <translation id="495046168593986294">Keri üles</translation>
+<translation id="4952936045814352993">Telefoni asukoha määramine pole saadaval, kui alarmi helid on keelatud</translation>
 <translation id="4961318399572185831">Ekraani ülekandmine</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> h <ph name="MINUTES" /> min <ph name="SECONDS" /> s</translation>
 <translation id="4975771730019223894">Rakenduse ikooni märguandetäpp</translation>

diff --git a/ash/strings/ash_strings_fil.xtb b/ash/strings/ash_strings_fil.xtb
@@ -450,6 +450,7 @@ Narito ang ilang bagay na puwede mong subukang simulan.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">I-capture</translation>
 <translation id="495046168593986294">Mag-scroll pataas</translation>
+<translation id="4952936045814352993">Hindi available ang paghanap sa telepono kapag naka-disable ang mga tunog ng alarm</translation>
 <translation id="4961318399572185831">I-cast ang screen</translation>
 <translation id="4969092041573468113"><ph name="HOURS" />h <ph name="MINUTES" />m <ph name="SECONDS" />s</translation>
 <translation id="4975771730019223894">Pag-badge ng app</translation>

diff --git a/ash/strings/ash_strings_fr.xtb b/ash/strings/ash_strings_fr.xtb
@@ -450,6 +450,7 @@ Pour commencer, voici des exemples de ce que vous pouvez me demander.</translati
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Capturer</translation>
 <translation id="495046168593986294">Faire défiler vers le haut</translation>
+<translation id="4952936045814352993">Impossible de localiser le téléphone lorsque les sons de l'alarme sont désactivés</translation>
 <translation id="4961318399572185831">Caster l'écran</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> h <ph name="MINUTES" /> min <ph name="SECONDS" /> s</translation>
 <translation id="4975771730019223894">Afficher un badge sur l'application</translation>

diff --git a/ash/strings/ash_strings_gl.xtb b/ash/strings/ash_strings_gl.xtb
@@ -451,6 +451,7 @@ Todos os usuarios deben pechar sesión para poder continuar.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Zona que se capturará</translation>
 <translation id="495046168593986294">Desprazarse cara arriba</translation>
+<translation id="4952936045814352993">A función Localizar teléfono non está dispoñible se están desactivados os sons das alarmas</translation>
 <translation id="4961318399572185831">Enviar pantalla</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> h <ph name="MINUTES" /> min <ph name="SECONDS" /> s</translation>
 <translation id="4975771730019223894">Indicadores de notificacións</translation>

diff --git a/ash/strings/ash_strings_hi.xtb b/ash/strings/ash_strings_hi.xtb
@@ -451,6 +451,7 @@
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">कैप्चर करें</translation>
 <translation id="495046168593986294">ऊपर स्क्रोल करें</translation>
+<translation id="4952936045814352993">अलार्म की आवाज़ें बंद करने पर, फ़ोन का पता लगाने की सुविधा उपलब्ध नहीं होती</translation>
 <translation id="4961318399572185831">स्‍क्रीन कास्‍ट करें</translation>
 <translation id="4969092041573468113"><ph name="HOURS" />घं॰ <ph name="MINUTES" />मि॰ <ph name="SECONDS" />से॰</translation>
 <translation id="4975771730019223894">ऐप बैजिंग</translation>

diff --git a/ash/strings/ash_strings_hr.xtb b/ash/strings/ash_strings_hr.xtb
@@ -450,6 +450,7 @@ Evo nekih stvari koje možete pokušati pokrenuti.</translation>
         <ph name="LOCALE" /></translation>
 <translation id="4946376291507881335">Fotografiraj</translation>
 <translation id="495046168593986294">Pomakni prema gore</translation>
+<translation id="4952936045814352993">Lociranje telefona nije moguće kad su onemogućeni zvukovi alarma</translation>
 <translation id="4961318399572185831">Emitiranje zaslona</translation>
 <translation id="4969092041573468113"><ph name="HOURS" /> h <ph name="MINUTES" /> min <ph name="SECONDS" /> s</translation>
 <translation id="4975771730019223894">Dodavanje oznake u aplikaciju</translation>