Merge pull request #26 from chromium/master

Merge
FrankEnderman · Oct 31, 2021 · a23e3bd · a23e3bd
2 parents db2490c + 1b57dc7
commit a23e3bd
Show file tree

Hide file tree

Showing 38 changed files with 223 additions and 89 deletions.
diff --git a/DEPS b/DEPS
@@ -234,7 +234,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': '9d24b02c2fdb5eede1054b16b9c03b5ed26dc618',
+  'skia_revision': '6ce94bbdefec53bb3c7439eb2203af3c58e79833',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
@@ -301,15 +301,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'f10f06de2c0d894184322bdf9ccf8344abe1d516',
+  'catapult_revision': '05d125f274b753740fe4da60eb85d5f57c963985',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
   'libfuzzer_revision': 'debe7d2d1982e540fbd6bd78604bf001753f9e74',
   # 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': '1e2213ae6af144301092d81e0905d74c502a7c22',
+  'devtools_frontend_revision': '858b2aba5e6a6b47a0c61a121927c8c1986a1f13',
   # 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.
@@ -416,7 +416,7 @@ vars = {
   'libcxx_revision':       '79a2e924d96e2fc1e4b937c42efd08898fa472d7',
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:f847b5744a81d23b96de3f2e56ce0398f550bd0e',
+  'gn_version': 'git_revision:8926696a4186279489cc2b8d768533e61bba73d7',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -1598,7 +1598,7 @@ deps = {
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '62d7d0c928c9a040dce96aa2f16c00e7e67d59cb',
 
-  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@36bbe49c47eaa8df11d027f994aa3b7cef79b987',
+  'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@ee45938d0b75d2fb4fbb65101d5f7d7e71d1a6f9',
 
   'src/third_party/vulkan_memory_allocator':
     Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + 'e0216a5484c8345f7d792fa16fad77ac63d89a70',
@@ -1695,7 +1695,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@103905ef4db3c004e49f8d38bab9690add4b902d',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@5efec37089fd3f0802ebd41911c819bc72a4c052',
     'condition': 'checkout_src_internal',
   },
 
@@ -1714,7 +1714,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/help_app/app',
-        'version': 'Pu6biyiuS2Q5sTobyHp0PwgpgjstB7a-CKGx78lYUGEC',
+        'version': 'ffSVMYrncEY9S9zIaXi6YViJiEKq5_FwLjpAMLWqGKUC',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',
@@ -1725,7 +1725,7 @@ deps = {
     'packages': [
       {
         'package': 'chromeos_internal/apps/media_app/app',
-        'version': '_fWINw4Gpe6I6CmF3_pR3f1PiTpy52scN2M774-x-ooC',
+        'version': 'yYNT7Q_0F-TmR0ICnVGJUR7atq1KiVbqvUyBHTpH2t8C',
       },
     ],
     'condition': 'checkout_chromeos and checkout_src_internal',

diff --git a/android_webview/java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java b/android_webview/java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java
@@ -598,7 +598,7 @@ private void hide() {
                 // Intentionally swallowed due to bad Android implemention. See crbug.com/633224.
             }
         }
-        mParentPositionObserver.clearListener();
+        mParentPositionObserver.removeListener(mParentPositionListener);
     }
 
     @CalledByNative
