diff --git a/DEPS b/DEPS index 216925ce367852..5cf3cfc5572a00 100644 --- 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,7 +301,7 @@ 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. @@ -309,7 +309,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': '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 index 8679469187c4d4..90797027674432 100644 --- 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 index ef856091a7db10..07364f7ebd51be 100644 --- 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 index 0c96ad95d3d529..963f695661eedf 100644 --- 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 GetSortedVisibleNotifications() { +std::vector GetSortedNotificationsWithOwnView() { auto visible_notifications = message_center::MessageCenter::Get()->GetVisibleNotifications(); std::vector 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 index ca9758a86dcc75..a716c64558bf3c 100644 --- 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 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 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 index f9d4ae9a38afaa..2d4e6a775c46c5 100644 --- 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 index 1e2c85291f6b14..ede548d9993dae 100644 --- 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 index f066dbd09576bf..bb72ed8b7ff48d 100644 --- 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 index f066dbd09576bf..bb72ed8b7ff48d 100644 --- 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 index e69d19181a04bd..6338b166646b53 100644 --- 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 index e74574ad2fda07..e0e2b8439b5709 100644 --- 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 index 3b136f6b243ce0..8bfb098ad65b6f 100644 --- 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 index d1f4b8c35d3004..15a4f73dfe6cad 100644 --- 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 index 7ff9c4fc6dd114..78dca06fcc4ba6 100644 --- 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 index 757b1c7823801b..58c0a7fd0f820f 100644 --- 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 index c112d69c213028..3426242feba8a1 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM @@ -1 +1 @@ -14312.0.0 \ No newline at end of file +14314.0.0 \ No newline at end of file diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json index 473831dff8d2cc..93a0c903b87594 100644 --- 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 index 0912a3bd0b69cd..f3d71ea53b2077 100644 --- 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 index 3c0719f5cb0353..9afc93421698b1 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 @@ -94f888979683472cdebe712de1497f8715c57ed0 \ No newline at end of file +1947395bca7fde2448fb5b5f7ba0b03b1d2c5cf9 \ 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 61ea92768b89cb..d1eec9fe8f63f2 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 @@ -ff1bc907ba84e55e381c5ac41292219296012504 \ No newline at end of file +d890977c46f0d8fb23fd596e2fe3cba993d6f52a \ 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 7e9d3fc8779daa..aec7d6491a54bb 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 @@ -dc307822923eb61cc526cf216afdd138e46a80dd \ No newline at end of file +95f48ac4e0c59fe56254f9d14e8e6ec841db18ff \ 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 78c5eafb24aa1c..2afb3f1566b55a 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 @@ -c31c4f2d9f9851de2c0ea9de2a8097cb953565c5 \ No newline at end of file +5211c0402d037e39c7a74fdf876a4b9d43b728d8 \ 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 a942dc4d25ce7b..bdd5a55cef1b94 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 @@ -5f7898d798aa9969fc30b0773bdb2dbcc55f8fa8 \ No newline at end of file +9093cb09f65fdf55dc6232477a7c5412f2611ca8 \ 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 17cd1ebd94bd89..284f7ffd2d3e16 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 @@ -9cf516c338995fa8b87cc45bf73ec065721ad7e3 \ No newline at end of file +acb276e5a42f53c6a67f9b405c74ee2ba17a729c \ 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 f05bb0c4336072..4516538d54f822 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 @@ -dc964f608cc0099f896e8894a06d966233d5075c \ No newline at end of file +1eeaa711be4902e01a49aeb039cab34ca88af320 \ 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 f00ecf0708842c..27b57d42b5587f 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 @@ -66c4627bc847d629540fb35635393e5a77d5aaac \ No newline at end of file +f5b8fd061235307c1f3506f15e824ec098ce4585 \ 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 2b2d8e19f06095..b5a515e7d0aa95 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 @@ -669111bd38b062398b7797a831b95350c1c2591a \ No newline at end of file +452d3ca4331a4e2bc050a68aefeff62d88329718 \ 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 943f8e28b0b8d7..ec3c21cb259507 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 @@ -d017b6c5ceaca55ea17f3609e567393aa813da43 \ No newline at end of file +143a819417678ab272f0f7f6c7cdefe554bebf9e \ No newline at end of file diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json index d9b7a5cc206749..dabdc3cbd40259 100644 --- 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}", diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json index 4583f4c6a76fda..848ca463e662d1 100644 --- a/testing/buildbot/chromium.android.json +++ b/testing/buildbot/chromium.android.json @@ -47539,7 +47539,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}", @@ -47627,7 +47627,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}", @@ -47803,7 +47803,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}", @@ -47891,7 +47891,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}", @@ -48140,7 +48140,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}", @@ -48227,7 +48227,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}", @@ -48401,7 +48401,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}", @@ -48488,7 +48488,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}", @@ -48737,7 +48737,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}", @@ -48824,7 +48824,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}", @@ -48998,7 +48998,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}", @@ -49085,7 +49085,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}", diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl index 60ed531b160366..82a45964fdfb91 100644 --- a/testing/buildbot/variants.pyl +++ b/testing/buildbot/variants.pyl @@ -363,7 +363,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M96', - 'revision': 'version:96.0.4664.30', + 'revision': 'version:96.0.4664.31', } ], }, @@ -387,7 +387,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M95', - 'revision': 'version:95.0.4638.71', + 'revision': 'version:95.0.4638.72', } ], }, @@ -435,7 +435,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M96', - 'revision': 'version:96.0.4664.30', + 'revision': 'version:96.0.4664.31', } ], }, @@ -459,7 +459,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M95', - 'revision': 'version:95.0.4638.71', + 'revision': 'version:95.0.4638.72', } ], }, @@ -507,7 +507,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M96', - 'revision': 'version:96.0.4664.30', + 'revision': 'version:96.0.4664.31', } ], }, @@ -531,7 +531,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M95', - 'revision': 'version:95.0.4638.71', + 'revision': 'version:95.0.4638.72', } ], }, diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc index 10852c133312e4..70801f793c0962 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc @@ -2581,7 +2581,6 @@ Node::InsertionNotificationRequest Element::InsertedInto( ElementRareData* rare_data = GetElementRareData(); if (ElementIntersectionObserverData* observer_data = rare_data->IntersectionObserverData()) { - observer_data->InvalidateCachedRects(); observer_data->TrackWithController( GetDocument().EnsureIntersectionObserverController()); if (!observer_data->IsEmpty()) { diff --git a/third_party/blink/renderer/platform/graphics/graphics_context.h b/third_party/blink/renderer/platform/graphics/graphics_context.h index 8685b85aecb40d..6b423c8feea77c 100644 --- a/third_party/blink/renderer/platform/graphics/graphics_context.h +++ b/third_party/blink/renderer/platform/graphics/graphics_context.h @@ -98,7 +98,7 @@ struct ImageDrawOptions { clamping_mode(clamping_mode), decode_mode(decode_mode), apply_dark_mode(apply_dark_mode) {} - DarkModeFilter* dark_mode_filter; + DarkModeFilter* dark_mode_filter = nullptr; SkSamplingOptions sampling_options; RespectImageOrientationEnum respect_orientation = kRespectImageOrientation; Image::ImageClampingMode clamping_mode = Image::kClampImageToSourceRect; diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index fbefe1c0c6bbaf..cd21420ba2ae44 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations @@ -2951,6 +2951,7 @@ crbug.com/626703 fast/animation/scroll-animations/scroll-timeline-snapshotting.h crbug.com/626703 fast/animation/scroll-animations/scrolltimeline-root-scroller-quirks-mode.html [ Failure ] # ====== New tests from wpt-importer added here ====== +crbug.com/626703 [ Mac10.14 ] virtual/fenced-frame-mparch/wpt_internal/fenced_frame/navigate-by-name.html [ Timeout ] crbug.com/626703 [ Mac11 ] virtual/plz-dedicated-worker/external/wpt/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html [ Skip Timeout ] crbug.com/626703 [ Mac11-arm64 ] external/wpt/webrtc/RTCPeerConnection-getStats.https.html [ Skip Timeout ] crbug.com/626703 [ Mac11-arm64 ] external/wpt/webrtc/protocol/handover-datachannel.html [ Timeout ] @@ -7230,4 +7231,3 @@ crbug.com/1264802 [ Win7 ] fast/forms/suggestion-picker/date-suggestion-picker-a crbug.com/1264802 [ Win7 ] fast/forms/suggestion-picker/month-suggestion-picker-appearance.html [ Failure Pass ] crbug.com/1264802 [ Win7 ] fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance.html [ Failure Pass ] crbug.com/1264775 [ Mac10.14 ] external/wpt/webrtc-stats/supported-stats.html [ Failure ] -crbug.com/1264979 [ Mac10.14 ] virtual/fenced-frame-mparch/wpt_internal/fenced_frame/navigate-by-name.html [ Failure Pass ] diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json index a6dde94b9e2d78..518905565aa34a 100644 --- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json +++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json @@ -265454,7 +265454,7 @@ [] ], "reftests.md": [ - "135fc20074df49a81345c3ebe3849fae52f68cb6", + "219e5887a083b2f6132cab6fdf90f40921d46e92", [] ], "rendering.md": [ @@ -283977,6 +283977,10 @@ ] }, "the-selectmenu-element": { + "selectmenu-form-state-restore.tentative-expected.txt": [ + "8b137891791fe96927ad78e64b0aad7bded08bdc", + [] + ], "selectmenu-option-arbitrary-content-displayed-ref.tentative.html": [ "e5b876cbb3a78a828004b7571d98ff94bd259265", [] @@ -283986,6 +283990,10 @@ [] ], "support": { + "back.html": [ + "0d13a0f3b7c9c759a9a29c0d70a535b398ff108e", + [] + ], "cat.png": [ "85dd7324815b8f8ef1a1d0496224c1a0661db9d8", [] @@ -287950,6 +287958,14 @@ "6941207373e513cfe10729077f59d369c59e6046", [] ], + "anim-tao.png": [ + "925e2efc9a97ade490f04d57271adc10b2fe69b6", + [] + ], + "anim-tao.png.headers": [ + "0230e176e44567f3bd1d58912d7f669b3e15b6ba", + [] + ], "apng.png": [ "e96e6471e6a8df81c462c47be588ffbbcac5ecfb", [] @@ -288132,6 +288148,10 @@ "55f8e69325bc61ff83f769a6524f7f9c3310be1f", [] ], + "webp-animated.webp": [ + "35a8dfcf34d58060ec70f0a2a04e0d58e357e084", + [] + ], "wpt-logo": { "wpt-logo-darkblue-bg.svg": [ "49f374c00cd1358f446a436122941a0d40b90937", @@ -290206,7 +290226,7 @@ [] ], "largest-contentful-paint-helpers.js": [ - "e12ece0a7561cbafa5174bf6cfcc1dddd55a8883", + "5012faf3b1be3388b9e342af5ee25265e4c3de22", [] ] } @@ -299263,7 +299283,11 @@ [] ], "fetch-rewrite-worker.js": [ - "4631e83e0ceaab5092a9b84dcbb429a991c91446", + "20a80665270ddb7a12fd1d1bdb5c1d0d3bf439eb", + [] + ], + "fetch-rewrite-worker.js.headers": [ + "123053b38c66a060b9b6825d3b26575ae87a7614", [] ], "fetch-variants-worker.js": [ @@ -299274,6 +299298,10 @@ "92a96ff88fb903748aebf6d6a0efaeb529c7ad39", [] ], + "form-poster.html": [ + "5d56fde19a8e4f085369a6efb980d54111ebcb6e", + [] + ], "frame-for-getregistrations.html": [ "7fc35f18914c1345e0f5ccab93305938180fe9eb", [] @@ -299442,6 +299470,10 @@ "4b7aad0f58a850f0e9f6765b84ae08cccc62f6d3", [] ], + "location-setter.html": [ + "fae18e8066550ad51ca212f87b0c072fb36fb817", + [] + ], "malformed-http-response.asis": [ "bc3c68d46d530f318e5d6e9140a24519724cf233", [] @@ -299486,6 +299518,10 @@ "f9617439fc60faff26ba4522c7c95b02f787696b", [] ], + "navigation-headers-server.py": [ + "5b2e044f8b52a15b38007e7b24a732afb62f0071", + [] + ], "navigation-redirect-body-worker.js": [ "39f11baf8cb965988cf6a2f0abf914b1484ec63c", [] @@ -299818,6 +299854,14 @@ "b9c28f51f90a8fc95c687713d945f4a19b127a64", [] ], + "same-site-cookies-register.html": [ + "084f0a08a8e64c499635ea9a4176208d4e7daaf9", + [] + ], + "same-site-cookies-unregister.html": [ + "cca3620b61e73c13a12c9c8ced4cfebdb54dd0dd", + [] + ], "sample-worker-interceptor.js": [ "5129ed51ea550c210abc53e11209e7a3e9dc36b1", [] @@ -300159,6 +300203,10 @@ [] ] }, + "same-site-cookies.https-expected.txt": [ + "96ebf3b64938e79fe25ac2c74bac2bf820c41023", + [] + ], "unregister-then-register-new-script.https-expected.txt": [ "20a0fa54cfae3d2a7d0ff65e59ac01ec39af3975", [] @@ -437781,6 +437829,13 @@ {} ] ], + "selectmenu-form-state-restore.tentative.html": [ + "65a685986791be499dbc19209da836fc293a7b2e", + [ + null, + {} + ] + ], "selectmenu-form-submission.tentative.html": [ "c34b5004ebd4940dbe60a9430d692be4deff8ca5", [ @@ -449849,6 +449904,50 @@ ] }, "largest-contentful-paint": { + "animated": { + "observe-animated-image-gif.tentative.html": [ + "a2c0d7975abe348ea29b55a93781bffaca1a4084", + [ + null, + {} + ] + ], + "observe-animated-image-webp.tentative.html": [ + "de59d5c5f78c685ffd49e22738751e471525e894", + [ + null, + {} + ] + ], + "observe-animated-image.tentative.html": [ + "cf7d262b0f842a020fa9ee94fd05669c62d1edd0", + [ + null, + {} + ] + ], + "observe-cross-origin-animated-image.tentative.html": [ + "993883c607b8f737238f36730881f3a72b66f079", + [ + null, + {} + ] + ], + "observe-cross-origin-tao-animated-image.tentative.html": [ + "137dde66383f772b06d381e4f6293e15a1d8b88a", + [ + null, + {} + ] + ], + "observe-non-animated-image.tentative.html": [ + "6bbc0958b1deb25f45bfbaf0d461f2da3188adcc", + [ + null, + {} + ] + ] + }, "contracted-image.html": [ "8816bf4ba99cb71e9f79ba44859a80a4c103ebad", [ @@ -478668,10 +478767,10 @@ ] }, "screen_enumeration": { - "getScreens.tentative.https.window.js": [ - "a4d6ec0465a48c776a6ea8709d5671569112339e", + "getScreenDetails.tentative.https.window.js": [ + "40c10417b845e35fd862469e2d28d3149893e85c", [ - "screen_enumeration/getScreens.tentative.https.window.html", + "screen_enumeration/getScreenDetails.tentative.https.window.html", { "script_metadata": [ [ @@ -482165,6 +482264,15 @@ {} ] ], + "navigation-headers.https.html": [ + "b2c6b7ac379644e18cf512a819b21b3bab0fee83", + [ + null, + { + "timeout": "long" + } + ] + ], "navigation-preload": { "broken-chunked-encoding.https.html": [ "ec74282ac330a34b68d3e0824128ecd6703ed43d", @@ -482632,6 +482740,15 @@ {} ] ], + "same-site-cookies.https.html": [ + "7003903408f8f73b28f02de61ee23b96be36be3b", + [ + null, + { + "timeout": "long" + } + ] + ], "sandboxed-iframe-fetch-event.https.html": [ "ba34e790ff07c8ba35d89d50df7b010e6c529e35", [ @@ -493066,6 +493183,13 @@ ] }, "scripted": { + "getextentofchar.html": [ + "1a6bb32b4bf07f22e7e3b44815313882fd8a88c7", + [ + null, + {} + ] + ], "getrotationofchar.html": [ "766afe5f96da16565052449581f9b1e86604d43a", [ diff --git a/third_party/blink/web_tests/external/wpt/docs/writing-tests/reftests.md b/third_party/blink/web_tests/external/wpt/docs/writing-tests/reftests.md index 135fc20074df49..219e5887a083b2 100644 --- a/third_party/blink/web_tests/external/wpt/docs/writing-tests/reftests.md +++ b/third_party/blink/web_tests/external/wpt/docs/writing-tests/reftests.md @@ -120,7 +120,7 @@ To specify the fuzziness in the test file one may add a `` element (or, in the case of more complex tests, to any page containing the `` elements). In the simplest case this has a `content` attribute containing the parameters above, -separated by a colon e.g. +separated by a semicolon e.g. ``` @@ -148,7 +148,7 @@ or In this case the maximum pixel difference must be in the range `10-15` and the total number of different pixels must be in the range -`200-300`. +`200-300`. These range checks are inclusive. In cases where a single test has multiple possible refs and the fuzziness is not the same for all refs, a ref may be specified by diff --git a/third_party/crashpad/README.chromium b/third_party/crashpad/README.chromium index 6ce71b71c8c13f..4db0eecae4399c 100644 --- a/third_party/crashpad/README.chromium +++ b/third_party/crashpad/README.chromium @@ -2,7 +2,7 @@ Name: Crashpad Short Name: crashpad URL: https://crashpad.chromium.org/ Version: unknown -Revision: d842c3c4c62ec9d3b8fc928ad025a2d314a110ff +Revision: defcda0c2c54814a9bf74a0e90f4fb433c41209c License: Apache 2.0 License File: crashpad/LICENSE Security Critical: yes diff --git a/third_party/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc b/third_party/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc index 0bc9247b33818c..1796c76c9f5f85 100644 --- a/third_party/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc +++ b/third_party/crashpad/crashpad/snapshot/ios/process_snapshot_ios_intermediate_dump_test.cc @@ -336,9 +336,8 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test { stack_region_address += 10; EXPECT_TRUE( writer->AddProperty(Key::kStackRegionAddress, &stack_region_address)); - constexpr char memory_region[] = "stack_data"; EXPECT_TRUE( - writer->AddPropertyBytes(Key::kStackRegionData, memory_region, 10)); + writer->AddPropertyBytes(Key::kStackRegionData, "stack_data", 10)); { IOSIntermediateDumpWriter::ScopedArray memoryRegions( writer, Key::kThreadContextMemoryRegions); @@ -347,9 +346,8 @@ class ProcessSnapshotIOSIntermediateDumpTest : public testing::Test { const vm_address_t memory_region_address = 0; EXPECT_TRUE(writer->AddProperty( Key::kThreadContextMemoryRegionAddress, &memory_region_address)); - constexpr char memory_region[] = "string"; EXPECT_TRUE(writer->AddPropertyBytes( - Key::kThreadContextMemoryRegionData, memory_region, 6)); + Key::kThreadContextMemoryRegionData, "string", 6)); } } }