@@ -646,7 +646,7 @@ private float getVisibleHeightDip() {
     public void onContainerViewChanged(ViewGroup newContainerView) {
         // If the parent View ever changes, the parent position observer
         // must be updated accordingly.
-        mParentPositionObserver.clearListener();
+        mParentPositionObserver.removeListener(mParentPositionListener);
         mParentPositionObserver = new ViewPositionObserver(newContainerView);
         if (mContainer.isShowing()) {
             mParentPositionObserver.addListener(mParentPositionListener);

diff --git a/android_webview/java/src/org/chromium/android_webview/ViewPositionObserver.java b/android_webview/java/src/org/chromium/android_webview/ViewPositionObserver.java
@@ -100,11 +100,4 @@ private void updatePosition() {
             notifyListeners();
         }
     }
-
-    /**
-     * Clears installed listener(s).
-     */
-    public void clearListener() {
-        mListeners.clear();
-    }
 }
diff --git a/ash/system/message_center/message_center_utils.cc b/ash/system/message_center/message_center_utils.cc
@@ -20,12 +20,15 @@ bool CompareNotifications(message_center::Notification* n1,
   return message_center::CompareTimestampSerial()(n1, n2);
 }
 
-std::vector<message_center::Notification*> GetSortedVisibleNotifications() {
+std::vector<message_center::Notification*> GetSortedNotificationsWithOwnView() {
   auto visible_notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   std::vector<message_center::Notification*> sorted_notifications;
-  std::copy(visible_notifications.begin(), visible_notifications.end(),
-            std::back_inserter(sorted_notifications));
+  std::copy_if(visible_notifications.begin(), visible_notifications.end(),
+               std::back_inserter(sorted_notifications),
+               [](message_center::Notification* notification) {
+                 return !notification->group_child();
+               });
   std::sort(sorted_notifications.begin(), sorted_notifications.end(),
             CompareNotifications);
   return sorted_notifications;
@@ -41,6 +44,11 @@ size_t GetNotificationCount() {
     if (notifier == kVmCameraMicNotifierId)
       continue;
 
+    // Don't count group child notifications since they're contained in a single
+    // parent view.
+    if (notification->group_child())
+      continue;
+
     ++count;
   }
   return count;

diff --git a/ash/system/message_center/message_center_utils.h b/ash/system/message_center/message_center_utils.h
@@ -20,13 +20,15 @@ namespace message_center_utils {
 bool CompareNotifications(message_center::Notification* n1,
                           message_center::Notification* n2);
 
-// Returns a vector of visible notifications sorted for display, using
-// CompareNotifications() above for the sorting order.
-std::vector<message_center::Notification*> GetSortedVisibleNotifications();
+// Returns a vector of notifications that should have their own message
+// view sorted for display, using CompareNotifications() above for the sorting
+// order.
+std::vector<message_center::Notification*> GetSortedNotificationsWithOwnView();
 
 // Returns total notifications count, with a filter to not count some of them
-// (These notifications such as camera, media controls, etc. don't need an
-// indicator in status area since they already have a dedicated tray item).
+// These notifications such as camera, media controls, etc. don't need an
+// indicator in status area since they already have a dedicated tray item, and
+// grouped notifications only need to be counted as one.
 size_t ASH_EXPORT GetNotificationCount();
 
 }  // namespace message_center_utils

diff --git a/ash/system/message_center/unified_message_list_view.cc b/ash/system/message_center/unified_message_list_view.cc
@@ -286,10 +286,7 @@ UnifiedMessageListView::~UnifiedMessageListView() {
 void UnifiedMessageListView::Init() {
   bool is_latest = true;
   for (auto* notification :
-       message_center_utils::GetSortedVisibleNotifications()) {
-    if (notification->group_child())
-      continue;
-
+       message_center_utils::GetSortedNotificationsWithOwnView()) {
     auto* view =
         new MessageViewContainer(CreateMessageView(*notification), this);
     view->LoadExpandedState(model_, is_latest);

diff --git a/ash/system/unified/notification_icons_controller.cc b/ash/system/unified/notification_icons_controller.cc
@@ -242,7 +242,7 @@ void NotificationIconsController::UpdateNotificationIcons() {
 
   auto it = tray_items_.begin();
   for (message_center::Notification* notification :
-       message_center_utils::GetSortedVisibleNotifications()) {
+       message_center_utils::GetSortedNotificationsWithOwnView()) {
     if (it == tray_items_.end())
       break;
     if (ShouldShowNotification(notification)) {

diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1
@@ -1 +1 @@
-6.20211029.1.1
+6.20211030.0.1
diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1
@@ -1 +1 @@
-6.20211029.1.1
+6.20211030.0.1
diff --git a/chrome/VERSION b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=97
 MINOR=0
-BUILD=4687
+BUILD=4688
 PATCH=0
diff --git a/chrome/browser/ui/webui/settings/chromeos/constants/routes_util.cc b/chrome/browser/ui/webui/settings/chromeos/constants/routes_util.cc
@@ -14,7 +14,8 @@ namespace settings {
 
 const char kOsSignOutSubPage[] = "osSignOut";
 
-// Any changes here need to be kept in sync with chrome_new_window_client.cc
+// Any changes here need to be kept in sync with the mapping in
+// chrome_new_window_client.cc - for routes that can be opened from ARC++.
 // TODO(khorimoto): Instead of listing out every path, use an enum parameter.
 bool IsOSSettingsSubPage(const std::string& sub_page) {
   static const char* const kPaths[] = {
@@ -91,6 +92,9 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
 
       // Privacy and Security section.
       chromeos::settings::mojom::kPrivacyAndSecuritySectionPath,
+      chromeos::settings::mojom::kSecurityAndSignInSubpagePathV2,
+      chromeos::settings::mojom::kFingerprintSubpagePathV2,
+      chromeos::settings::mojom::kManageOtherPeopleSubpagePathV2,
 
       // Languages and Input section.
       chromeos::settings::mojom::kLanguagesAndInputSectionPath,

diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt
@@ -1 +1 @@
-chrome-linux-main-1635572862-4ea4d9fdeb4b420360661a600bfbc2bf2fbe7e1d.profdata
+chrome-linux-main-1635638084-00d4fe13e26859d09e2779a98cd8ea1294c2aac0.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt
@@ -1 +1 @@
-chrome-mac-main-1635572862-84929b2608dcd7025936e43b754610a21e4447c1.profdata
+chrome-mac-main-1635638084-1160ff584b0baee17e2ea32a99896dce6d7f4530.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt
@@ -1 +1 @@
-chrome-win32-main-1635572862-a8275b244afa18aeb895ccba9ef935f91a872a5a.profdata
+chrome-win32-main-1635648777-47297158206b2ee6d5f5e9c5e91176a0e01feae4.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt
@@ -1 +1 @@
-chrome-win64-main-1635583311-24b1d65244ee61fab33e73202d3c51c9a6723168.profdata
+chrome-win64-main-1635648777-65a90253226ddce464d30ef7bd3128bf892dad04.profdata
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@
-14312.0.0
+14314.0.0
diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@
 {
-  "version": "4.10",
-  "log_list_timestamp": "2021-10-29T01:34:07Z",
+  "version": "4.11",
+  "log_list_timestamp": "2021-10-30T01:34:15Z",
   "operators": [
     {
       "name": "Google",

diff --git a/components/page_load_metrics/browser/observers/use_counter/ukm_features.cc b/components/page_load_metrics/browser/observers/use_counter/ukm_features.cc
@@ -218,6 +218,15 @@ UseCounterPageLoadMetricsObserver::GetAllowedUkmFeatures() {
           WebFeature::kSearchEventFired,
           WebFeature::kReadOrWriteWebDatabase,
           WebFeature::kExternalProtocolBlockedBySandbox,
+          WebFeature::kWebCodecsAudioDecoder,
+          WebFeature::kWebCodecsVideoDecoder,
+          WebFeature::kWebCodecsVideoEncoder,
+          WebFeature::kWebCodecsVideoTrackReader,
+          WebFeature::kWebCodecsImageDecoder,
+          WebFeature::kWebCodecsAudioEncoder,
+          WebFeature::kWebCodecsVideoFrameDefaultTimestamp,
+          WebFeature::kWebCodecsVideoFrameFromImage,
+          WebFeature::kWebCodecsVideoFrameFromBuffer,
       }));
   return *opt_in_features;
 }
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 @@
-94f888979683472cdebe712de1497f8715c57ed0
+1947395bca7fde2448fb5b5f7ba0b03b1d2c5cf9
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 @@
-ff1bc907ba84e55e381c5ac41292219296012504
+d890977c46f0d8fb23fd596e2fe3cba993d6f52a
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 @@
-dc307822923eb61cc526cf216afdd138e46a80dd
+95f48ac4e0c59fe56254f9d14e8e6ec841db18ff
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 @@
-c31c4f2d9f9851de2c0ea9de2a8097cb953565c5
+5211c0402d037e39c7a74fdf876a4b9d43b728d8
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 @@
-5f7898d798aa9969fc30b0773bdb2dbcc55f8fa8
+9093cb09f65fdf55dc6232477a7c5412f2611ca8
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 @@
-9cf516c338995fa8b87cc45bf73ec065721ad7e3
+acb276e5a42f53c6a67f9b405c74ee2ba17a729c
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 @@
-dc964f608cc0099f896e8894a06d966233d5075c
+1eeaa711be4902e01a49aeb039cab34ca88af320
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 @@
-66c4627bc847d629540fb35635393e5a77d5aaac
+f5b8fd061235307c1f3506f15e824ec098ce4585
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 @@
-669111bd38b062398b7797a831b95350c1c2591a
+452d3ca4331a4e2bc050a68aefeff62d88329718
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 @@
-d017b6c5ceaca55ea17f3609e567393aa813da43
+143a819417678ab272f0f7f6c7cdefe554bebf9e
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
@@ -5789,7 +5789,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M95",
-              "revision": "version:95.0.4638.71"
+              "revision": "version:95.0.4638.72"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -5876,7 +5876,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M96",
-              "revision": "version:96.0.4664.30"
+              "revision": "version:96.0.4664.31"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -6050,7 +6050,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M95",
-              "revision": "version:95.0.4638.71"
+              "revision": "version:95.0.4638.72"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -6137,7 +6137,7 @@
             {
               "cipd_package": "chromium/testing/weblayer-x86",
               "location": "weblayer_instrumentation_test_M96",
-              "revision": "version:96.0.4664.30"
+              "revision": "version:96.0.4664.31"
             },
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",