diff --git a/DEPS b/DEPS index 4258baa..79909f5 100644 --- a/DEPS +++ b/DEPS
@@ -312,11 +312,11 @@ # 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': '261f006976dcb286e2cf89302774e4c139c93510', + 'v8_revision': 'c69fcce217bd7c6bda3d022b94bb3926f9be300a', # 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': '943d71e10ee43264877c1ba9e3e0cff6765d3fb7', + 'angle_revision': '583fd03e9f7ab7dc76eaa59f327de25b349407b9', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -335,7 +335,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. - 'fuchsia_version': 'version:9.20220929.2.1', + 'fuchsia_version': 'version:9.20220930.3.1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. @@ -423,7 +423,7 @@ # 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': '3aad6d186e035609dda8f2b268d5536fe5e9eb4b', + 'dawn_revision': '873df0a2f7e4e5742c108b213a651cee50323fdd', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -463,11 +463,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libcxxabi_revision': '5c3e02e92ae8bbc1bf1001bd9ef0d76e044ddb86', + 'libcxxabi_revision': '20a144a49a2819e20b90d145554299e995d67c06', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'libunwind_revision': '7ff728a9779cdc8e0639c032dc45cc20f7b4af21', + 'libunwind_revision': '08ebcbe7b672a04e341cb3a88d8bf4276f96ac6e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -487,7 +487,7 @@ # If you change this, also update the libc++ revision in # //buildtools/deps_revisions.gni. - 'libcxx_revision': '5ee02b299379896f90faa88f576be98c61156f26', + 'libcxx_revision': '591c99193d353c17b694d1692db75630082525b9', # GN CIPD package version. 'gn_version': 'git_revision:cc28efe62ef0c2fb32455f414a29c4a55bb7fbc4', @@ -814,7 +814,7 @@ Var('chromium_git') + '/external/github.com/toji/webvr.info.git' + '@' + 'c58ae99b9ff9e2aa4c524633519570bf33536248', 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + '4a2d5e77ade4fa22575ca66b48af09538078692c', + 'url': Var('chromium_git') + '/website.git' + '@' + '2d42c91a96eaab027cc6ef06f79b7bf5e77b5ade', }, 'src/ios/third_party/earl_grey2/src': { @@ -833,7 +833,7 @@ }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'c85c2cf1caa359e0efa76e80faddfc9b552de69c', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'a18d1afbc0c49bb713443640ece6ead009c961e9', 'condition': 'checkout_ios', }, @@ -993,7 +993,7 @@ 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'Qrr7XbiFU6roecwamtJrTYTvM4ZrQGtEoV4s3hWRA-wC', + 'version': 'S60UtEBNkQs2k4ttPmH_fhp_yR5pIbvmfxIpC6VBSgcC', }, ], 'condition': 'checkout_android', @@ -1242,7 +1242,7 @@ Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), 'src/third_party/devtools-frontend-internal': { - 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '290a84a037fbefb1d888397d0714aebb94d728fc', + 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '390fe896a95e8eb61f12212577226afc49ac6d6d', 'condition': 'checkout_src_internal', }, @@ -1839,7 +1839,7 @@ Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'e84b11b1d90efe59e94bb24d1f1276071f50481e', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '48912451d470b243c8602e9af5ca548173a64353', + Var('webrtc_git') + '/src.git' + '@' + 'b3dd1738e4ab384e0e68b7eede43e6d289fdb417', # Wuffs' canonical repository is at github.com/google/wuffs, but we use # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file. @@ -1909,7 +1909,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@beef645437edb0931003a2655bea62bd32d7607f', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@b0e1e63bb6c3a619afca71b3f50284bec33ced71', 'condition': 'checkout_src_internal', },
diff --git a/WATCHLISTS b/WATCHLISTS index 1c41a384..be8d5b9f 100644 --- a/WATCHLISTS +++ b/WATCHLISTS
@@ -2614,13 +2614,15 @@ 'gavindodd+watch-diagnostics_mojo@google.com', 'michaelcheco+watch-diagnostics_mojo@google.com', 'zentaro+watch-diagnostics_mojo@chromium.org', - 'dpad+watch-diagnostics_mojo@google.com'], + 'dpad+watch-diagnostics_mojo@google.com', + 'zhangwenyu+watch-diagnostics_mojo@google.com'], 'diagnostics_ui': ['gavinwill+diagnostics-watch@chromium.org', 'michaelcheco+diagnostics-watch@google.com', 'zentaro+diagnostics-watch@chromium.org', 'gavindodd+diagnostics-watch@google.com', 'ashleydp+diagnostics-watch@google.com', - 'dpad+diagnostics-watch@google.com'], + 'dpad+diagnostics-watch@google.com', + 'zhangwenyu+diagnostics-watch@google.com'], 'discardable_memory': ['thiabaud+watch-discardable-memory@google.com'], 'disk_cache': ['gavinp+disk@chromium.org'], 'dom_storage': ['dmurph+watchingdomstorage@chromium.org'],
diff --git a/ash/capture_mode/stop_recording_button_tray.cc b/ash/capture_mode/stop_recording_button_tray.cc index 1ca4ffd4..64cdec9 100644 --- a/ash/capture_mode/stop_recording_button_tray.cc +++ b/ash/capture_mode/stop_recording_button_tray.cc
@@ -6,6 +6,7 @@ #include "ash/capture_mode/capture_mode_controller.h" #include "ash/capture_mode/capture_mode_metrics.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" #include "ash/style/ash_color_id.h" @@ -20,9 +21,18 @@ namespace ash { StopRecordingButtonTray::StopRecordingButtonTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView( + shelf, + TrayBackgroundViewCatalogName::kScreenCaptureStopRecording, + RoundedCornerBehavior::kAllRounded), image_view_(tray_container()->AddChildView( std::make_unique<views::ImageView>())) { + SetPressedCallback(base::BindRepeating([](const ui::Event& event) { + base::RecordAction(base::UserMetricsAction("Tray_StopRecording")); + CaptureModeController::Get()->EndVideoRecording( + EndRecordingReason::kStopRecordingButton); + })); + image_view_->SetTooltipText(GetAccessibleNameForTray()); image_view_->SetHorizontalAlignment(views::ImageView::Alignment::kCenter); image_view_->SetVerticalAlignment(views::ImageView::Alignment::kCenter); @@ -31,17 +41,6 @@ StopRecordingButtonTray::~StopRecordingButtonTray() = default; -bool StopRecordingButtonTray::PerformAction(const ui::Event& event) { - DCHECK(event.type() == ui::ET_MOUSE_RELEASED || - event.type() == ui::ET_GESTURE_TAP || - event.type() == ui::ET_KEY_PRESSED); - - base::RecordAction(base::UserMetricsAction("Tray_StopRecording")); - CaptureModeController::Get()->EndVideoRecording( - EndRecordingReason::kStopRecordingButton); - return true; -} - std::u16string StopRecordingButtonTray::GetAccessibleNameForTray() { return l10n_util::GetStringUTF16( IDS_ASH_STATUS_AREA_STOP_RECORDING_BUTTON_ACCESSIBLE_NAME);
diff --git a/ash/capture_mode/stop_recording_button_tray.h b/ash/capture_mode/stop_recording_button_tray.h index efabfe9..084ca48 100644 --- a/ash/capture_mode/stop_recording_button_tray.h +++ b/ash/capture_mode/stop_recording_button_tray.h
@@ -7,8 +7,15 @@ #include "ash/system/tray/tray_background_view.h" +namespace views { +class ImageView; +} + namespace ash { +class Shelf; +class TrayBubbleView; + // Status area tray which is visible when a video is being recorded using // capture mode. Tapping this tray will stop recording. This tray does not // provide any bubble view windows. @@ -19,8 +26,8 @@ StopRecordingButtonTray& operator=(const StopRecordingButtonTray&) = delete; ~StopRecordingButtonTray() override; + private: // TrayBackgroundView: - bool PerformAction(const ui::Event& event) override; void ClickedOutsideBubble() override {} std::u16string GetAccessibleNameForTray() override; void HandleLocaleChange() override {}
diff --git a/ash/constants/BUILD.gn b/ash/constants/BUILD.gn index 8e672d5b..e092630 100644 --- a/ash/constants/BUILD.gn +++ b/ash/constants/BUILD.gn
@@ -28,6 +28,7 @@ "notifier_catalogs.h", "personalization_entry_point.h", "quick_settings_catalogs.h", + "tray_background_view_catalog.h", "url_constants.cc", "url_constants.h", ]
diff --git a/ash/constants/OWNERS b/ash/constants/OWNERS index 860e0ca..ef6e881 100644 --- a/ash/constants/OWNERS +++ b/ash/constants/OWNERS
@@ -10,3 +10,6 @@ per-file quick_settings_catalogs.h=set noparent per-file quick_settings_catalogs.h=file://ash/system/OWNERS per-file quick_settings_catalogs.h=jiamingc@chromium.org +per-file tray_background_view_catalog.h=set noparent +per-file tray_background_view_catalog.h=file://ash/system/OWNERS +per-file tray_background_view_catalog.h=newcomer@chromium.org
diff --git a/ash/constants/tray_background_view_catalog.h b/ash/constants/tray_background_view_catalog.h new file mode 100644 index 0000000..518f0aa --- /dev/null +++ b/ash/constants/tray_background_view_catalog.h
@@ -0,0 +1,43 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef ASH_CONSTANTS_TRAY_BACKGROUND_VIEW_CATALOG_H_ +#define ASH_CONSTANTS_TRAY_BACKGROUND_VIEW_CATALOG_H_ + +namespace ash { + +// Usages of shelf pods (TrayBackgroundView). +// These values are persisted to logs. Entries should not be renumbered and +// numeric values should never be reused. To deprecate an entry, add the +// `_DEPRECATED` postfix. Once you add an entry here, remember to add it in the +// TrayBackgroundViewCatalogName enum in enums.xml. +enum class TrayBackgroundViewCatalogName { + kTestCatalogName = 0, + kUnifiedSystem = 1, + kDateTray = 2, + kNotificationCenter = 3, + kOverview = 4, + kImeMenu = 5, + kHoldingSpace = 6, + kScreenCaptureStopRecording = 7, + kProjectorAnnotation = 8, + kDictationStatusArea = 9, + kDictationAccesibilityWindow = 10, + kSelectToSpeakStatusArea = 11, + kSelectToSpeakAccessibilityWindow = 12, + kEche = 13, + kMediaPlayer = 14, + kPalette = 15, + kPhoneHub = 16, + kLogoutButton = 17, + kStatusAreaOverflowButton = 18, + kVirtualKeyboardStatusArea = 19, + kVirtualKeyboardAccessibilityWindow = 20, + kWmMode = 21, + kMaxValue = kWmMode, +}; + +} // namespace ash + +#endif // ASH_CONSTANTS_TRAY_BACKGROUND_VIEW_CATALOG_H_
diff --git a/ash/display/overscan_calibrator.cc b/ash/display/overscan_calibrator.cc index 4c5c12d..78738827 100644 --- a/ash/display/overscan_calibrator.cc +++ b/ash/display/overscan_calibrator.cc
@@ -63,7 +63,7 @@ rotate_transform.Rotate(rotation_degree); gfx::Transform move_transform; move_transform.Translate(x_offset, y_offset); - rotate_transform.ConcatTransform(move_transform); + rotate_transform.PostConcat(move_transform); base_path.transform(gfx::TransformToFlattenedSkMatrix(rotate_transform), &path);
diff --git a/ash/projector/projector_annotation_tray.cc b/ash/projector/projector_annotation_tray.cc index eaaa159..d73175e6 100644 --- a/ash/projector/projector_annotation_tray.cc +++ b/ash/projector/projector_annotation_tray.cc
@@ -6,6 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/projector/projector_controller_impl.h" #include "ash/projector/ui/projector_color_button.h" #include "ash/public/cpp/projector/annotator_tool.h" @@ -94,7 +95,8 @@ } // namespace ProjectorAnnotationTray::ProjectorAnnotationTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView(shelf, + TrayBackgroundViewCatalogName::kProjectorAnnotation), image_view_( tray_container()->AddChildView(std::make_unique<views::ImageView>())), pen_view_(nullptr) {
diff --git a/ash/public/cpp/child_accounts/DIR_METADATA b/ash/public/cpp/child_accounts/DIR_METADATA index c0ebf85..eff0b992 100644 --- a/ash/public/cpp/child_accounts/DIR_METADATA +++ b/ash/public/cpp/child_accounts/DIR_METADATA
@@ -1,3 +1 @@ -monorail { - component: "FamilyExperiences" -} \ No newline at end of file +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/ash/resources/vector_icons/BUILD.gn b/ash/resources/vector_icons/BUILD.gn index 782b0262..a64d1b2 100644 --- a/ash/resources/vector_icons/BUILD.gn +++ b/ash/resources/vector_icons/BUILD.gn
@@ -428,6 +428,7 @@ "toolbar_position_top_center.icon", "touch_calibration_complete_check.icon", "touch_calibration_hand.icon", + "touch_indicator.icon", "trash_can.icon", "tray_action_new_lock_screen_note.icon", "two_files.icon",
diff --git a/ash/resources/vector_icons/touch_indicator.icon b/ash/resources/vector_icons/touch_indicator.icon new file mode 100644 index 0000000..897a0af --- /dev/null +++ b/ash/resources/vector_icons/touch_indicator.icon
@@ -0,0 +1,19 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// TODO(crbug.com/1369723): This is copied from the dark mode icon. It is +// temporary until a resource is provided from UI. + +CANVAS_DIMENSIONS, 20, +MOVE_TO, 10, 18, +R_CUBIC_TO, 4.42f, 0, 8, -3.58f, 8, -8, +R_CUBIC_TO, 0, -4.42f, -3.58f, -8, -8, -8, +R_CUBIC_TO, -4.42f, 0, -8, 3.58f, -8, 8, +R_CUBIC_TO, 0, 4.42f, 3.58f, 8, 8, 8, +CLOSE, +R_MOVE_TO, 0, -14.12f, +R_CUBIC_TO, 3.38f, 0, 6.12f, 2.74f, 6.12f, 6.12f, +R_CUBIC_TO, 0, 3.38f, -2.74f, 6.12f, -6.12f, 6.12f, +V_LINE_TO, 3.88f, +CLOSE
diff --git a/ash/system/accessibility/dictation_button_tray.cc b/ash/system/accessibility/dictation_button_tray.cc index 37977aa..5bc9a918 100644 --- a/ash/system/accessibility/dictation_button_tray.cc +++ b/ash/system/accessibility/dictation_button_tray.cc
@@ -6,6 +6,7 @@ #include "ash/accessibility/accessibility_controller_impl.h" #include "ash/constants/ash_pref_names.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/public/cpp/accessibility_controller_enums.h" #include "ash/public/cpp/shelf_config.h" @@ -46,8 +47,10 @@ } // namespace -DictationButtonTray::DictationButtonTray(Shelf* shelf) - : TrayBackgroundView(shelf), +DictationButtonTray::DictationButtonTray( + Shelf* shelf, + TrayBackgroundViewCatalogName catalog_name) + : TrayBackgroundView(shelf, catalog_name), icon_(new views::ImageView()), download_progress_(0) { Shell* shell = Shell::Get();
diff --git a/ash/system/accessibility/dictation_button_tray.h b/ash/system/accessibility/dictation_button_tray.h index 0925d1b..5ed4606b 100644 --- a/ash/system/accessibility/dictation_button_tray.h +++ b/ash/system/accessibility/dictation_button_tray.h
@@ -8,6 +8,7 @@ #include "ash/accelerators/accelerator_controller_impl.h" #include "ash/accessibility/accessibility_observer.h" #include "ash/ash_export.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/public/cpp/session/session_observer.h" #include "ash/shell_observer.h" #include "ash/system/tray/tray_background_view.h" @@ -32,7 +33,7 @@ public SessionObserver, public ui::InputMethodObserver { public: - explicit DictationButtonTray(Shelf* shelf); + DictationButtonTray(Shelf* shelf, TrayBackgroundViewCatalogName catalog_name); DictationButtonTray(const DictationButtonTray&) = delete; DictationButtonTray& operator=(const DictationButtonTray&) = delete;
diff --git a/ash/system/accessibility/floating_accessibility_view.cc b/ash/system/accessibility/floating_accessibility_view.cc index cce7f16..5815022 100644 --- a/ash/system/accessibility/floating_accessibility_view.cc +++ b/ash/system/accessibility/floating_accessibility_view.cc
@@ -133,11 +133,16 @@ std::unique_ptr<views::View> feature_buttons_container = CreateButtonRowContainer(kPanelPositionButtonPadding); dictation_button_ = feature_buttons_container->AddChildView( - std::make_unique<DictationButtonTray>(shelf)); + std::make_unique<DictationButtonTray>( + shelf, TrayBackgroundViewCatalogName::kDictationAccesibilityWindow)); select_to_speak_button_ = feature_buttons_container->AddChildView( - std::make_unique<SelectToSpeakTray>(shelf)); + std::make_unique<SelectToSpeakTray>( + shelf, + TrayBackgroundViewCatalogName::kSelectToSpeakAccessibilityWindow)); virtual_keyboard_button_ = feature_buttons_container->AddChildView( - std::make_unique<VirtualKeyboardTray>(shelf)); + std::make_unique<VirtualKeyboardTray>( + shelf, + TrayBackgroundViewCatalogName::kVirtualKeyboardAccessibilityWindow)); // It will be visible again as soon as any of the children becomes visible. feature_buttons_container->SetVisible(false);
diff --git a/ash/system/accessibility/select_to_speak/select_to_speak_tray.cc b/ash/system/accessibility/select_to_speak/select_to_speak_tray.cc index 8462882..9fe9c87 100644 --- a/ash/system/accessibility/select_to_speak/select_to_speak_tray.cc +++ b/ash/system/accessibility/select_to_speak/select_to_speak_tray.cc
@@ -5,6 +5,7 @@ #include "ash/system/accessibility/select_to_speak/select_to_speak_tray.h" #include "ash/accessibility/accessibility_controller_impl.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/session/session_controller_impl.h" #include "ash/shell.h" @@ -51,8 +52,9 @@ } // namespace -SelectToSpeakTray::SelectToSpeakTray(Shelf* shelf) - : TrayBackgroundView(shelf), icon_(new views::ImageView()) { +SelectToSpeakTray::SelectToSpeakTray(Shelf* shelf, + TrayBackgroundViewCatalogName catalog_name) + : TrayBackgroundView(shelf, catalog_name), icon_(new views::ImageView()) { const gfx::ImageSkia inactive_image = gfx::CreateVectorIcon( kSystemTraySelectToSpeakNewuiIcon, TrayIconColor(Shell::Get()->session_controller()->GetSessionState()));
diff --git a/ash/system/accessibility/select_to_speak/select_to_speak_tray.h b/ash/system/accessibility/select_to_speak/select_to_speak_tray.h index 7a1773a..e4f7df9 100644 --- a/ash/system/accessibility/select_to_speak/select_to_speak_tray.h +++ b/ash/system/accessibility/select_to_speak/select_to_speak_tray.h
@@ -7,6 +7,7 @@ #include "ash/accessibility/accessibility_observer.h" #include "ash/ash_export.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/public/cpp/session/session_observer.h" #include "ash/system/tray/tray_background_view.h" #include "ui/views/controls/image_view.h" @@ -22,7 +23,7 @@ public AccessibilityObserver, public SessionObserver { public: - explicit SelectToSpeakTray(Shelf* shelf); + SelectToSpeakTray(Shelf* shelf, TrayBackgroundViewCatalogName catalog_name); SelectToSpeakTray(const SelectToSpeakTray&) = delete; SelectToSpeakTray& operator=(const SelectToSpeakTray&) = delete;
diff --git a/ash/system/eche/eche_tray.cc b/ash/system/eche/eche_tray.cc index 0f348b6..c8cc213 100644 --- a/ash/system/eche/eche_tray.cc +++ b/ash/system/eche/eche_tray.cc
@@ -8,6 +8,7 @@ #include "ash/accessibility/accessibility_controller_impl.h" #include "ash/constants/notifier_catalogs.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/public/cpp/accelerators.h" #include "ash/public/cpp/ash_web_view.h" @@ -175,7 +176,7 @@ } EcheTray::EcheTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kEche), icon_( tray_container()->AddChildView(std::make_unique<views::ImageView>())), event_interceptor_(std::make_unique<EventInterceptor>(this)) {
diff --git a/ash/system/holding_space/holding_space_tray.cc b/ash/system/holding_space/holding_space_tray.cc index f901a7d..be96b86 100644 --- a/ash/system/holding_space/holding_space_tray.cc +++ b/ash/system/holding_space/holding_space_tray.cc
@@ -8,6 +8,7 @@ #include "ash/accessibility/accessibility_controller_impl.h" #include "ash/constants/ash_features.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/drag_drop/scoped_drag_drop_observer.h" #include "ash/public/cpp/holding_space/holding_space_client.h" #include "ash/public/cpp/holding_space/holding_space_constants.h" @@ -225,7 +226,8 @@ // HoldingSpaceTray ------------------------------------------------------------ -HoldingSpaceTray::HoldingSpaceTray(Shelf* shelf) : TrayBackgroundView(shelf) { +HoldingSpaceTray::HoldingSpaceTray(Shelf* shelf) + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kHoldingSpace) { // Ensure the existence of the singleton animation registry. HoldingSpaceAnimationRegistry::GetInstance();
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc index 55f60df..7a1c7c0 100644 --- a/ash/system/ime_menu/ime_menu_tray.cc +++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -5,6 +5,7 @@ #include "ash/system/ime_menu/ime_menu_tray.h" #include "ash/accessibility/accessibility_controller_impl.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/ime/ime_controller_impl.h" #include "ash/keyboard/keyboard_controller_impl.h" #include "ash/keyboard/ui/keyboard_ui_controller.h" @@ -322,7 +323,7 @@ } // namespace ImeMenuTray::ImeMenuTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kImeMenu), ime_controller_(Shell::Get()->ime_controller()), label_(nullptr), image_view_(nullptr),
diff --git a/ash/system/media/media_tray.cc b/ash/system/media/media_tray.cc index 3712530..ec6c0ee 100644 --- a/ash/system/media/media_tray.cc +++ b/ash/system/media/media_tray.cc
@@ -5,6 +5,7 @@ #include "ash/system/media/media_tray.h" #include "ash/constants/ash_pref_names.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/focus_cycler.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/root_window_controller.h" @@ -199,7 +200,8 @@ : IDS_ASH_GLOBAL_MEDIA_CONTROLS_UNPINNED_BUTTON_TOOLTIP_TEXT)); } -MediaTray::MediaTray(Shelf* shelf) : TrayBackgroundView(shelf) { +MediaTray::MediaTray(Shelf* shelf) + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kMediaPlayer) { if (MediaNotificationProvider::Get()) MediaNotificationProvider::Get()->AddObserver(this);
diff --git a/ash/system/media/media_tray_unittest.cc b/ash/system/media/media_tray_unittest.cc index 3c3ec2d..f0cdd82 100644 --- a/ash/system/media/media_tray_unittest.cc +++ b/ash/system/media/media_tray_unittest.cc
@@ -4,6 +4,7 @@ #include "ash/system/media/media_tray.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/shelf/shelf.h" #include "ash/shell.h" #include "ash/system/media/media_notification_provider.h" @@ -67,7 +68,9 @@ // Mock tray button used to test media tray bubble's anchor update. class MockTrayBackgroundView : public ash::TrayBackgroundView { public: - MockTrayBackgroundView(Shelf* shelf) : TrayBackgroundView(shelf) { + explicit MockTrayBackgroundView(Shelf* shelf) + : TrayBackgroundView(shelf, + TrayBackgroundViewCatalogName::kTestCatalogName) { SetSize(kMockTraySize); }
diff --git a/ash/system/network/network_detailed_network_view_impl.cc b/ash/system/network/network_detailed_network_view_impl.cc index 4d785e1..8bf1c58 100644 --- a/ash/system/network/network_detailed_network_view_impl.cc +++ b/ash/system/network/network_detailed_network_view_impl.cc
@@ -5,11 +5,14 @@ #include "ash/system/network/network_detailed_network_view_impl.h" #include "ash/constants/ash_features.h" +#include "ash/session/session_controller_impl.h" +#include "ash/shell.h" #include "ash/system/network/network_detailed_view.h" #include "ash/system/network/network_list_mobile_header_view_impl.h" #include "ash/system/network/network_list_network_item_view.h" #include "ash/system/network/network_list_wifi_header_view_impl.h" #include "ash/system/network/network_utils.h" +#include "ash/system/network/tray_network_state_model.h" #include "ash/system/tray/detailed_view_delegate.h" #include "ui/base/metadata/metadata_impl_macros.h" @@ -31,6 +34,22 @@ void NetworkDetailedNetworkViewImpl::NotifyNetworkListChanged() { scroll_content()->InvalidateLayout(); Layout(); + + if (!settings_button()) + return; + + if (Shell::Get()->session_controller()->login_status() == + LoginStatus::NOT_LOGGED_IN) { + // When not logged in, only enable the settings button if there is a + // default (i.e. connected or connecting) network to show settings for. + settings_button()->SetEnabled(model()->default_network()); + } else { + // Otherwise, enable if showing settings is allowed. There are situations + // (supervised user creation flow) when the session is started but UI flow + // continues within login UI, i.e., no browser window is yet available. + settings_button()->SetEnabled( + Shell::Get()->session_controller()->ShouldEnableSettings()); + } } views::View* NetworkDetailedNetworkViewImpl::GetAsView() {
diff --git a/ash/system/network/network_detailed_network_view_unittest.cc b/ash/system/network/network_detailed_network_view_unittest.cc index 56cfa961..8ed430349 100644 --- a/ash/system/network/network_detailed_network_view_unittest.cc +++ b/ash/system/network/network_detailed_network_view_unittest.cc
@@ -22,6 +22,7 @@ #include "third_party/cros_system_api/dbus/shill/dbus-constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/events/event_utils.h" +#include "ui/views/controls/button/button.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" @@ -37,6 +38,7 @@ const char kStubCellularDevicePath[] = "/device/stub_cellular_device"; const char kStubCellularDeviceName[] = "stub_cellular_device"; +const char kCellularNetworkGuid[] = "cellular_guid"; class FakeNetworkDetailedNetworkViewDelegate : public NetworkDetailedNetworkView::Delegate { @@ -141,6 +143,22 @@ AshTestBase::TearDown(); } + void AddCellularNetwork() { + const std::string cellular_path = + network_state_helper()->ConfigureService(base::StringPrintf( + R"({"GUID": "%s", "Type": "cellular", "Technology": "LTE", + "State": "idle"})", + kCellularNetworkGuid)); + + network_state_helper()->SetServiceProperty( + cellular_path, std::string(shill::kDeviceProperty), + base::Value(kStubCellularDevicePath)); + network_state_helper()->SetServiceProperty( + cellular_path, std::string(shill::kStateProperty), + base::Value(shill::kStateOnline)); + base::RunLoop().RunUntilIdle(); + } + NetworkListNetworkItemView* AddNetworkListItem() { return network_detailed_network_view()->AddNetworkListItem(); } @@ -149,6 +167,11 @@ network_detailed_network_view()->NotifyNetworkListChanged(); } + views::Button* FindSettingsButton() { + return FindViewById<views::Button*>( + NetworkDetailedView::NetworkDetailedViewChildId::kSettingsButton); + } + NetworkListWifiHeaderView* AddWifiSectionHeader() { return network_detailed_network_view()->AddWifiSectionHeader(); } @@ -170,6 +193,12 @@ } private: + template <class T> + T FindViewById(NetworkDetailedView::NetworkDetailedViewChildId id) { + return static_cast<T>( + network_detailed_network_view_->GetViewByID(static_cast<int>(id))); + } + NetworkDetailedNetworkViewImpl* network_detailed_network_view() { return network_detailed_network_view_; } @@ -231,4 +260,24 @@ EXPECT_EQ(1u, delegate()->network_list_item_selected_count()); } +TEST_F(NetworkDetailedNetworkViewTest, SettingsButton) { + views::Button* settings_button = FindSettingsButton(); + + EXPECT_TRUE(settings_button->GetEnabled()); + + // When in OOBE and no active networks are available settings button is + // disabled. + GetSessionControllerClient()->SetSessionState( + session_manager::SessionState::OOBE); + NotifyNetworkListChanged(); + + EXPECT_FALSE(settings_button->GetEnabled()); + + // Add a network and check settings button state. When an active network + // is present settings button should be enabled. + AddCellularNetwork(); + NotifyNetworkListChanged(); + EXPECT_TRUE(settings_button->GetEnabled()); +} + } // namespace ash
diff --git a/ash/system/network/network_detailed_view.h b/ash/system/network/network_detailed_view.h index 9f58d156..5b7e87c 100644 --- a/ash/system/network/network_detailed_view.h +++ b/ash/system/network/network_detailed_view.h
@@ -54,10 +54,15 @@ Delegate* delegate, ListType list_type); + TrayNetworkStateModel* model() { return model_; } + + views::Button* settings_button() { return settings_button_; } + Delegate* delegate() { return delegate_; } private: friend class NetworkDetailedViewTest; + friend class NetworkDetailedNetworkViewTest; // Used for testing. Starts at 1 because view IDs should not be 0. enum class NetworkDetailedViewChildId {
diff --git a/ash/system/notification_center/notification_center_tray.cc b/ash/system/notification_center/notification_center_tray.cc index 0a13b47..3da95a3 100644 --- a/ash/system/notification_center/notification_center_tray.cc +++ b/ash/system/notification_center/notification_center_tray.cc
@@ -6,6 +6,7 @@ #include <string> +#include "ash/constants/tray_background_view_catalog.h" #include "ash/shelf/shelf.h" #include "ash/system/tray/tray_background_view.h" #include "ash/system/tray/tray_bubble_view.h" @@ -18,7 +19,9 @@ namespace ash { NotificationCenterTray::NotificationCenterTray(Shelf* shelf) - : TrayBackgroundView(shelf, RoundedCornerBehavior::kStartRounded) { + : TrayBackgroundView(shelf, + TrayBackgroundViewCatalogName::kNotificationCenter, + RoundedCornerBehavior::kStartRounded) { SetLayoutManager(std::make_unique<views::FlexLayout>()); set_use_bounce_in_animation(false);
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc index 68462a4..4d7f7f2 100644 --- a/ash/system/overview/overview_button_tray.cc +++ b/ash/system/overview/overview_button_tray.cc
@@ -5,6 +5,7 @@ #include "ash/system/overview/overview_button_tray.h" #include "ash/constants/ash_features.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/public/cpp/shelf_config.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/session/session_controller_impl.h" @@ -76,7 +77,7 @@ constexpr base::TimeDelta OverviewButtonTray::kDoubleTapThresholdMs; OverviewButtonTray::OverviewButtonTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kOverview), icon_(new views::ImageView()), scoped_session_observer_(this) { const gfx::ImageSkia image = GetIconImage();
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc index 7eb7673b..f71ff746 100644 --- a/ash/system/palette/palette_tray.cc +++ b/ash/system/palette/palette_tray.cc
@@ -9,6 +9,7 @@ #include "ash/accessibility/accessibility_controller_impl.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/projector/projector_controller_impl.h" #include "ash/public/cpp/shelf_config.h" #include "ash/public/cpp/stylus_utils.h" @@ -245,7 +246,7 @@ } // namespace PaletteTray::PaletteTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kPalette), palette_tool_manager_(std::make_unique<PaletteToolManager>(this)), welcome_bubble_(std::make_unique<PaletteWelcomeBubble>(this)), stylus_event_handler_(std::make_unique<StylusEventHandler>(this)),
diff --git a/ash/system/phonehub/phone_hub_tray.cc b/ash/system/phonehub/phone_hub_tray.cc index 61cc42d..61ce91c 100644 --- a/ash/system/phonehub/phone_hub_tray.cc +++ b/ash/system/phonehub/phone_hub_tray.cc
@@ -9,6 +9,7 @@ #include "ash/components/phonehub/phone_hub_manager.h" #include "ash/components/phonehub/phone_model.h" #include "ash/constants/ash_features.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/focus_cycler.h" #include "ash/public/cpp/system_tray_client.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -55,7 +56,8 @@ } // namespace PhoneHubTray::PhoneHubTray(Shelf* shelf) - : TrayBackgroundView(shelf), ui_controller_(new PhoneHubUiController()) { + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kPhoneHub), + ui_controller_(new PhoneHubUiController()) { observed_phone_hub_ui_controller_.Observe(ui_controller_.get()); observed_session_.Observe(Shell::Get()->session_controller());
diff --git a/ash/system/session/logout_button_tray.cc b/ash/system/session/logout_button_tray.cc index 1c75e841..fe668ac 100644 --- a/ash/system/session/logout_button_tray.cc +++ b/ash/system/session/logout_button_tray.cc
@@ -7,6 +7,7 @@ #include <memory> #include "ash/constants/ash_pref_names.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/public/cpp/ash_typography.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/session/session_controller_impl.h" @@ -31,7 +32,8 @@ namespace ash { -LogoutButtonTray::LogoutButtonTray(Shelf* shelf) : TrayBackgroundView(shelf) { +LogoutButtonTray::LogoutButtonTray(Shelf* shelf) + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kLogoutButton) { DCHECK(shelf); Shell::Get()->session_controller()->AddObserver(this);
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index 9bf626c..e8450cc3 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc
@@ -114,13 +114,13 @@ AddTrayButton(std::make_unique<HoldingSpaceTray>(shelf_)); logout_button_tray_ = AddTrayButton(std::make_unique<LogoutButtonTray>(shelf_)); - dictation_button_tray_ = - AddTrayButton(std::make_unique<DictationButtonTray>(shelf_)); - select_to_speak_tray_ = - AddTrayButton(std::make_unique<SelectToSpeakTray>(shelf_)); + dictation_button_tray_ = AddTrayButton(std::make_unique<DictationButtonTray>( + shelf_, TrayBackgroundViewCatalogName::kDictationStatusArea)); + select_to_speak_tray_ = AddTrayButton(std::make_unique<SelectToSpeakTray>( + shelf_, TrayBackgroundViewCatalogName::kSelectToSpeakStatusArea)); ime_menu_tray_ = AddTrayButton(std::make_unique<ImeMenuTray>(shelf_)); - virtual_keyboard_tray_ = - AddTrayButton(std::make_unique<VirtualKeyboardTray>(shelf_)); + virtual_keyboard_tray_ = AddTrayButton(std::make_unique<VirtualKeyboardTray>( + shelf_, TrayBackgroundViewCatalogName::kVirtualKeyboardStatusArea)); stop_recording_button_tray_ = AddTrayButton(std::make_unique<StopRecordingButtonTray>(shelf_)); @@ -259,15 +259,40 @@ void StatusAreaWidget::LogVisiblePodCountMetric() { int visible_pod_count = 0; for (auto* tray_button : tray_buttons_) { - if (tray_button == overflow_button_tray_ || - tray_button == overview_button_tray_ || - tray_button == unified_system_tray_ || tray_button == date_tray_ || - tray_button == notification_center_tray_ || - !tray_button->GetVisible()) { - continue; - } + switch (tray_button->catalog_name()) { + case TrayBackgroundViewCatalogName::kUnifiedSystem: + case TrayBackgroundViewCatalogName::kStatusAreaOverflowButton: + case TrayBackgroundViewCatalogName::kDateTray: + case TrayBackgroundViewCatalogName::kNotificationCenter: + // These pods always show, ignore them. + continue; - visible_pod_count += 1; + case TrayBackgroundViewCatalogName::kSelectToSpeakAccessibilityWindow: + case TrayBackgroundViewCatalogName::kDictationAccesibilityWindow: + case TrayBackgroundViewCatalogName::kVirtualKeyboardAccessibilityWindow: + // These pods show in an unrelated menu. + continue; + + case TrayBackgroundViewCatalogName::kOverview: + case TrayBackgroundViewCatalogName::kTestCatalogName: + case TrayBackgroundViewCatalogName::kImeMenu: + case TrayBackgroundViewCatalogName::kHoldingSpace: + case TrayBackgroundViewCatalogName::kScreenCaptureStopRecording: + case TrayBackgroundViewCatalogName::kProjectorAnnotation: + case TrayBackgroundViewCatalogName::kDictationStatusArea: + case TrayBackgroundViewCatalogName::kSelectToSpeakStatusArea: + case TrayBackgroundViewCatalogName::kEche: + case TrayBackgroundViewCatalogName::kMediaPlayer: + case TrayBackgroundViewCatalogName::kPalette: + case TrayBackgroundViewCatalogName::kPhoneHub: + case TrayBackgroundViewCatalogName::kLogoutButton: + case TrayBackgroundViewCatalogName::kVirtualKeyboardStatusArea: + case TrayBackgroundViewCatalogName::kWmMode: + if (!tray_button->GetVisible()) + continue; + visible_pod_count += 1; + break; + } } if (Shell::Get()->tablet_mode_controller()->InTabletMode()) {
diff --git a/ash/system/tray/status_area_overflow_button_tray.cc b/ash/system/tray/status_area_overflow_button_tray.cc index 6add2314..b476f62 100644 --- a/ash/system/tray/status_area_overflow_button_tray.cc +++ b/ash/system/tray/status_area_overflow_button_tray.cc
@@ -4,6 +4,7 @@ #include "ash/system/tray/status_area_overflow_button_tray.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/public/cpp/shelf_config.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shelf/shelf.h" @@ -91,7 +92,10 @@ } StatusAreaOverflowButtonTray::StatusAreaOverflowButtonTray(Shelf* shelf) - : TrayBackgroundView(shelf), icon_(new IconView()) { + : TrayBackgroundView( + shelf, + TrayBackgroundViewCatalogName::kStatusAreaOverflowButton), + icon_(new IconView()) { tray_container()->AddChildView(icon_); set_use_bounce_in_animation(false); }
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 0db1951..42b3cf0 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <memory> +#include "ash/constants/tray_background_view_catalog.h" #include "ash/focus_cycler.h" #include "ash/login/ui/lock_screen.h" #include "ash/public/cpp/session/session_observer.h" @@ -29,6 +30,8 @@ #include "ash/system/tray/tray_event_filter.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "base/bind.h" +#include "base/functional/callback.h" +#include "base/metrics/histogram_functions.h" #include "base/scoped_multi_source_observation.h" #include "base/time/time.h" #include "ui/accessibility/ax_node_data.h" @@ -215,11 +218,14 @@ //////////////////////////////////////////////////////////////////////////////// // TrayBackgroundView -TrayBackgroundView::TrayBackgroundView(Shelf* shelf, - RoundedCornerBehavior corner_behavior) +TrayBackgroundView::TrayBackgroundView( + Shelf* shelf, + TrayBackgroundViewCatalogName catalog_name, + RoundedCornerBehavior corner_behavior) // Note the ink drop style is ignored. : ActionableView(TrayPopupInkDropStyle::FILL_BOUNDS), shelf_(shelf), + catalog_name_(catalog_name), tray_container_(new TrayContainer(shelf, this)), is_active_(false), separator_visible_(true), @@ -263,6 +269,11 @@ views::View::SetVisible(false); } +void TrayBackgroundView::SetPressedCallback( + base::RepeatingCallback<void(const ui::Event& event)> pressed_callback) { + pressed_callback_ = std::move(pressed_callback); +} + TrayBackgroundView::~TrayBackgroundView() { Shell::Get()->system_tray_model()->virtual_keyboard()->RemoveObserver(this); widget_observer_.reset(); @@ -290,7 +301,12 @@ void TrayBackgroundView::SetVisiblePreferred(bool visible_preferred) { if (visible_preferred_ == visible_preferred) return; + visible_preferred_ = visible_preferred; + base::UmaHistogramEnumeration( + visible_preferred_ ? "Ash.StatusArea.TrayBackgroundView.Shown" + : "Ash.StatusArea.TrayBackgroundView.Hidden", + catalog_name_); StartVisibilityAnimation(GetEffectiveVisibility()); // We need to update which trays overflow after showing or hiding a tray. @@ -763,6 +779,14 @@ } bool TrayBackgroundView::PerformAction(const ui::Event& event) { + base::UmaHistogramEnumeration("Ash.StatusArea.TrayBackgroundView.Pressed", + catalog_name_); + // `pressed_callback_` can be provided to override default press handling. + if (pressed_callback_) { + pressed_callback_.Run(event); + return true; + } + if (GetBubbleWidget()) CloseBubble(); else
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h index 3b6de8e..a4319c5 100644 --- a/ash/system/tray/tray_background_view.h +++ b/ash/system/tray/tray_background_view.h
@@ -8,16 +8,19 @@ #include <memory> #include "ash/ash_export.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/shelf/shelf_background_animator_observer.h" #include "ash/system/model/virtual_keyboard_model.h" #include "ash/system/tray/actionable_view.h" #include "ash/system/tray/tray_bubble_view.h" #include "ash/system/user/login_status.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "ui/gfx/geometry/insets.h" #include "ui/views/context_menu_controller.h" namespace ui { +class Event; enum MenuSourceType; } // namespace ui @@ -51,11 +54,16 @@ }; TrayBackgroundView(Shelf* shelf, + TrayBackgroundViewCatalogName catalog_name, RoundedCornerBehavior corner_behavior = kAllRounded); TrayBackgroundView(const TrayBackgroundView&) = delete; TrayBackgroundView& operator=(const TrayBackgroundView&) = delete; ~TrayBackgroundView() override; + // Overrides default button press handling in `PerformAction()`. + void SetPressedCallback( + base::RepeatingCallback<void(const ui::Event& event)> pressed_callback); + // Called after the tray has been added to the widget containing it. virtual void Initialize(); @@ -143,6 +151,7 @@ TrayContainer* tray_container() const { return tray_container_; } TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); } Shelf* shelf() { return shelf_; } + TrayBackgroundViewCatalogName catalog_name() const { return catalog_name_; } // Updates the visibility of this tray's separator. void set_separator_visibility(bool visible) { separator_visible_ = visible; } @@ -274,6 +283,9 @@ // The shelf containing the system tray for this view. Shelf* shelf_; + // The catalog name, used to record metrics on feature integrations. + TrayBackgroundViewCatalogName catalog_name_; + // Convenience pointer to the contents view. TrayContainer* tray_container_; @@ -306,6 +318,9 @@ // Defaults to `kAllRounded`. RoundedCornerBehavior corner_behavior_; + // Called instead of the default `PerformAction()`. + base::RepeatingCallback<void(const ui::Event& event)> pressed_callback_; + std::unique_ptr<TrayWidgetObserver> widget_observer_; std::unique_ptr<TrayEventFilter> tray_event_filter_; std::unique_ptr<TrayBackgroundViewSessionChangeHandler> handler_;
diff --git a/ash/system/tray/tray_background_view_unittest.cc b/ash/system/tray/tray_background_view_unittest.cc index 5bdbdf6..d94ff39 100644 --- a/ash/system/tray/tray_background_view_unittest.cc +++ b/ash/system/tray/tray_background_view_unittest.cc
@@ -15,6 +15,7 @@ #include "ash/system/status_area_widget_test_helper.h" #include "ash/system/tray/tray_bubble_wrapper.h" #include "ash/test/ash_test_base.h" +#include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "components/user_manager/user_manager.h" #include "ui/base/models/simple_menu_model.h" @@ -23,35 +24,40 @@ namespace ash { -class TrayBackgroundViewTestView : public TrayBackgroundView, - public ui::SimpleMenuModel::Delegate { +class TestTrayBackgroundView : public TrayBackgroundView, + public ui::SimpleMenuModel::Delegate { public: - explicit TrayBackgroundViewTestView(Shelf* shelf) - : TrayBackgroundView(shelf), provide_menu_model_(false) {} + explicit TestTrayBackgroundView(Shelf* shelf) + : TrayBackgroundView(shelf, + TrayBackgroundViewCatalogName::kTestCatalogName) {} - TrayBackgroundViewTestView(const TrayBackgroundViewTestView&) = delete; - TrayBackgroundViewTestView& operator=(const TrayBackgroundViewTestView&) = - delete; + TestTrayBackgroundView(const TestTrayBackgroundView&) = delete; + TestTrayBackgroundView& operator=(const TestTrayBackgroundView&) = delete; - ~TrayBackgroundViewTestView() override = default; + ~TestTrayBackgroundView() override = default; // TrayBackgroundView: void ClickedOutsideBubble() override {} std::u16string GetAccessibleNameForTray() override { - return u"TrayBackgroundViewTestView"; + return u"TestTrayBackgroundView"; } + void HandleLocaleChange() override {} + void HideBubbleWithView(const TrayBubbleView* bubble_view) override {} std::unique_ptr<ui::SimpleMenuModel> CreateContextMenuModel() override { return provide_menu_model_ ? std::make_unique<ui::SimpleMenuModel>(this) : nullptr; } + void OnAnyBubbleVisibilityChanged(views::Widget* bubble_widget, bool visible) override { on_bubble_visibility_change_captured_widget_ = bubble_widget; on_bubble_visibility_change_captured_visibility_ = visible; } + void ShowBubble() override { show_bubble_called_ = true; } + // ui::SimpleMenuModel::Delegate: void ExecuteCommand(int command_id, int event_flags) override {} @@ -63,11 +69,14 @@ SetContextMenuEnabled(should_show_menu); } + bool show_bubble_called() const { return show_bubble_called_; } + views::Widget* on_bubble_visibility_change_captured_widget_ = nullptr; bool on_bubble_visibility_change_captured_visibility_ = false; private: - bool provide_menu_model_; + bool provide_menu_model_ = false; + bool show_bubble_called_ = false; }; class TrayBackgroundViewTest : public AshTestBase { @@ -83,17 +92,17 @@ void SetUp() override { AshTestBase::SetUp(); - // Adds this `test_view_` to the mock `StatusAreaWidget`. We need to - // remove the layout manager from the delegate before adding a new + // Adds this `test_tray_background_view_` to the mock `StatusAreaWidget`. We + // need to remove the layout manager from the delegate before adding a new // child, since there's a DCHECK in the `GridLayout` to assert no more // children can be added. // Can't use std::make_unique() here, because we need base class type for // template method to link successfully without adding test code to // status_area_widget.cc. - test_view_ = static_cast<TrayBackgroundViewTestView*>( + test_tray_background_view_ = static_cast<TestTrayBackgroundView*>( StatusAreaWidgetTestHelper::GetStatusAreaWidget()->AddTrayButton( std::unique_ptr<TrayBackgroundView>( - new TrayBackgroundViewTestView(GetPrimaryShelf())))); + new TestTrayBackgroundView(GetPrimaryShelf())))); // Set Dictation button to be visible. AccessibilityControllerImpl* controller = @@ -101,7 +110,9 @@ controller->dictation().SetEnabled(true); } - TrayBackgroundViewTestView* test_view() const { return test_view_; } + TestTrayBackgroundView* test_tray_background_view() const { + return test_tray_background_view_; + } protected: // Here we use dictation tray for testing secondary screen. @@ -124,7 +135,7 @@ } private: - TrayBackgroundViewTestView* test_view_ = nullptr; + TestTrayBackgroundView* test_tray_background_view_ = nullptr; }; TEST_F(TrayBackgroundViewTest, ShowingAnimationAbortedByHideAnimation) { @@ -132,26 +143,31 @@ ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); // Starts showing up animation. - test_view()->SetVisiblePreferred(true); - EXPECT_TRUE(test_view()->GetVisible()); - EXPECT_TRUE(test_view()->layer()->GetTargetVisibility()); - EXPECT_TRUE(test_view()->layer()->GetAnimator()->is_animating()); + test_tray_background_view()->SetVisiblePreferred(true); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); + EXPECT_TRUE(test_tray_background_view()->layer()->GetTargetVisibility()); + EXPECT_TRUE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); // Starts hide animation. The view is visible but the layer's target // visibility is false. - test_view()->SetVisiblePreferred(false); - EXPECT_TRUE(test_view()->GetVisible()); - EXPECT_FALSE(test_view()->layer()->GetTargetVisibility()); - EXPECT_TRUE(test_view()->layer()->GetAnimator()->is_animating()); + test_tray_background_view()->SetVisiblePreferred(false); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); + EXPECT_FALSE(test_tray_background_view()->layer()->GetTargetVisibility()); + EXPECT_TRUE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); // Here we wait until the animation is finished and we give it one more second // to finish the callbacks in `OnVisibilityAnimationFinished()`. - StatusAreaWidgetTestHelper::WaitForLayerAnimationEnd(test_view()->layer()); + StatusAreaWidgetTestHelper::WaitForLayerAnimationEnd( + test_tray_background_view()->layer()); task_environment()->FastForwardBy(base::Seconds(1)); - // After the hide animation is finished, test_view() is not visible. - EXPECT_FALSE(test_view()->GetVisible()); - EXPECT_FALSE(test_view()->layer()->GetAnimator()->is_animating()); + // After the hide animation is finished, test_tray_background_view() is not + // visible. + EXPECT_FALSE(test_tray_background_view()->GetVisible()); + EXPECT_FALSE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); } TEST_F(TrayBackgroundViewTest, HandleSessionChange) { @@ -166,55 +182,62 @@ // finish when this duration ends. The same for the other places below. task_environment()->FastForwardBy(base::Milliseconds(20)); - test_view()->SetVisiblePreferred(false); - test_view()->SetVisiblePreferred(true); + test_tray_background_view()->SetVisiblePreferred(false); + test_tray_background_view()->SetVisiblePreferred(true); task_environment()->FastForwardBy(base::Milliseconds(20)); - EXPECT_TRUE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + EXPECT_TRUE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); GetSessionControllerClient()->SetSessionState( session_manager::SessionState::ACTIVE); task_environment()->FastForwardBy(base::Milliseconds(20)); - EXPECT_FALSE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + EXPECT_FALSE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); // Enable the animation after session state get changed. task_environment()->FastForwardBy(base::Milliseconds(20)); - test_view()->SetVisiblePreferred(false); - test_view()->SetVisiblePreferred(true); + test_tray_background_view()->SetVisiblePreferred(false); + test_tray_background_view()->SetVisiblePreferred(true); task_environment()->FastForwardBy(base::Milliseconds(20)); - EXPECT_TRUE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + EXPECT_TRUE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); // Not showing animation after unlocking screen. GetSessionControllerClient()->SetSessionState( session_manager::SessionState::LOCKED); task_environment()->FastForwardBy(base::Milliseconds(20)); - test_view()->SetVisiblePreferred(false); - test_view()->SetVisiblePreferred(true); + test_tray_background_view()->SetVisiblePreferred(false); + test_tray_background_view()->SetVisiblePreferred(true); task_environment()->FastForwardBy(base::Milliseconds(20)); - EXPECT_TRUE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + EXPECT_TRUE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); GetSessionControllerClient()->SetSessionState( session_manager::SessionState::ACTIVE); task_environment()->FastForwardBy(base::Milliseconds(20)); - EXPECT_FALSE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + EXPECT_FALSE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); // Not showing animation when switching users. GetSessionControllerClient()->AddUserSession("a"); - test_view()->SetVisiblePreferred(false); - test_view()->SetVisiblePreferred(true); - EXPECT_TRUE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + test_tray_background_view()->SetVisiblePreferred(false); + test_tray_background_view()->SetVisiblePreferred(true); + EXPECT_TRUE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); // Simulates user switching by changing the order of session_ids. Shell::Get()->session_controller()->SetUserSessionOrder({2u, 1u}); task_environment()->FastForwardBy(base::Milliseconds(20)); - EXPECT_FALSE(test_view()->layer()->GetAnimator()->is_animating()); - EXPECT_TRUE(test_view()->GetVisible()); + EXPECT_FALSE( + test_tray_background_view()->layer()->GetAnimator()->is_animating()); + EXPECT_TRUE(test_tray_background_view()->GetVisible()); } // TODO(crbug.com/1314693): Flaky. @@ -262,33 +285,34 @@ // Tests that a context menu only appears when a tray provides a menu model and // the tray should show a context menu. TEST_F(TrayBackgroundViewTest, ContextMenu) { - test_view()->SetVisiblePreferred(true); + test_tray_background_view()->SetVisiblePreferred(true); ui::test::EventGenerator* generator = GetEventGenerator(); - generator->MoveMouseTo(test_view()->GetBoundsInScreen().CenterPoint()); - EXPECT_FALSE(test_view()->IsShowingMenu()); + generator->MoveMouseTo( + test_tray_background_view()->GetBoundsInScreen().CenterPoint()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); // The tray should not display a context menu, and no model is provided, so // no menu should appear. generator->ClickRightButton(); - EXPECT_FALSE(test_view()->IsShowingMenu()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); // The tray should display a context menu, but no model is provided, so no // menu should appear. - test_view()->SetShouldShowMenu(true); + test_tray_background_view()->SetShouldShowMenu(true); generator->ClickRightButton(); - EXPECT_FALSE(test_view()->IsShowingMenu()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); // The tray should display a context menu, and a model is provided, so a menu // should appear. - test_view()->set_provide_menu_model(true); + test_tray_background_view()->set_provide_menu_model(true); generator->ClickRightButton(); - EXPECT_TRUE(test_view()->IsShowingMenu()); + EXPECT_TRUE(test_tray_background_view()->IsShowingMenu()); // The tray should not display a context menu, so even though a model is // provided, no menu should appear. - test_view()->SetShouldShowMenu(false); + test_tray_background_view()->SetShouldShowMenu(false); generator->ClickRightButton(); - EXPECT_FALSE(test_view()->IsShowingMenu()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); } // Tests the auto-hide shelf status when opening and closing a context menu. @@ -297,7 +321,7 @@ std::unique_ptr<views::Widget> unused = CreateTestWidget(); // Set the shelf to auto-hide. - Shelf* shelf = test_view()->shelf(); + Shelf* shelf = test_tray_background_view()->shelf(); EXPECT_TRUE(shelf); shelf->SetAutoHideBehavior(ShelfAutoHideBehavior::kAlways); ShelfLayoutManager* layout_manager = shelf->shelf_layout_manager(); @@ -315,25 +339,26 @@ EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); // Open tray context menu. - test_view()->SetVisiblePreferred(true); - test_view()->set_provide_menu_model(true); - test_view()->SetShouldShowMenu(true); - generator->MoveMouseTo(test_view()->GetBoundsInScreen().CenterPoint()); + test_tray_background_view()->SetVisiblePreferred(true); + test_tray_background_view()->set_provide_menu_model(true); + test_tray_background_view()->SetShouldShowMenu(true); + generator->MoveMouseTo( + test_tray_background_view()->GetBoundsInScreen().CenterPoint()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); - EXPECT_FALSE(test_view()->IsShowingMenu()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); generator->ClickRightButton(); - EXPECT_TRUE(test_view()->IsShowingMenu()); + EXPECT_TRUE(test_tray_background_view()->IsShowingMenu()); // Close the context menu with the mouse over the shelf. The shelf should // remain shown. generator->ClickRightButton(); ASSERT_FALSE(TriggerAutoHideTimeout(layout_manager)); - EXPECT_FALSE(test_view()->IsShowingMenu()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState()); // Reopen tray context menu. generator->ClickRightButton(); - EXPECT_TRUE(test_view()->IsShowingMenu()); + EXPECT_TRUE(test_tray_background_view()->IsShowingMenu()); // Mouse away from the shelf with the context menu still showing. The shelf // should remain shown. @@ -345,7 +370,7 @@ // should hide. generator->ClickRightButton(); ASSERT_FALSE(TriggerAutoHideTimeout(layout_manager)); - EXPECT_FALSE(test_view()->IsShowingMenu()); + EXPECT_FALSE(test_tray_background_view()->IsShowingMenu()); EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState()); } @@ -355,10 +380,10 @@ ui::ScopedAnimationDurationScaleMode test_duration_mode( ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION); - test_view()->SetVisiblePreferred(true); + test_tray_background_view()->SetVisiblePreferred(true); TrayBubbleView::InitParams init_params; - init_params.delegate = test_view()->GetWeakPtr(); + init_params.delegate = test_tray_background_view()->GetWeakPtr(); init_params.parent_window = Shell::GetContainer(Shell::GetPrimaryRootWindow(), kShellWindowId_AccessibilityBubbleContainer); @@ -366,17 +391,93 @@ init_params.preferred_width = 200; auto bubble_view = std::make_unique<TrayBubbleView>(init_params); bubble_view->SetCanActivate(true); - auto bubble_ = - std::make_unique<TrayBubbleWrapper>(test_view(), bubble_view.release(), - /*event_handling=*/false); + auto bubble_ = std::make_unique<TrayBubbleWrapper>( + test_tray_background_view(), bubble_view.release(), + /*event_handling=*/false); bubble_->GetBubbleWidget()->Show(); bubble_->GetBubbleWidget()->Activate(); bubble_->bubble_view()->SetVisible(true); EXPECT_EQ(bubble_->GetBubbleWidget(), - test_view()->on_bubble_visibility_change_captured_widget_); - EXPECT_TRUE(test_view()->on_bubble_visibility_change_captured_visibility_); + test_tray_background_view() + ->on_bubble_visibility_change_captured_widget_); + EXPECT_TRUE(test_tray_background_view() + ->on_bubble_visibility_change_captured_visibility_); +} + +// Tests the default behavior of the button press with no callback set. +TEST_F(TrayBackgroundViewTest, NoPressedCallbackSet) { + test_tray_background_view()->SetVisible(true); + ui::test::EventGenerator* generator = GetEventGenerator(); + generator->MoveMouseTo( + test_tray_background_view()->GetBoundsInScreen().CenterPoint()); + + generator->ClickLeftButton(); + + EXPECT_TRUE(test_tray_background_view()->show_bubble_called()); +} + +// Tests that histograms are recorded when no callback is set, and the button is +// pressed. +TEST_F(TrayBackgroundViewTest, HistogramRecordedNoPressedCallbackSet) { + auto histogram_tester = std::make_unique<base::HistogramTester>(); + histogram_tester->ExpectTotalCount( + "Ash.StatusArea.TrayBackgroundView.Pressed", + /*count=*/0); + + test_tray_background_view()->SetVisible(true); + ui::test::EventGenerator* generator = GetEventGenerator(); + generator->MoveMouseTo( + test_tray_background_view()->GetBoundsInScreen().CenterPoint()); + + generator->ClickLeftButton(); + + histogram_tester->ExpectTotalCount( + "Ash.StatusArea.TrayBackgroundView.Pressed", + /*count=*/1); +} + +// Tests that `TrayBackgroundView::SetPressedCallback()` overrides +// TrayBackgroundView's default press behavior. +TEST_F(TrayBackgroundViewTest, PressedCallbackSet) { + test_tray_background_view()->SetVisible(true); + ui::test::EventGenerator* generator = GetEventGenerator(); + generator->MoveMouseTo( + test_tray_background_view()->GetBoundsInScreen().CenterPoint()); + + // Set the callback. Pressing the `TestTrayBackgroundView` should execute the + // callback instead of `TrayBackgroundView::ShowBubble()`. + bool pressed = false; + test_tray_background_view()->SetPressedCallback(base::BindRepeating( + [](bool& pressed, const ui::Event& event) { pressed = true; }, + std::ref(pressed))); + generator->ClickLeftButton(); + + EXPECT_TRUE(pressed); + EXPECT_FALSE(test_tray_background_view()->show_bubble_called()); +} + +// Tests that histograms are still recorded when the TrayBackgroundView has +// custom button press behavior. +TEST_F(TrayBackgroundViewTest, HistogramRecordedPressedCallbackSet) { + auto histogram_tester = std::make_unique<base::HistogramTester>(); + histogram_tester->ExpectTotalCount( + "Ash.StatusArea.TrayBackgroundView.Pressed", + /*count=*/0); + + test_tray_background_view()->SetVisible(true); + ui::test::EventGenerator* generator = GetEventGenerator(); + generator->MoveMouseTo( + test_tray_background_view()->GetBoundsInScreen().CenterPoint()); + + // Set the callback. This should not effect histogram recording. + test_tray_background_view()->SetPressedCallback(base::DoNothing()); + generator->ClickLeftButton(); + + histogram_tester->ExpectTotalCount( + "Ash.StatusArea.TrayBackgroundView.Pressed", + /*count=*/1); } } // namespace ash
diff --git a/ash/system/unified/date_tray.cc b/ash/system/unified/date_tray.cc index 8769d7a..820ac29 100644 --- a/ash/system/unified/date_tray.cc +++ b/ash/system/unified/date_tray.cc
@@ -4,6 +4,7 @@ #include "ash/system/unified/date_tray.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" #include "ash/system/model/clock_model.h" @@ -21,7 +22,9 @@ namespace ash { DateTray::DateTray(Shelf* shelf, UnifiedSystemTray* tray) - : TrayBackgroundView(shelf, TrayBackgroundView::kStartRounded), + : TrayBackgroundView(shelf, + TrayBackgroundViewCatalogName::kDateTray, + TrayBackgroundView::kStartRounded), time_view_(tray_container()->AddChildView( std::make_unique<TimeTrayItemView>(shelf, TimeView::Type::kDate))), unified_system_tray_(tray) {
diff --git a/ash/system/unified/unified_system_tray.cc b/ash/system/unified/unified_system_tray.cc index 7108a05..ba0989ec 100644 --- a/ash/system/unified/unified_system_tray.cc +++ b/ash/system/unified/unified_system_tray.cc
@@ -6,6 +6,7 @@ #include "ash/accessibility/accessibility_controller_impl.h" #include "ash/constants/ash_features.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/focus_cycler.h" #include "ash/session/session_controller_impl.h" #include "ash/shelf/shelf.h" @@ -174,6 +175,7 @@ UnifiedSystemTray::UnifiedSystemTray(Shelf* shelf) : TrayBackgroundView( shelf, + TrayBackgroundViewCatalogName::kUnifiedSystem, (features::IsCalendarViewEnabled() ? kEndRounded : kAllRounded)), ui_delegate_(std::make_unique<UiDelegate>(this)), model_(base::MakeRefCounted<UnifiedSystemTrayModel>(shelf)),
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc index 680af85..9787d931 100644 --- a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include "ash/accessibility/accessibility_controller_impl.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -38,8 +39,12 @@ } // namespace -VirtualKeyboardTray::VirtualKeyboardTray(Shelf* shelf) - : TrayBackgroundView(shelf), icon_(new views::ImageView), shelf_(shelf) { +VirtualKeyboardTray::VirtualKeyboardTray( + Shelf* shelf, + TrayBackgroundViewCatalogName catalog_name) + : TrayBackgroundView(shelf, catalog_name), + icon_(new views::ImageView), + shelf_(shelf) { const gfx::ImageSkia image = GetIconImage(); icon_->SetTooltipText(l10n_util::GetStringUTF16( IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD));
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/virtual_keyboard/virtual_keyboard_tray.h index b31ce63..78e55db 100644 --- a/ash/system/virtual_keyboard/virtual_keyboard_tray.h +++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.h
@@ -6,6 +6,7 @@ #define ASH_SYSTEM_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ #include "ash/accessibility/accessibility_observer.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/public/cpp/keyboard/keyboard_controller_observer.h" #include "ash/public/cpp/session/session_observer.h" #include "ash/shell_observer.h" @@ -24,7 +25,7 @@ public ShellObserver, public SessionObserver { public: - explicit VirtualKeyboardTray(Shelf* shelf); + VirtualKeyboardTray(Shelf* shelf, TrayBackgroundViewCatalogName catalog_name); VirtualKeyboardTray(const VirtualKeyboardTray&) = delete; VirtualKeyboardTray& operator=(const VirtualKeyboardTray&) = delete;
diff --git a/ash/webui/common/resources/focus_row_behavior.d.ts b/ash/webui/common/resources/focus_row_behavior.d.ts index 0637512..6502cb9 100644 --- a/ash/webui/common/resources/focus_row_behavior.d.ts +++ b/ash/webui/common/resources/focus_row_behavior.d.ts
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {FocusRow} from 'chrome://resources/js/cr/ui/focus_row.js'; +import {FocusRow} from 'chrome://resources/js/focus_row.js'; export interface FocusRowBehavior { id: string|null|undefined;
diff --git a/ash/webui/os_feedback_ui/resources/BUILD.gn b/ash/webui/os_feedback_ui/resources/BUILD.gn index 03ebe42d..4a19ce5 100644 --- a/ash/webui/os_feedback_ui/resources/BUILD.gn +++ b/ash/webui/os_feedback_ui/resources/BUILD.gn
@@ -50,6 +50,7 @@ "feedback_types.js", "index.html", "mojo_interface_provider.js", + "questionnaire.js", ] input_files_base_dir = rebase_path(".", "//") deps = [ @@ -164,6 +165,7 @@ js_library("search_page") { deps = [ ":feedback_flow", + ":feedback_types", ":help_content", ":mojo_interface_provider", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
diff --git a/ash/webui/os_feedback_ui/resources/feedback_flow.html b/ash/webui/os_feedback_ui/resources/feedback_flow.html index 5d07c1c..3f606c6f 100644 --- a/ash/webui/os_feedback_ui/resources/feedback_flow.html +++ b/ash/webui/os_feedback_ui/resources/feedback_flow.html
@@ -1,6 +1,7 @@ <div> <iron-pages attr-for-selected="id" selected="[[currentState_]]"> <search-page id="searchPage" on-continue-click="handleContinueClick_" + feedback-context="[[feedbackContext_]]" description-template="[[descriptionTemplate_]]" help-content-search-result-count="{{helpContentSearchResultCount_}}" no-help-content-displayed="{{noHelpContentDisplayed_}}">
diff --git a/ash/webui/os_feedback_ui/resources/feedback_flow.js b/ash/webui/os_feedback_ui/resources/feedback_flow.js index 6fc3b7e..f573b04c 100644 --- a/ash/webui/os_feedback_ui/resources/feedback_flow.js +++ b/ash/webui/os_feedback_ui/resources/feedback_flow.js
@@ -80,7 +80,7 @@ * @type {!RegExp} * @protected */ -const btRegEx = new RegExp( +export const btRegEx = new RegExp( 'blu[e]?[ ]?toot[h]?|\\bb[ ]?t\\b|\\bble\\b|\\bfloss\\b|\\bbluez\\b', 'i'); /**
diff --git a/ash/webui/os_feedback_ui/resources/questionnaire.js b/ash/webui/os_feedback_ui/resources/questionnaire.js new file mode 100644 index 0000000..bddfe74 --- /dev/null +++ b/ash/webui/os_feedback_ui/resources/questionnaire.js
@@ -0,0 +1,83 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +export const questionnaireBegin = '(Google Internal) To help us diagnose and ' + + 'fix the issue, please answer the following questions:'; + +const questionGeneralTimestamp = + '[General] When did this happen? Please mention the exact time ' + + '(for example: 2:45pm). '; + +const questionGeneralRegression = + '[General] Do you know if this issue is a regression? ' + + 'If so, in which Chrome OS version did this issue start appearing? '; + +const questionGeneralReproducibility = + '[General] Does this always happen during a particular activity? ' + + 'Does it happen randomly? If so, how often? ' + + 'Please describe the steps to reproduce this problem. '; + +const questionBluetoothPeripheral = + '[Bluetooth] What is the brand and model of your Bluetooth peripheral ' + + '(such as headset or mouse) you had an issue with? '; + +const questionBluetoothOtherDevices = '[Bluetooth] Do other computer devices ' + + '(such as non-Chrome OS devices or other Chromebooks) ' + + 'work well with this Bluetooth peripheral (such as headset or mouse)? '; + +const questionWifiTypeOfIssue = '[WiFi] What type of issue is this? ' + + 'Please select one or more from the below: \n' + + ' * Failure to connect to Wi-Fi \n' + + ' * Internet connectivity \n' + + ' * Intermittently disconnects \n' + + ' * Constantly slow Wi-Fi \n' + + ' * Intermittently slow Wi-Fi'; + +const questionWifiConnectedButNotInternet = + '[WiFi] Does your computer show that Wi-Fi is connected? ' + + 'If so, is your internet still not working? '; + +const questionWifiNetworkWorkingBefore = + '[WiFi] Has this device been able to connect ' + + 'to this Wi-Fi network before? '; + +const questionWifiOtherDevices = '[WiFi] Do other computer devices ' + + '(such as non-Chrome OS devices or other Chromebooks) ' + + 'have the same issue using the same Wi-Fi network? ' + + 'If so, please specify the device type. '; + +const questionCellularSim = '[Cellular] Who is your SIM card carrier? ' + + 'For example: Verizon, T-Mobile, AT&T. '; + +const questionCellularLastSuccess = + '[Cellular] Have you been able to use this SIM card previously ' + + 'on this Chrome OS device? '; + +const questionCellularRoaming = + '[Cellular] Are you currently roaming internationally?'; + +const questionCellularAPN = + '[Cellular] Did you manually configure the Access Point Name (APN)?'; + +export const domainQuestions = { + 'bluetooth': [ + questionGeneralTimestamp, + questionGeneralRegression, + questionGeneralReproducibility, + questionBluetoothPeripheral, + questionBluetoothOtherDevices, + ], + 'wifi': [ + questionWifiTypeOfIssue, + questionWifiConnectedButNotInternet, + questionWifiNetworkWorkingBefore, + questionWifiOtherDevices, + ], + 'cellular': [ + questionCellularSim, + questionCellularLastSuccess, + questionCellularRoaming, + questionCellularAPN, + ], +}; \ No newline at end of file
diff --git a/ash/webui/os_feedback_ui/resources/search_page.js b/ash/webui/os_feedback_ui/resources/search_page.js index 8133160..368ce92 100644 --- a/ash/webui/os_feedback_ui/resources/search_page.js +++ b/ash/webui/os_feedback_ui/resources/search_page.js
@@ -11,9 +11,10 @@ import {I18nBehavior, I18nBehaviorInterface} from 'chrome://resources/cr_elements/i18n_behavior.js'; import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; -import {FeedbackFlowState} from './feedback_flow.js'; -import {HelpContentList, HelpContentProviderInterface, SearchRequest, SearchResponse, SearchResult} from './feedback_types.js'; +import {btRegEx, buildWordMatcher, FeedbackFlowState} from './feedback_flow.js'; +import {FeedbackContext, HelpContentList, HelpContentProviderInterface, SearchRequest, SearchResponse, SearchResult} from './feedback_types.js'; import {getHelpContentProvider} from './mojo_interface_provider.js'; +import {domainQuestions, questionnaireBegin} from './questionnaire.js'; /** * The minimum number of characters added or deleted to start a new search for @@ -35,6 +36,22 @@ export const OS_FEEDBACK_UNTRUSTED_ORIGIN = 'chrome-untrusted://os-feedback'; /** + * Regular expression to check for wifi-related keywords. + */ +const wifiRegEx = + buildWordMatcher(['wifi', 'wi-fi', 'internet', 'network', 'hotspot']); + +/** + * Regular expression to check for cellular-related keywords. + */ +const cellularRegEx = buildWordMatcher([ + '2G', '3G', '4G', '5G', 'LTE', 'UMTS', + 'SIM', 'eSIM', 'mmWave', 'mobile', 'APN', 'IMEI', + 'IMSI', 'eUICC', 'carrier', 'T.Mobile', 'TMO', 'Verizon', + 'VZW', 'AT&T', 'MVNO', 'pin.lock', 'cellular', +]); + +/** * @fileoverview * 'search-page' is the first step of the feedback tool. It displays live help * contents relevant to the text entered by the user. @@ -59,6 +76,7 @@ static get properties() { return { + feedbackContext: {type: FeedbackContext, readOnly: false, notify: true}, descriptionTemplate: { type: String, readonly: true, @@ -78,6 +96,11 @@ constructor() { super(); + /** + * @type {!FeedbackContext} + */ + this.feedbackContext; + /** @type {string} */ this.descriptionTemplate = ''; @@ -123,6 +146,13 @@ * @private {!HelpContentList|undefined} */ this.popularHelpContentList_; + + /** + * The list of questionnaire questions that have already been appended to + * the input text. + * @private {Array<string>} + */ + this.appendedQuestions = []; } ready() { @@ -132,6 +162,10 @@ this.shadowRoot.querySelector('iframe')); // Fetch popular help contents with empty query. this.fetchHelpContent_(/* query= */ ''); + + this.shadowRoot.querySelector('#descriptionText') + .addEventListener( + 'input', (event) => this.checkForShowQuestionnaire_(event)); } /** @@ -330,6 +364,65 @@ getSearchResultCountForTesting() { return this.helpContentSearchResultCount; } + + /** + * Checks if any keywords have associated questionnaire in a domain. If so, + * we append the questionnaire to the text input box. + * @param inputEvent The input event for the description textarea. + * @private + */ + checkForShowQuestionnaire_(inputEvent) { + if (!this.feedbackContext.isInternalAccount) { + return; + } + + const toAppend = []; + + // Match user-entered description before the questionnaire to reduce false + // positives due to matching the questionnaire questions and answers. + const value = inputEvent.target.value; + const questionnaireBeginPos = value.indexOf(questionnaireBegin); + const matchedText = questionnaireBeginPos >= 0 ? + value.substring(0, questionnaireBeginPos) : + value; + + if (btRegEx.test(matchedText)) { + toAppend.push(...domainQuestions['bluetooth']); + } + + + if (wifiRegEx.test(matchedText)) { + toAppend.push(...domainQuestions['wifi']); + } + + if (cellularRegEx.test(matchedText)) { + toAppend.push(...domainQuestions['cellular']); + } + + if (toAppend.length === 0) { + return; + } + + const textarea = this.shadowRoot.querySelector('#descriptionText'); + const savedCursor = textarea.selectionStart; + if (this.appendedQuestions.length === 0) { + textarea.value += '\n\n' + questionnaireBegin + '\n'; + } + + for (const question of toAppend) { + if (question in this.appendedQuestions) { + continue; + } + + textarea.value += '* ' + question + ' \n'; + this.appendedQuestions.push(question); + } + + // After appending text, the web engine automatically moves the cursor to + // the end of the appended text, so we need to move the cursor back to where + // the user was typing before. + textarea.selectionEnd = savedCursor; + } } customElements.define(SearchPageElement.is, SearchPageElement);
diff --git a/ash/webui/print_management/resources/print_job_entry.ts b/ash/webui/print_management/resources/print_job_entry.ts index 48b694b..3b1e010 100644 --- a/ash/webui/print_management/resources/print_job_entry.ts +++ b/ash/webui/print_management/resources/print_job_entry.ts
@@ -14,7 +14,7 @@ import './strings.m.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {String16} from 'chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-webui.js';
diff --git a/ash/wm/cursor_manager_chromeos.cc b/ash/wm/cursor_manager_chromeos.cc index 4941b922..dc490eb 100644 --- a/ash/wm/cursor_manager_chromeos.cc +++ b/ash/wm/cursor_manager_chromeos.cc
@@ -9,10 +9,14 @@ #include "ash/constants/ash_switches.h" #include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/keyboard/ui/keyboard_util.h" +#include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" #include "base/command_line.h" #include "ui/aura/env.h" +#include "ui/base/cursor/cursor.h" +#include "ui/base/cursor/cursor_factory.h" #include "ui/events/event.h" +#include "ui/gfx/paint_vector_icon.h" #include "ui/wm/core/cursor_manager.h" #include "ui/wm/core/native_cursor_manager.h" @@ -26,8 +30,19 @@ void CursorManager::Init() { if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kForceShowCursor)) { - // TODO(sammiequon): Set a custom cursor. - SetCursor(ui::mojom::CursorType::kPointer); + // Set a custom cursor so users know that the switch is turned on. + gfx::NativeCursor cursor(ui::mojom::CursorType::kCustom); + const gfx::ImageSkia custom_icon = + gfx::CreateVectorIcon(kTouchIndicatorIcon, SK_ColorBLACK); + SkBitmap bitmap = *custom_icon.bitmap(); + gfx::Point hotspot(bitmap.width() / 2, bitmap.height() / 2); + auto* cursor_factory = ui::CursorFactory::GetInstance(); + cursor.SetPlatformCursor( + cursor_factory->CreateImageCursor(cursor.type(), bitmap, hotspot)); + cursor.set_custom_bitmap(bitmap); + cursor.set_custom_hotspot(hotspot); + + SetCursor(cursor); LockCursor(); return; }
diff --git a/ash/wm/desks/desks_histogram_enums.h b/ash/wm/desks/desks_histogram_enums.h index d50c9149..6f6632a4 100644 --- a/ash/wm/desks/desks_histogram_enums.h +++ b/ash/wm/desks/desks_histogram_enums.h
@@ -48,7 +48,8 @@ kLaunchTemplate = 8, kIndexedDeskSwitchShortcut = 9, kRemovalUndone = 10, - kMaxValue = kRemovalUndone, + kApi = 11, + kMaxValue = kApi, }; } // namespace ash
diff --git a/ash/wm/desks/desks_unittests.cc b/ash/wm/desks/desks_unittests.cc index 52888f84..4dd74d1 100644 --- a/ash/wm/desks/desks_unittests.cc +++ b/ash/wm/desks/desks_unittests.cc
@@ -4713,7 +4713,8 @@ // Click the center of the overview grid. This should not close overview mode // and should remove focus from the focused `desk_name_view`. auto* event_generator = GetEventGenerator(); - event_generator->MoveMouseTo(overview_grid->bounds().CenterPoint()); + event_generator->MoveMouseTo( + overview_grid->bounds_for_testing().CenterPoint()); event_generator->ClickLeftButton(); EXPECT_FALSE(desk_name_view->HasFocus()); EXPECT_TRUE(overview_controller->InOverviewSession());
diff --git a/ash/wm/float/float_controller.cc b/ash/wm/float/float_controller.cc index d02c043..0a06fc96 100644 --- a/ash/wm/float/float_controller.cc +++ b/ash/wm/float/float_controller.cc
@@ -11,38 +11,47 @@ #include "ash/constants/ash_features.h" #include "ash/display/screen_orientation_controller.h" #include "ash/public/cpp/shell_window_ids.h" +#include "ash/public/cpp/style/color_provider.h" #include "ash/public/cpp/window_properties.h" +#include "ash/resources/vector_icons/vector_icons.h" #include "ash/scoped_animation_disabler.h" #include "ash/shell.h" #include "ash/style/ash_color_id.h" +#include "ash/style/color_util.h" +#include "ash/style/dark_light_mode_controller_impl.h" #include "ash/wm/desks/desk.h" #include "ash/wm/desks/desks_util.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/splitview/split_view_constants.h" -#include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "ash/wm/tablet_mode/tablet_mode_window_state.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" #include "ash/wm/work_area_insets.h" #include "ash/wm/workspace/workspace_event_handler.h" #include "base/check_op.h" +#include "base/functional/callback_forward.h" #include "chromeos/ui/base/display_util.h" #include "chromeos/ui/base/window_properties.h" #include "chromeos/ui/wm/constants.h" #include "chromeos/ui/wm/window_util.h" #include "ui/aura/window_delegate.h" +#include "ui/compositor/layer.h" #include "ui/display/screen.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rounded_corners_f.h" +#include "ui/gfx/paint_vector_icon.h" #include "ui/views/background.h" -#include "ui/views/controls/button/button.h" +#include "ui/views/controls/button/image_button.h" #include "ui/views/widget/unique_widget_ptr.h" #include "ui/wm/core/window_util.h" namespace ash { namespace { -constexpr int kTuckHandleWidth = 20; -constexpr int kTuckHandleHeight = 116; +constexpr float kTuckHandleCornerRadius = 12; +constexpr int kTuckHandleIconSize = 16; +constexpr int kTuckHandleWidth = 24; +constexpr int kTuckHandleHeight = 100; // Disables the window's position auto management and returns its original // value. @@ -86,30 +95,37 @@ } // namespace -// The handle that allows users to bring tucked windows back onscreen. -class FloatController::TuckHandle : public views::Button { +// ----------------------------------------------------------------------------- +// FloatController::TuckHandle: + +// Represents a tuck handle that untucks floated windows from offscreen. +class FloatController::TuckHandle : public views::ImageButton { public: - explicit TuckHandle(aura::Window* window) - : views::Button(base::BindRepeating(&TuckHandle::OnButtonPressed, - base::Unretained(this))), - window_(window) { - // TODO(sophiewen): Update with UI specs. - SetBackground(views::CreateSolidBackground(SK_ColorRED)); + TuckHandle(base::RepeatingClosure callback, const gfx::VectorIcon* icon) + : views::ImageButton(callback), icon_(icon) { + SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER); + SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE); + SetFlipCanvasOnPaintForRTLUI(false); SetFocusBehavior(FocusBehavior::NEVER); } TuckHandle(const TuckHandle&) = delete; + TuckHandle& operator=(const TuckHandle&) = delete; ~TuckHandle() override = default; - private: - void OnButtonPressed() { - // Untuck the window, which sets the window bounds back onscreen. - // Destroys `this`. - Shell::Get()->float_controller()->MaybeUntuckFloatedWindowForTablet( - window_); + // views::ImageButton: + void OnThemeChanged() override { + views::View::OnThemeChanged(); + SetBackground(views::CreateSolidBackground(ColorUtil::GetSecondToneColor( + DarkLightModeControllerImpl::Get()->IsDarkModeEnabled() + ? SK_ColorWHITE + : SK_ColorBLACK))); + SetImage(views::Button::STATE_NORMAL, + gfx::CreateVectorIcon(*icon_, kTuckHandleIconSize, SK_ColorWHITE)); } - // The window that the handle is attached to. Must be floated and tucked. - aura::Window* window_; + private: + // The untuck icon. + const gfx::VectorIcon* const icon_; }; // Scoped class which makes modifications while a window is tucked. It owns a @@ -136,11 +152,10 @@ false); params.name = "TuckHandleWidget"; tuck_handle_widget_->Init(std::move(params)); - tuck_handle_widget_->SetContentsView(std::make_unique<TuckHandle>(window_)); - tuck_handle_widget_->Show(); // The window should already be tucked offscreen. gfx::Point tuck_handle_origin = window_->GetTargetBounds().left_center(); + bool left = true; switch (magnetism_corner) { case MagnetismCorner::kTopLeft: case MagnetismCorner::kBottomLeft: @@ -153,12 +168,35 @@ tuck_handle_origin = window_->GetTargetBounds().left_center() - gfx::Vector2d(kTuckHandleWidth, kTuckHandleHeight / 2); + left = false; break; } + tuck_handle_widget_->SetContentsView(std::make_unique<TuckHandle>( + base::BindRepeating(&ScopedWindowTucker::OnButtonPressed, + base::Unretained(this)), + left ? &kKsvArrowRightIcon : &kKsvArrowLeftIcon)); + ui::Layer* layer = tuck_handle_widget_->GetLayer(); + layer->SetFillsBoundsOpaquely(false); + layer->SetBackgroundBlur(ColorProvider::kBackgroundBlurSigma); + if (left) { + layer->SetRoundedCornerRadius( + {0, kTuckHandleCornerRadius, kTuckHandleCornerRadius, 0}); + } else { + layer->SetRoundedCornerRadius( + {kTuckHandleCornerRadius, 0, 0, kTuckHandleCornerRadius}); + } + tuck_handle_widget_->Show(); tuck_handle_widget_->SetBounds(gfx::Rect( tuck_handle_origin, gfx::Size(kTuckHandleWidth, kTuckHandleHeight))); } + void OnButtonPressed() { + // Untuck the window, which sets the window bounds back onscreen. + // Destroys `this`. + Shell::Get()->float_controller()->MaybeUntuckFloatedWindowForTablet( + window_); + } + private: // The window that is being tucked. Will be tucked and untucked by the tuck // handle.
diff --git a/ash/wm/overview/drop_target_view.cc b/ash/wm/overview/drop_target_view.cc index 4801c59..1f4ad54 100644 --- a/ash/wm/overview/drop_target_view.cc +++ b/ash/wm/overview/drop_target_view.cc
@@ -34,35 +34,26 @@ } // namespace -class DropTargetView::PlusIconView : public views::ImageView { - public: - PlusIconView() { - SetCanProcessEventsWithinSubtree(false); - SetVerticalAlignment(views::ImageView::Alignment::kCenter); - SetHorizontalAlignment(views::ImageView::Alignment::kCenter); - } - PlusIconView(const PlusIconView&) = delete; - PlusIconView& operator=(const PlusIconView&) = delete; - ~PlusIconView() override = default; -}; - DropTargetView::DropTargetView(bool has_plus_icon) { const int corner_radius = views::LayoutProvider::Get()->GetCornerRadiusMetric( views::Emphasis::kLow); + background_view_ = AddChildView(std::make_unique<views::View>()); background_view_->SetBackground(views::CreateRoundedRectBackground( kDropTargetBackgroundColor, corner_radius)); - if (has_plus_icon) - plus_icon_ = AddChildView(std::make_unique<PlusIconView>()); - SetBorder(views::CreateRoundedRectBorder( kDropTargetBorderThickness, corner_radius, kDropTargetBorderColor)); + + if (has_plus_icon) { + plus_icon_ = AddChildView(std::make_unique<views::ImageView>()); + plus_icon_->SetCanProcessEventsWithinSubtree(false); + plus_icon_->SetVerticalAlignment(views::ImageView::Alignment::kCenter); + plus_icon_->SetHorizontalAlignment(views::ImageView::Alignment::kCenter); + } } void DropTargetView::UpdateBackgroundVisibility(bool visible) { - if (background_view_->GetVisible() == visible) - return; background_view_->SetVisible(visible); } @@ -70,25 +61,26 @@ const gfx::Rect local_bounds = GetLocalBounds(); background_view_->SetBoundsRect(local_bounds); - if (plus_icon_) { - const int min_dimension = - std::min(local_bounds.width(), local_bounds.height()); - int plus_icon_size = 0; - if (min_dimension <= kDropTargetMiddleSize) { - plus_icon_size = kPlusIconSizeFirFraction * min_dimension; - } else { - plus_icon_size = std::max( - std::min(static_cast<int>(kPlusIconSizeSecFraction * min_dimension), - kPlusIconLargestSize), - kPlusIconMiddleSize); - } + if (!plus_icon_) + return; - gfx::Rect icon_bounds = local_bounds; - plus_icon_->SetImage(gfx::CreateVectorIcon(kOverviewDropTargetPlusIcon, - plus_icon_size, kPlusIconColor)); - icon_bounds.ClampToCenteredSize(gfx::Size(plus_icon_size, plus_icon_size)); - plus_icon_->SetBoundsRect(icon_bounds); + const int min_dimension = + std::min(local_bounds.width(), local_bounds.height()); + int plus_icon_size = 0; + if (min_dimension <= kDropTargetMiddleSize) { + plus_icon_size = kPlusIconSizeFirFraction * min_dimension; + } else { + plus_icon_size = std::max( + std::min(static_cast<int>(kPlusIconSizeSecFraction * min_dimension), + kPlusIconLargestSize), + kPlusIconMiddleSize); } + + gfx::Rect icon_bounds = local_bounds; + plus_icon_->SetImage(gfx::CreateVectorIcon(kOverviewDropTargetPlusIcon, + plus_icon_size, kPlusIconColor)); + icon_bounds.ClampToCenteredSize(gfx::Size(plus_icon_size, plus_icon_size)); + plus_icon_->SetBoundsRect(icon_bounds); } BEGIN_METADATA(DropTargetView, views::View)
diff --git a/ash/wm/overview/drop_target_view.h b/ash/wm/overview/drop_target_view.h index 7ccdffb72..71046af 100644 --- a/ash/wm/overview/drop_target_view.h +++ b/ash/wm/overview/drop_target_view.h
@@ -8,6 +8,10 @@ #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/view.h" +namespace views { +class ImageView; +} + namespace ash { // DropTargetView represents a transparent view with border in overview. It @@ -30,10 +34,8 @@ void Layout() override; private: - class PlusIconView; - views::View* background_view_ = nullptr; - PlusIconView* plus_icon_ = nullptr; + views::ImageView* plus_icon_ = nullptr; }; } // namespace ash
diff --git a/ash/wm/overview/overview_grid.cc b/ash/wm/overview/overview_grid.cc index 4c3669c..580c785 100644 --- a/ash/wm/overview/overview_grid.cc +++ b/ash/wm/overview/overview_grid.cc
@@ -2098,7 +2098,6 @@ Shell::Get()->overview_controller()->PauseOcclusionTracker(); for (auto& window : window_list()) { - window->set_disable_mask(true); window->UpdateRoundedCornersAndShadow(); window->StopWidgetAnimation(); } @@ -2107,8 +2106,6 @@ void OverviewGrid::OnScreenRotationAnimationFinished( ScreenRotationAnimator* animator, bool canceled) { - for (auto& window : window_list()) - window->set_disable_mask(false); Shell::Get()->overview_controller()->DelayedUpdateRoundedCornersAndShadow(); Shell::Get()->overview_controller()->UnpauseOcclusionTracker( kOcclusionUnpauseDurationForRotation);
diff --git a/ash/wm/overview/overview_grid.h b/ash/wm/overview/overview_grid.h index a9f932b..8ac1e13b 100644 --- a/ash/wm/overview/overview_grid.h +++ b/ash/wm/overview/overview_grid.h
@@ -40,24 +40,14 @@ class SavedDeskSaveDeskButtonContainer; class SavedDeskLibraryView; -// Represents a grid of windows in the Overview Mode in a particular root -// window, and manages a selection widget that can be moved with the arrow keys. -// The idea behind the movement strategy is that it should be possible to access -// any window pressing a given arrow key repeatedly. -// +-------+ +-------+ +-------+ -// | 0 | | 1 | | 2 | -// +-------+ +-------+ +-------+ -// +-------+ +-------+ +-------+ -// | 3 | | 4 | | 5 | -// +-------+ +-------+ +-------+ -// +-------+ -// | 6 | -// +-------+ -// Example sequences: -// - Going right to left -// 0, 1, 2, 3, 4, 5, 6 -// The selector is switched to the next window grid (if available) or wrapped if -// it reaches the end of its movement sequence. +// Manages and positions the overview UI on a per root window basis. Overview UI +// elements include: +// - Desks bar view which contains a desk preview and desk name per desk. +// - Splitview indicators for snapping windows in overview. +// - Overview items representing each application window associated with the +// root window of the grid. +// - Saved desk UI elements to create saved desks and display saved desks. +// - etc. class ASH_EXPORT OverviewGrid : public SplitViewObserver, public ScreenRotationAnimatorObserver, public WallpaperControllerObserver { @@ -427,8 +417,6 @@ const DesksBarView* desks_bar_view() const { return desks_bar_view_; } DesksBarView* desks_bar_view() { return desks_bar_view_; } - const gfx::Rect bounds() const { return bounds_; } - bool should_animate_when_exiting() const { return should_animate_when_exiting_; } @@ -437,8 +425,6 @@ views::Widget* drop_target_widget() { return drop_target_widget_.get(); } - float scroll_offset() const { return scroll_offset_; } - OverviewGridEventHandler* grid_event_handler() { return grid_event_handler_.get(); } @@ -455,6 +441,9 @@ int num_unsupported_windows() const { return num_unsupported_windows_; } + const gfx::Rect bounds_for_testing() const { return bounds_; } + float scroll_offset_for_testing() const { return scroll_offset_; } + private: class TargetWindowObserver; friend class DesksTemplatesTest;
diff --git a/ash/wm/overview/overview_highlight_controller.h b/ash/wm/overview/overview_highlight_controller.h index 8759de9c27..4b2d70b1 100644 --- a/ash/wm/overview/overview_highlight_controller.h +++ b/ash/wm/overview/overview_highlight_controller.h
@@ -18,8 +18,27 @@ class ScopedA11yOverrideWindowSetter; // Manages highlighting items while in overview. Responsible for telling -// overview items to show or hide their focus ring borders, when tabbing through -// overview items with arrow keys and trackpad swipes, or when tab dragging. +// highlightable items to show or hide their focus ring borders, when tabbing +// through highlightable items with arrow keys and trackpad swipes, or when tab +// dragging. In this context, an highlightable item can represent anything +// focusable in overview mode such as a desk textfield, saved desk button and an +// `OverviewItem`. The idea behind the movement strategy is that it should be +// possible to access any highlightable view via keyboard by pressing the tab or +// arrow keys repeatedly. +// +-------+ +-------+ +-------+ +// | 0 | | 1 | | 2 | +// +-------+ +-------+ +-------+ +// +-------+ +-------+ +-------+ +// | 3 | | 4 | | 5 | +// +-------+ +-------+ +-------+ +// +-------+ +// | 6 | +// +-------+ +// Example sequences: +// - Going right to left +// 0, 1, 2, 3, 4, 5, 6 +// The highlight is switched to the next window grid (if available) or wrapped +// if it reaches the end of its movement sequence. class ASH_EXPORT OverviewHighlightController { public: explicit OverviewHighlightController(OverviewSession* overview_session);
diff --git a/ash/wm/overview/overview_item.cc b/ash/wm/overview/overview_item.cc index 9368c51..aa04ccb4 100644 --- a/ash/wm/overview/overview_item.cc +++ b/ash/wm/overview/overview_item.cc
@@ -289,31 +289,30 @@ } GetWindow()->ClearProperty(kForceVisibleInMiniViewKey); - for (aura::Window* transient_child : GetTransientTreeIterator(GetWindow())) { + for (aura::Window* transient_child : GetTransientTreeIterator(GetWindow())) transient_child->ClearProperty(kForceVisibleInMiniViewKey); - } overview_item_view_->OnOverviewItemWindowRestoring(); transform_window_.RestoreWindow(reset_transform, was_desks_templates_grid_showing); - if (transform_window_.IsMinimized()) { - const auto enter_exit_type = overview_session_->enter_exit_overview_type(); + if (!transform_window_.IsMinimized()) + return; - if (is_moving_to_another_desk_ || - enter_exit_type == OverviewEnterExitType::kImmediateExit) { - overview_session_->highlight_controller()->OnViewDestroyingOrDisabling( - overview_item_view_); - ImmediatelyCloseWidgetOnExit(std::move(item_widget_)); - overview_item_view_ = nullptr; - return; - } - - OverviewAnimationType animation_type = - GetExitOverviewAnimationTypeForMinimizedWindow( - enter_exit_type, should_animate_when_exiting_); - FadeOutWidgetFromOverview(std::move(item_widget_), animation_type); + const auto enter_exit_type = overview_session_->enter_exit_overview_type(); + if (is_moving_to_another_desk_ || + enter_exit_type == OverviewEnterExitType::kImmediateExit) { + overview_session_->highlight_controller()->OnViewDestroyingOrDisabling( + overview_item_view_); + ImmediatelyCloseWidgetOnExit(std::move(item_widget_)); + overview_item_view_ = nullptr; + return; } + + OverviewAnimationType animation_type = + GetExitOverviewAnimationTypeForMinimizedWindow( + enter_exit_type, should_animate_when_exiting_); + FadeOutWidgetFromOverview(std::move(item_widget_), animation_type); } void OverviewItem::EnsureVisible() { @@ -496,7 +495,7 @@ ScopedOverviewAnimationSettings settings( OVERVIEW_ANIMATION_CLOSE_OVERVIEW_ITEM, window); gfx::Transform original_transform = window->transform(); - original_transform.ConcatTransform(transform); + original_transform.PostConcat(transform); window->SetTransform(original_transform); if (observe) { settings.AddObserver(new AnimationObserver{ @@ -761,8 +760,7 @@ const bool is_shutting_down = !overview_controller || !overview_controller->InOverviewSession(); const bool should_show_rounded_corners = - !disable_mask_ && !is_shutting_down && - !overview_controller->IsInStartAnimation(); + !is_shutting_down && !overview_controller->IsInStartAnimation(); if (transform_window_.IsMinimized()) { overview_item_view_->UpdatePreviewRoundedCorners( @@ -1444,15 +1442,23 @@ void OverviewItem::HideWindowInOverview() { ScopedOverviewHideWindows* hide_windows = overview_session_->hide_windows_for_saved_desks_grid(); - if (hide_windows && !hide_windows->HasWindow(GetWindow())) + DCHECK(hide_windows); + + if (!hide_windows->HasWindow(GetWindow())) hide_windows->AddWindow(GetWindow()); + if (item_widget_ && !hide_windows->HasWindow(item_widget_->GetNativeWindow())) + hide_windows->AddWindow(item_widget_->GetNativeWindow()); } void OverviewItem::ShowWindowInOverview() { ScopedOverviewHideWindows* hide_windows = overview_session_->hide_windows_for_saved_desks_grid(); - if (hide_windows && hide_windows->HasWindow(GetWindow())) + DCHECK(hide_windows); + + if (hide_windows->HasWindow(GetWindow())) hide_windows->RemoveWindow(GetWindow()); + if (item_widget_ && hide_windows->HasWindow(item_widget_->GetNativeWindow())) + hide_windows->RemoveWindow(item_widget_->GetNativeWindow()); } } // namespace ash
diff --git a/ash/wm/overview/overview_item.h b/ash/wm/overview/overview_item.h index f11fa56..e47ec84a 100644 --- a/ash/wm/overview/overview_item.h +++ b/ash/wm/overview/overview_item.h
@@ -259,11 +259,8 @@ should_restack_on_animation_end_ = val; } - void set_animating_to_close(bool val) { animating_to_close_ = val; } bool animating_to_close() const { return animating_to_close_; } - void set_disable_mask(bool disable) { disable_mask_ = disable; } - void set_unclipped_size(absl::optional<gfx::Size> unclipped_size) { unclipped_size_ = unclipped_size; } @@ -279,9 +276,13 @@ RoundedLabelWidget* cannot_snap_widget_for_testing() { return cannot_snap_widget_.get(); } + void set_target_bounds_for_testing(const gfx::RectF& target_bounds) { target_bounds_ = target_bounds; } + void set_animating_to_close_for_testing(bool val) { + animating_to_close_ = val; + } private: friend class OverviewTestBase; @@ -432,9 +433,6 @@ // True if this overview item is currently being dragged around. bool is_being_dragged_ = false; - // True to always disable mask regardless of the state. - bool disable_mask_ = false; - bool prepared_for_overview_ = false; // This has a value when there is a snapped window, or a window about to be
diff --git a/ash/wm/overview/overview_session.h b/ash/wm/overview/overview_session.h index 7fa6b4e..d885c53 100644 --- a/ash/wm/overview/overview_session.h +++ b/ash/wm/overview/overview_session.h
@@ -483,9 +483,9 @@ std::unique_ptr<ScopedOverviewHideWindows> hide_overview_windows_; - // Scoped windows to hide for saved desks grid. For now, this contains only - // the real window in the overview to make sure it's not shown via other - // events for saved desks grid. + // Scoped windows to hide for saved desks grid. For now, this contains the + // overview item window and its corresponding real window to make sure such + // windows are not shown via other events for saved desks grid. std::unique_ptr<ScopedOverviewHideWindows> hide_windows_for_saved_desks_grid_; std::unique_ptr<OverviewHighlightController> highlight_controller_;
diff --git a/ash/wm/overview/overview_session_unittest.cc b/ash/wm/overview/overview_session_unittest.cc index 6c534c20..d4bbeff 100644 --- a/ash/wm/overview/overview_session_unittest.cc +++ b/ash/wm/overview/overview_session_unittest.cc
@@ -2870,8 +2870,8 @@ // Verify that items that are animating before closing are ignored by // PositionWindows. - item1->set_animating_to_close(true); - item2->set_animating_to_close(true); + item1->set_animating_to_close_for_testing(true); + item2->set_animating_to_close_for_testing(true); GetOverviewSession()->PositionWindows(/*animate=*/false); EXPECT_EQ(bounds1, item1->target_bounds()); EXPECT_EQ(bounds2, item2->target_bounds()); @@ -3840,7 +3840,7 @@ // there may not be enough time passed to decay the velocity so the scroll // offset will not change, but the overall change should be substantial. constexpr int kMaxLoops = 10; - const float initial_scroll_offset = grid->scroll_offset(); + const float initial_scroll_offset = grid->scroll_offset_for_testing(); float previous_scroll_offset = initial_scroll_offset; for (int i = 0; i < kMaxLoops && grid_event_handler->IsFlingInProgressForTesting(); @@ -3848,12 +3848,12 @@ task_environment()->FastForwardBy(base::Milliseconds(50)); ui::DrawWaiterForTest::WaitForCompositingStarted(compositor); - float scroll_offset = grid->scroll_offset(); + float scroll_offset = grid->scroll_offset_for_testing(); EXPECT_LE(scroll_offset, previous_scroll_offset); previous_scroll_offset = scroll_offset; } - EXPECT_LT(grid->scroll_offset(), initial_scroll_offset - 100.f); + EXPECT_LT(grid->scroll_offset_for_testing(), initial_scroll_offset - 100.f); } // Tests that a vertical scroll sequence will close the window it is scrolled @@ -4552,12 +4552,13 @@ GetOverviewSession()->window_drag_controller(); ASSERT_TRUE(drag_controller); EXPECT_EQ(DragBehavior::kNormalDrag, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); generator->MoveTouchBy(20, 0); EXPECT_EQ(DragBehavior::kNormalDrag, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); generator->ReleaseTouch(); - EXPECT_EQ(DragBehavior::kNoDrag, drag_controller->current_drag_behavior()); + EXPECT_EQ(DragBehavior::kNoDrag, + drag_controller->current_drag_behavior_for_testing()); // Verify that if a drag is orginally vertical, the drag behavior is drag to // close. @@ -4572,7 +4573,7 @@ // A new instance of drag controller gets created each time a drag starts. drag_controller = GetOverviewSession()->window_drag_controller(); EXPECT_EQ(DragBehavior::kDragToClose, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); } // Verify the window grid size changes as expected when dragging items around in @@ -5489,14 +5490,16 @@ generator->set_current_screen_location(drag_starting_point); generator->PressLeftButton(); using DragBehavior = OverviewWindowDragController::DragBehavior; - EXPECT_EQ( - DragBehavior::kUndefined, - GetOverviewSession()->window_drag_controller()->current_drag_behavior()); + EXPECT_EQ(DragBehavior::kUndefined, + GetOverviewSession() + ->window_drag_controller() + ->current_drag_behavior_for_testing()); EXPECT_EQ(1.f, unsnappable_layer->opacity()); generator->MoveMouseBy(0, 20); - EXPECT_EQ( - DragBehavior::kNormalDrag, - GetOverviewSession()->window_drag_controller()->current_drag_behavior()); + EXPECT_EQ(DragBehavior::kNormalDrag, + GetOverviewSession() + ->window_drag_controller() + ->current_drag_behavior_for_testing()); EXPECT_EQ(0.f, unsnappable_layer->opacity()); generator->ReleaseLeftButton(); EXPECT_EQ(1.f, unsnappable_layer->opacity()); @@ -5511,9 +5514,10 @@ FROM_HERE, run_loop.QuitClosure(), base::Milliseconds(2)); run_loop.Run(); } - EXPECT_EQ( - DragBehavior::kNormalDrag, - GetOverviewSession()->window_drag_controller()->current_drag_behavior()); + EXPECT_EQ(DragBehavior::kNormalDrag, + GetOverviewSession() + ->window_drag_controller() + ->current_drag_behavior_for_testing()); EXPECT_EQ(0.f, unsnappable_layer->opacity()); generator->MoveTouchBy(20, 0); generator->ReleaseTouch(); @@ -5532,9 +5536,10 @@ FROM_HERE, run_loop.QuitClosure(), base::Milliseconds(2)); run_loop.Run(); } - EXPECT_EQ( - DragBehavior::kNormalDrag, - GetOverviewSession()->window_drag_controller()->current_drag_behavior()); + EXPECT_EQ(DragBehavior::kNormalDrag, + GetOverviewSession() + ->window_drag_controller() + ->current_drag_behavior_for_testing()); EXPECT_EQ(0.f, unsnappable_layer->opacity()); generator->ReleaseTouch(); EXPECT_EQ(1.f, unsnappable_layer->opacity()); @@ -5545,9 +5550,10 @@ // Use small increments otherwise a fling event will be fired. for (int j = 0; j < 20; ++j) generator->MoveTouchBy(0, 1); - EXPECT_EQ( - DragBehavior::kDragToClose, - GetOverviewSession()->window_drag_controller()->current_drag_behavior()); + EXPECT_EQ(DragBehavior::kDragToClose, + GetOverviewSession() + ->window_drag_controller() + ->current_drag_behavior_for_testing()); // Drag-to-close mode affects the opacity of the whole overview item, // including the unsnappable label. EXPECT_EQ(unsnappable_overview_item->GetWindow()->layer()->opacity(), @@ -6005,8 +6011,8 @@ // Tests that near the right edge, the grid bounds are fixed at 200 and are // partially off screen to the right. generator->MoveMouseTo(580, 0); - EXPECT_EQ(200, grid->bounds().width()); - EXPECT_GT(grid->bounds().right(), 600); + EXPECT_EQ(200, grid->bounds_for_testing().width()); + EXPECT_GT(grid->bounds_for_testing().right(), 600); generator->ReleaseLeftButton(); SkipDividerSnapAnimation(); @@ -6029,8 +6035,8 @@ generator->MoveMouseTo(20, 0); // Tests that near the left edge, the grid bounds are fixed at 200 and are // partially off screen to the left. - EXPECT_EQ(200, grid->bounds().width()); - EXPECT_LT(grid->bounds().x(), 0); + EXPECT_EQ(200, grid->bounds_for_testing().width()); + EXPECT_LT(grid->bounds_for_testing().x(), 0); generator->ReleaseLeftButton(); SkipDividerSnapAnimation(); } @@ -7398,7 +7404,7 @@ ->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kPrimary, /*window_for_minimum_size=*/nullptr), - grid_on_root2->bounds()); + grid_on_root2->bounds_for_testing()); GetOverviewSession()->CompleteDrag(item1, right_snap_point); EXPECT_EQ(SplitViewController::State::kSecondarySnapped, split_view_controller->state()); @@ -7461,10 +7467,12 @@ /*is_touch_dragging=*/false); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kNoDrag, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kNoDrag, indicators_on_root2->current_window_dragging_state()); - EXPECT_EQ(display_with_root2.work_area(), grid_on_root2->bounds()); + EXPECT_EQ(display_with_root2.work_area(), + grid_on_root2->bounds_for_testing()); const gfx::PointF root1_left_snap_point(0.f, 300.f); GetOverviewSession()->Drag(item1, root1_left_snap_point); @@ -7474,19 +7482,22 @@ ->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary, /*window_for_minimum_size=*/nullptr), - grid_on_root1->bounds()); + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root2->current_window_dragging_state()); - EXPECT_EQ(display_with_root2.work_area(), grid_on_root2->bounds()); + EXPECT_EQ(display_with_root2.work_area(), + grid_on_root2->bounds_for_testing()); const gfx::PointF root1_middle_point(400.f, 300.f); GetOverviewSession()->Drag(item1, root1_middle_point); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kFromOverview, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root2->current_window_dragging_state()); - EXPECT_EQ(display_with_root2.work_area(), grid_on_root2->bounds()); + EXPECT_EQ(display_with_root2.work_area(), + grid_on_root2->bounds_for_testing()); const gfx::PointF root1_right_snap_point(799.f, 300.f); GetOverviewSession()->Drag(item1, root1_right_snap_point); @@ -7496,67 +7507,75 @@ ->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kPrimary, /*window_for_minimum_size=*/nullptr), - grid_on_root1->bounds()); + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root2->current_window_dragging_state()); - EXPECT_EQ(display_with_root2.work_area(), grid_on_root2->bounds()); + EXPECT_EQ(display_with_root2.work_area(), + grid_on_root2->bounds_for_testing()); const gfx::PointF root2_left_snap_point(800.f, 300.f); cursor_manager->SetDisplay(display_with_root2); GetOverviewSession()->Drag(item1, root2_left_snap_point); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kToSnapPrimary, indicators_on_root2->current_window_dragging_state()); EXPECT_EQ(SplitViewController::Get(root_windows[1]) ->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary, /*window_for_minimum_size=*/nullptr), - grid_on_root2->bounds()); + grid_on_root2->bounds_for_testing()); const gfx::PointF root2_left_snap_point_away_from_edge(816.f, 300.f); GetOverviewSession()->Drag(item1, root2_left_snap_point_away_from_edge); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kToSnapPrimary, indicators_on_root2->current_window_dragging_state()); EXPECT_EQ(SplitViewController::Get(root_windows[1]) ->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary, /*window_for_minimum_size=*/nullptr), - grid_on_root2->bounds()); + grid_on_root2->bounds_for_testing()); const gfx::PointF root2_right_snap_point(1599.f, 300.f); GetOverviewSession()->Drag(item1, root2_right_snap_point); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kToSnapSecondary, indicators_on_root2->current_window_dragging_state()); EXPECT_EQ(SplitViewController::Get(root_windows[1]) ->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kPrimary, /*window_for_minimum_size=*/nullptr), - grid_on_root2->bounds()); + grid_on_root2->bounds_for_testing()); const gfx::PointF root2_middle_point(1200.f, 300.f); GetOverviewSession()->Drag(item1, root2_middle_point); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kOtherDisplay, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kFromOverview, indicators_on_root2->current_window_dragging_state()); - EXPECT_EQ(display_with_root2.work_area(), grid_on_root2->bounds()); + EXPECT_EQ(display_with_root2.work_area(), + grid_on_root2->bounds_for_testing()); GetOverviewSession()->CompleteDrag(item1, root2_middle_point); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kNoDrag, indicators_on_root1->current_window_dragging_state()); - EXPECT_EQ(display_with_root1.work_area(), grid_on_root1->bounds()); + EXPECT_EQ(display_with_root1.work_area(), + grid_on_root1->bounds_for_testing()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kNoDrag, indicators_on_root2->current_window_dragging_state()); - EXPECT_EQ(display_with_root2.work_area(), grid_on_root2->bounds()); + EXPECT_EQ(display_with_root2.work_area(), + grid_on_root2->bounds_for_testing()); } // Verify the drop target positions for multi-display dragging.
diff --git a/ash/wm/overview/overview_wallpaper_controller.cc b/ash/wm/overview/overview_wallpaper_controller.cc index d287876..c6d1fc77 100644 --- a/ash/wm/overview/overview_wallpaper_controller.cc +++ b/ash/wm/overview/overview_wallpaper_controller.cc
@@ -9,9 +9,8 @@ #include "ash/shell.h" #include "ash/wallpaper/wallpaper_constants.h" #include "ash/wallpaper/wallpaper_widget_controller.h" -#include "ash/wm/overview/overview_constants.h" -#include "ash/wm/overview/overview_controller.h" #include "ash/wm/overview/overview_utils.h" +#include "ash/wm/tablet_mode/tablet_mode_controller.h" namespace ash { @@ -97,9 +96,9 @@ const bool should_animate = ShouldAnimateWallpaper(root); // On adding blur, we want to blur immediately if there are no animations // and blur after the rest of the overview animations have completed if - // there is to be wallpaper animations. |UpdateWallpaper| will get called - // twice when blurring, but only change the wallpaper when |should_animate| - // matches |animate|. + // there is to be wallpaper animations. `UpdateWallpaper` will get called + // twice when blurring, but only change the wallpaper when `should_animate` + // matches `animate`. if (should_blur && should_animate != animate.value()) continue;
diff --git a/ash/wm/overview/overview_wallpaper_controller.h b/ash/wm/overview/overview_wallpaper_controller.h index ce92a2f..ab61292 100644 --- a/ash/wm/overview/overview_wallpaper_controller.h +++ b/ash/wm/overview/overview_wallpaper_controller.h
@@ -14,7 +14,7 @@ // Class that controls when and how to apply blur and dimming wallpaper upon // entering and exiting overview mode. Blurs the wallpaper automatically if the // wallpaper is not visible prior to entering overview mode (covered by a -// window), otherwise animates the blur and dim. +// window), otherwise animates the blur. class ASH_EXPORT OverviewWallpaperController : public TabletModeObserver { public: OverviewWallpaperController(); @@ -36,13 +36,13 @@ private: // Called when the wallpaper is to be changed and updates all root windows. - // Based on the |animate| paramter, several things can happen: + // Based on the `animate` parameter, several things can happen: // - nullopt: Apply the blur immediately. // - true/false: Animates and applies the blur only if this value matches // whether animations are allowed based on each root window. void UpdateWallpaper(bool should_blur, absl::optional<bool> animate); - // Tracks if the wallpaper blur should be applied. + // Tracks if the wallpaper blur is applied. bool wallpaper_blurred_ = false; };
diff --git a/ash/wm/overview/overview_window_drag_controller.h b/ash/wm/overview/overview_window_drag_controller.h index d78ae2e..1b796ce9 100644 --- a/ash/wm/overview/overview_window_drag_controller.h +++ b/ash/wm/overview/overview_window_drag_controller.h
@@ -118,10 +118,12 @@ OverviewItem* item() { return item_; } - DragBehavior current_drag_behavior() { return current_drag_behavior_; } - bool is_touch_dragging() const { return is_touch_dragging_; } + DragBehavior current_drag_behavior_for_testing() const { + return current_drag_behavior_; + } + private: enum NormalDragAction { kToGrid = 0,
diff --git a/ash/wm/overview/overview_window_drag_controller_unittest.cc b/ash/wm/overview/overview_window_drag_controller_unittest.cc index 5948f342..7c7d64e 100644 --- a/ash/wm/overview/overview_window_drag_controller_unittest.cc +++ b/ash/wm/overview/overview_window_drag_controller_unittest.cc
@@ -165,7 +165,7 @@ GetEventGenerator()); ASSERT_TRUE(drag_controller()); EXPECT_EQ(OverviewWindowDragController::DragBehavior::kNormalDrag, - drag_controller()->current_drag_behavior()); + drag_controller()->current_drag_behavior_for_testing()); ASSERT_TRUE(drag_indicators()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kFromOverview, drag_indicators()->current_window_dragging_state()); @@ -208,7 +208,7 @@ OverviewWindowDragController* drag_controller = overview_session->window_drag_controller(); EXPECT_EQ(OverviewWindowDragController::DragBehavior::kNormalDrag, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); event_generator->ReleaseLeftButton(); EXPECT_TRUE(overview_controller->InOverviewSession()); EXPECT_EQ(target_bounds_before_drag, overview_item->target_bounds()); @@ -253,12 +253,12 @@ OverviewWindowDragController* drag_controller = overview_session->window_drag_controller(); EXPECT_EQ(OverviewWindowDragController::DragBehavior::kDragToClose, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); // Continue dragging vertically up such that the drag location intersects with // the desks bar. Expect that normal drag is now triggered. event_generator->MoveTouchBy(0, -(space_to_leave + 10)); EXPECT_EQ(OverviewWindowDragController::DragBehavior::kNormalDrag, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); // Now it's possible to drop it on desk_2's mini_view. auto* desk_2_mini_view = desks_bar_view->mini_views()[1]; ASSERT_TRUE(desk_2_mini_view); @@ -291,11 +291,11 @@ OverviewWindowDragController* drag_controller = overview_session->window_drag_controller(); EXPECT_EQ(OverviewWindowDragController::DragBehavior::kNormalDrag, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); window.reset(); EXPECT_EQ(OverviewWindowDragController::DragBehavior::kNoDrag, - drag_controller->current_drag_behavior()); + drag_controller->current_drag_behavior_for_testing()); } TEST_F(OverviewWindowDragControllerTest, @@ -445,7 +445,7 @@ ASSERT_TRUE(drag_indicators()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kToSnapSecondary, drag_indicators()->current_window_dragging_state()); - EXPECT_EQ(overview_grid()->bounds().y(), + EXPECT_EQ(overview_grid()->bounds_for_testing().y(), desks_bar_widget()->GetWindowBoundsInScreen().y()); // Drag back to the middle, the desks bar should be shifted again. @@ -462,7 +462,7 @@ ASSERT_TRUE(drag_indicators()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kToSnapPrimary, drag_indicators()->current_window_dragging_state()); - EXPECT_EQ(overview_grid()->bounds().y(), + EXPECT_EQ(overview_grid()->bounds_for_testing().y(), desks_bar_widget()->GetWindowBoundsInScreen().y()); // Drop it at this location and expect the window to snap. The desks bar @@ -472,7 +472,7 @@ EXPECT_EQ(SplitViewController::State::kPrimarySnapped, split_view_controller()->state()); EXPECT_EQ(window.get(), split_view_controller()->primary_window()); - EXPECT_EQ(overview_grid()->bounds().y(), + EXPECT_EQ(overview_grid()->bounds_for_testing().y(), desks_bar_widget()->GetWindowBoundsInScreen().y()); } @@ -503,7 +503,7 @@ event_generator->ReleaseLeftButton(); // Drop. EXPECT_FALSE(desks_util::BelongsToActiveDesk(window.get())); EXPECT_TRUE(overview_controller()->InOverviewSession()); - EXPECT_EQ(overview_grid()->bounds().y(), + EXPECT_EQ(overview_grid()->bounds_for_testing().y(), desks_bar_widget()->GetWindowBoundsInScreen().y()); EXPECT_EQ(SplitViewDragIndicators::WindowDraggingState::kNoDrag, drag_indicators()->current_window_dragging_state());
diff --git a/ash/wm/splitview/split_view_controller_unittest.cc b/ash/wm/splitview/split_view_controller_unittest.cc index 9580c2b..7e4d5bf 100644 --- a/ash/wm/splitview/split_view_controller_unittest.cc +++ b/ash/wm/splitview/split_view_controller_unittest.cc
@@ -4407,7 +4407,7 @@ window1.get()); const gfx::Rect expected_grid_bounds = ShrinkBoundsByHotseatInset(work_area_bounds); - EXPECT_EQ(expected_grid_bounds, current_grid->bounds()); + EXPECT_EQ(expected_grid_bounds, current_grid->bounds_for_testing()); auto target_opacity = [](views::Widget* widget) { return widget->GetNativeWindow()->layer()->GetTargetOpacity(); @@ -4425,7 +4425,7 @@ // Now drag |window1| to the left preview split area. DragWindowTo(resizer.get(), gfx::Point(0, work_area_bounds.CenterPoint().y())); - EXPECT_EQ(current_grid->bounds(), + EXPECT_EQ(current_grid->bounds_for_testing(), ShrinkBoundsByHotseatInset( split_view_controller()->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary, @@ -4434,13 +4434,13 @@ // Drag it to middle. DragWindowTo(resizer.get(), work_area_bounds.CenterPoint()); - EXPECT_EQ(expected_grid_bounds, current_grid->bounds()); + EXPECT_EQ(expected_grid_bounds, current_grid->bounds_for_testing()); EXPECT_EQ(1.f, target_opacity(drop_target_widget)); // Drag |window1| to the right preview split area. DragWindowTo(resizer.get(), gfx::Point(work_area_bounds.right(), work_area_bounds.CenterPoint().y())); - EXPECT_EQ(current_grid->bounds(), + EXPECT_EQ(current_grid->bounds_for_testing(), ShrinkBoundsByHotseatInset( split_view_controller()->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kPrimary, @@ -4476,7 +4476,7 @@ EXPECT_EQ(drop_target_widget->GetNativeWindow()->bounds(), GetDropTargetBoundsDuringDrag(window1.get())); EXPECT_NE(drop_target_widget->GetNativeWindow()->bounds(), window1->bounds()); - EXPECT_EQ(current_grid->bounds(), + EXPECT_EQ(current_grid->bounds_for_testing(), ShrinkBoundsByHotseatInset( split_view_controller()->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary, @@ -4487,7 +4487,7 @@ work_area_bounds.CenterPoint().y())); // Overview bounds stays the same. - EXPECT_EQ(current_grid->bounds(), + EXPECT_EQ(current_grid->bounds_for_testing(), ShrinkBoundsByHotseatInset( split_view_controller()->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary, @@ -4497,7 +4497,7 @@ // Drag |window1| to the left preview split area. DragWindowTo(resizer.get(), gfx::Point(0, work_area_bounds.CenterPoint().y())); - EXPECT_EQ(current_grid->bounds(), + EXPECT_EQ(current_grid->bounds_for_testing(), ShrinkBoundsByHotseatInset( split_view_controller()->GetSnappedWindowBoundsInScreen( SplitViewController::SnapPosition::kSecondary,
diff --git a/ash/wm/splitview/split_view_drag_indicators.cc b/ash/wm/splitview/split_view_drag_indicators.cc index 129949b..28af0d85 100644 --- a/ash/wm/splitview/split_view_drag_indicators.cc +++ b/ash/wm/splitview/split_view_drag_indicators.cc
@@ -38,7 +38,7 @@ #include "ui/views/background.h" #include "ui/views/controls/label.h" #include "ui/views/highlight_border.h" -#include "ui/views/layout/box_layout.h" +#include "ui/views/layout/box_layout_view.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/coordinate_conversion.h" @@ -125,28 +125,20 @@ } } -// View which contains a label and can be rotated. Used by and rotated by -// SplitViewDragIndicatorsView. -class SplitViewDragIndicators::RotatedImageLabelView : public views::View { +// View which contains a label and is meant to be rotated. Used by and rotated +// by `SplitViewDragIndicatorsView`. +class SplitViewDragIndicators::RotatedImageLabelView + : public views::BoxLayoutView { public: explicit RotatedImageLabelView(bool is_right_or_bottom) : is_right_or_bottom_(is_right_or_bottom) { - // TODO(sammiequon): Remove this extra intermediate layer. - SetPaintToLayer(ui::LAYER_NOT_DRAWN); + SetOrientation(views::BoxLayout::Orientation::kVertical); + SetInsideBorderInsets(gfx::Insets::VH(kSplitviewLabelVerticalInsetDp, + kSplitviewLabelHorizontalInsetDp)); + SetPaintToLayer(); layer()->SetFillsBoundsOpaquely(false); - // Use |label_parent_| to add padding and rounded edges to the text. Create - // this extra view so that we can rotate the label, while having a slide - // animation at times on the whole thing. - label_parent_ = AddChildView(std::make_unique<views::View>()); - label_parent_->SetPaintToLayer(ui::LAYER_TEXTURED); - label_parent_->layer()->SetFillsBoundsOpaquely(false); - label_parent_->SetLayoutManager(std::make_unique<views::BoxLayout>( - views::BoxLayout::Orientation::kVertical, - gfx::Insets::VH(kSplitviewLabelVerticalInsetDp, - kSplitviewLabelHorizontalInsetDp))); - - label_ = label_parent_->AddChildView(std::make_unique<views::Label>( + label_ = AddChildView(std::make_unique<views::Label>( std::u16string(), views::style::CONTEXT_LABEL)); label_->SetFontList(views::Label::GetDefaultFontList().Derive( 2, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL)); @@ -157,17 +149,6 @@ ~RotatedImageLabelView() override = default; - void SetLabelText(const std::u16string& text) { label_->SetText(text); } - - // Called when the view's bounds are altered. Rotates the view by |angle| - // degrees. - void OnBoundsUpdated(const gfx::Rect& bounds, double angle) { - SetBoundsRect(bounds); - label_parent_->SetBoundsRect(gfx::Rect(bounds.size())); - label_parent_->SetTransform( - ComputeRotateAroundCenterTransform(bounds, angle)); - } - // Called to update the opacity of the labels view on |indicator_state|. void OnWindowDraggingStateChanged( WindowDraggingState window_dragging_state, @@ -196,7 +177,7 @@ } // Set the text according to |can_dragged_window_be_snapped|. - SetLabelText(l10n_util::GetStringUTF16( + label_->SetText(l10n_util::GetStringUTF16( can_dragged_window_be_snapped ? IDS_ASH_SPLIT_VIEW_GUIDANCE : IDS_ASH_SPLIT_VIEW_CANNOT_SNAP)); @@ -220,10 +201,12 @@ // views:View: void OnThemeChanged() override { views::View::OnThemeChanged(); - label_parent_->SetBackground(views::CreateRoundedRectBackground( + + SetBackground(views::CreateRoundedRectBackground( AshColorProvider::Get()->GetBaseLayerColor( AshColorProvider::BaseLayerType::kTransparent80), kSplitviewLabelRoundRectRadiusDp)); + // TODO(crbug/1258983): Add blur background. This requires fixing a bug // that `SetRoundedCornerRadius()` does not work with transform or find a // solution to work around. @@ -235,24 +218,18 @@ 2, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::NORMAL)); if (chromeos::features::IsDarkLightModeEnabled()) { - label_parent_->SetBorder(std::make_unique<views::HighlightBorder>( + SetBorder(std::make_unique<views::HighlightBorder>( /*corner_radius=*/kSplitviewLabelRoundRectRadiusDp, views::HighlightBorder::Type::kHighlightBorder1, /*use_light_colors=*/false)); } } - protected: - gfx::Size CalculatePreferredSize() const override { - return label_parent_->GetPreferredSize(); - } - private: // True if the label view is the right/bottom side one, false if it is the // left/top one. const bool is_right_or_bottom_; - views::View* label_parent_ = nullptr; views::Label* label_ = nullptr; }; @@ -372,7 +349,7 @@ // animate when changing states, but not when bounds or orientation is // changed. void Layout(bool animate) { - // TODO(xdai|afakhry): Attempt to simplify this logic. + // TODO(crbug.com/1369702): Attempt to simplify this logic. const bool horizontal = SplitViewController::IsLayoutHorizontal(GetWidget()->GetNativeWindow()); const int display_width = horizontal ? width() : height(); @@ -533,20 +510,28 @@ if (horizontal) left_rotation_angle = 90.0 * (base::i18n::IsRTL() ? 1 : -1); - left_rotated_view_->OnBoundsUpdated(left_rotated_bounds, - /*angle=*/left_rotation_angle); - right_rotated_view_->OnBoundsUpdated(right_rotated_bounds, - /*angle=*/-left_rotation_angle); + const gfx::Transform left_rotation = ComputeRotateAroundCenterTransform( + left_rotated_bounds, left_rotation_angle); + const gfx::Transform right_rotation = ComputeRotateAroundCenterTransform( + right_rotated_bounds, -left_rotation_angle); + + left_rotated_view_->SetBoundsRect(left_rotated_bounds); + right_rotated_view_->SetBoundsRect(right_rotated_bounds); if (drag_ending_in_snap) { - // Reset the label transforms, in preparation for the next drag (if any). - left_rotated_view_->layer()->SetTransform(gfx::Transform()); - right_rotated_view_->layer()->SetTransform(gfx::Transform()); + left_rotated_view_->layer()->SetTransform(left_rotation); + right_rotated_view_->layer()->SetTransform(right_rotation); return; } - ui::Layer* preview_label_layer; - ui::Layer* other_highlight_label_layer; + // If we want to display a window can be snapped, one side will show a + // preview that is half the work area of what the window size would be; that + // is the `preview_label_layer`. The other side would fade and slide out; + // that is the `other_highlight_label_layer`. + ui::Layer *preview_label_layer; + ui::Layer *other_highlight_label_layer; + gfx::Transform preview_label_transform; + gfx::Transform other_highlight_label_transform; if (snap_position == SplitViewController::SnapPosition::kNone) { preview_label_layer = nullptr; other_highlight_label_layer = nullptr; @@ -554,9 +539,13 @@ dragged_window_)) { preview_label_layer = left_rotated_view_->layer(); other_highlight_label_layer = right_rotated_view_->layer(); + preview_label_transform = left_rotation; + other_highlight_label_transform = right_rotation; } else { preview_label_layer = right_rotated_view_->layer(); other_highlight_label_layer = left_rotated_view_->layer(); + preview_label_transform = right_rotation; + other_highlight_label_transform = left_rotation; } // Slide out the labels when a snap preview appears. This code also adjusts @@ -569,34 +558,33 @@ // opacity (whence a label still slides, not only for simplicity in // calculating the values below, but also to facilitate that the label // transform and the highlight transform have matching easing). - const float preview_label_distance = + float preview_label_delta = 0.5f * (preview_area_bounds.width() - highlight_width); - const float other_highlight_label_distance = + float other_highlight_label_delta = 0.5f * (highlight_width - other_highlight_width); - // Positive for right or down; negative for left or up. - float preview_label_delta, other_highlight_label_delta; - if (SplitViewController::IsPhysicalLeftOrTop(snap_position, - dragged_window_)) { - preview_label_delta = preview_label_distance; - other_highlight_label_delta = other_highlight_label_distance; - } else { - preview_label_delta = -preview_label_distance; - other_highlight_label_delta = -other_highlight_label_distance; + // Positive (unchanged) for left or up; negative for right or down. + if (!SplitViewController::IsPhysicalLeftOrTop(snap_position, + dragged_window_)) { + preview_label_delta = -preview_label_delta; + other_highlight_label_delta = -other_highlight_label_delta; } - // x-axis if |horizontal|; else y-axis. - gfx::Transform preview_label_transform, other_highlight_label_transform; - if (horizontal) { - preview_label_transform.Translate(preview_label_delta, 0.f); - other_highlight_label_transform.Translate(other_highlight_label_delta, - 0.f); - } else { - preview_label_transform.Translate(0.f, preview_label_delta); - other_highlight_label_transform.Translate(0.f, - other_highlight_label_delta); + // x-axis if `horizontal`; else y-axis. + gfx::Vector2dF preview_label_translation(preview_label_delta, 0.f); + gfx::Vector2dF other_highlight_label_translation( + other_highlight_label_delta, 0.f); + if (!horizontal) { + preview_label_translation.Transpose(); + other_highlight_label_translation.Transpose(); } + // Append the translation to the end of the current transform, which may + // have rotated the label. + preview_label_transform.PostTranslate(preview_label_translation); + other_highlight_label_transform.PostTranslate( + other_highlight_label_translation); + if (animate) { // Animate the labels sliding out. DoSplitviewTransformAnimation( @@ -608,7 +596,6 @@ SPLITVIEW_ANIMATION_OTHER_HIGHLIGHT_TEXT_SLIDE_OUT, other_highlight_label_transform, /*animation_observers=*/{}); } else { - // Put the labels where they belong. preview_label_layer->SetTransform(preview_label_transform); other_highlight_label_layer->SetTransform( other_highlight_label_transform); @@ -625,18 +612,23 @@ // Animate the labels sliding in. DoSplitviewTransformAnimation( preview_label_layer, SPLITVIEW_ANIMATION_PREVIEW_AREA_TEXT_SLIDE_IN, - gfx::Transform(), /*animation_observers=*/{}); + preview_label_transform, /*animation_observers=*/{}); DoSplitviewTransformAnimation( other_highlight_label_layer, - SPLITVIEW_ANIMATION_OTHER_HIGHLIGHT_TEXT_SLIDE_IN, gfx::Transform(), + SPLITVIEW_ANIMATION_OTHER_HIGHLIGHT_TEXT_SLIDE_IN, + other_highlight_label_transform, /*animation_observers=*/{}); } else { - // Put the labels where they belong. - preview_label_layer->SetTransform(gfx::Transform()); - other_highlight_label_layer->SetTransform(gfx::Transform()); + preview_label_layer->SetTransform(preview_label_transform); + other_highlight_label_layer->SetTransform( + other_highlight_label_transform); } return; } + + // Set a rotation without animation for the default cases. + left_rotated_view_->layer()->SetTransform(left_rotation); + right_rotated_view_->layer()->SetTransform(right_rotation); } SplitViewHighlightView* left_highlight_view_ = nullptr;
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 3fa9b15..150668d 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc
@@ -262,7 +262,7 @@ gfx::Transform old_transform(old_layer->transform()); gfx::Transform old_transform_in_root; old_transform_in_root.Translate(old_bounds.x(), old_bounds.y()); - old_transform_in_root.PreconcatTransform(old_transform); + old_transform_in_root.PreConcat(old_transform); old_transform_in_root.Translate(-old_bounds.x(), -old_bounds.y()); old_transform_in_root.TransformRect(&old_transformed_bounds); const gfx::Rect new_bounds(window->bounds());
diff --git a/ash/wm_mode/wm_mode_button_tray.cc b/ash/wm_mode/wm_mode_button_tray.cc index 11e49ab..1fe9883 100644 --- a/ash/wm_mode/wm_mode_button_tray.cc +++ b/ash/wm_mode/wm_mode_button_tray.cc
@@ -4,14 +4,19 @@ #include "ash/wm_mode/wm_mode_button_tray.h" +#include "ash/constants/tray_background_view_catalog.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/session/session_controller_impl.h" +#include "ash/shelf/shelf.h" #include "ash/shell.h" #include "ash/style/ash_color_id.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_container.h" #include "ash/wm_mode/wm_mode_controller.h" #include "ui/base/models/image_model.h" +#include "ui/events/event.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/paint_vector_icon.h" #include "ui/views/controls/image_view.h" namespace ash { @@ -25,7 +30,7 @@ } // namespace WmModeButtonTray::WmModeButtonTray(Shelf* shelf) - : TrayBackgroundView(shelf), + : TrayBackgroundView(shelf, TrayBackgroundViewCatalogName::kWmMode), image_view_(tray_container()->AddChildView( std::make_unique<views::ImageView>())) { image_view_->SetTooltipText(GetAccessibleNameForTray());
diff --git a/ash/wm_mode/wm_mode_button_tray.h b/ash/wm_mode/wm_mode_button_tray.h index 5faeb99..d7e5afae 100644 --- a/ash/wm_mode/wm_mode_button_tray.h +++ b/ash/wm_mode/wm_mode_button_tray.h
@@ -8,8 +8,19 @@ #include "ash/public/cpp/session/session_observer.h" #include "ash/system/tray/tray_background_view.h" +namespace ui { +class Event; +} + +namespace views { +class ImageView; +} + namespace ash { +class Shelf; +class TrayBubbleView; + // Defines a shelf tray button that is used to toggle WM Mode on and off. class WmModeButtonTray : public TrayBackgroundView, public SessionObserver { public:
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py index cb82177..ee8d58a 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py
@@ -11,7 +11,6 @@ import re import shutil import sys -import tempfile import zipfile import dex @@ -22,6 +21,12 @@ sys.path.insert(1, os.path.dirname(os.path.dirname(__file__))) from pylib.dex import dex_parser +_BLOCKLISTED_EXPECTATION_PATHS = [ + # A separate expectation file is created for these files. + 'clank/third_party/google3/pg_confs/' +] + + def _ParseOptions(): args = build_utils.ExpandFileArgs(sys.argv[1:]) parser = argparse.ArgumentParser() @@ -548,6 +553,10 @@ if exclude_generated and config.endswith('.resources.proguard.txt'): continue + # Exclude some confs from expectations. + if any(entry in config for entry in _BLOCKLISTED_EXPECTATION_PATHS): + continue + with open(config) as config_file: contents = config_file.read().rstrip()
diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1 index c934e8c0..0aae5602 100644 --- a/build/fuchsia/linux_internal.sdk.sha1 +++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@ -9.20220930.2.1 +9.20220930.4.1
diff --git a/buildtools/deps_revisions.gni b/buildtools/deps_revisions.gni index b653cd6..6a28432 100644 --- a/buildtools/deps_revisions.gni +++ b/buildtools/deps_revisions.gni
@@ -5,5 +5,5 @@ declare_args() { # Used to cause full rebuilds on libc++ rolls. This should be kept in sync # with the libcxx_revision vars in //DEPS. - libcxx_revision = "5ee02b299379896f90faa88f576be98c61156f26" + libcxx_revision = "591c99193d353c17b694d1692db75630082525b9" }
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index f8a41f7..94bf1cf 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -6020,7 +6020,7 @@ SetupDrawProperties(pending_layer(), 2.25f, 1.5f, 1.f); gfx::Transform translate1; translate1.Translate(0.25f, 0.5f); - pending_layer()->draw_properties().screen_space_transform.ConcatTransform( + pending_layer()->draw_properties().screen_space_transform.PostConcat( translate1); pending_layer()->draw_properties().target_space_transform = pending_layer()->draw_properties().screen_space_transform; @@ -6040,7 +6040,7 @@ SetupDrawProperties(pending_layer(), 2.25f, 1.5f, 1.f); gfx::Transform translate2; translate2.Translate(0.75f, 0.25f); - pending_layer()->draw_properties().screen_space_transform.ConcatTransform( + pending_layer()->draw_properties().screen_space_transform.PostConcat( translate2); pending_layer()->draw_properties().target_space_transform = pending_layer()->draw_properties().screen_space_transform; @@ -6058,7 +6058,7 @@ // Now change the device scale factor but keep the same total scale. Old tiles // with the same scale would become non-ideal and deleted on pending layers. SetupDrawProperties(pending_layer(), 2.25f, 1.0f, 1.f); - pending_layer()->draw_properties().screen_space_transform.ConcatTransform( + pending_layer()->draw_properties().screen_space_transform.PostConcat( translate2); pending_layer()->draw_properties().target_space_transform = pending_layer()->draw_properties().screen_space_transform; @@ -6086,7 +6086,7 @@ SetupDrawProperties(active_layer(), 2.25f, 1.5f, 1.f); gfx::Transform translate1; translate1.Translate(0.25f, 0.5f); - active_layer()->draw_properties().screen_space_transform.ConcatTransform( + active_layer()->draw_properties().screen_space_transform.PostConcat( translate1); active_layer()->draw_properties().target_space_transform = active_layer()->draw_properties().screen_space_transform; @@ -6106,7 +6106,7 @@ SetupDrawProperties(pending_layer(), 2.25f, 1.5f, 1.f); gfx::Transform translate2; translate2.Translate(0.75f, 0.25f); - pending_layer()->draw_properties().screen_space_transform.ConcatTransform( + pending_layer()->draw_properties().screen_space_transform.PostConcat( translate2); pending_layer()->draw_properties().target_space_transform = pending_layer()->draw_properties().screen_space_transform;
diff --git a/cc/trees/draw_properties_unittest.cc b/cc/trees/draw_properties_unittest.cc index 3404f6b..9c55a42 100644 --- a/cc/trees/draw_properties_unittest.cc +++ b/cc/trees/draw_properties_unittest.cc
@@ -921,9 +921,9 @@ } gfx::Transform composite; - composite.ConcatTransform(translate); - composite.ConcatTransform(scale); - composite.ConcatTransform(rotate); + composite.PostConcat(translate); + composite.PostConcat(scale); + composite.PostConcat(rotate); { SetDeviceTransform(composite); UpdateActiveTreeDrawProperties(device_scale_factor); @@ -3301,10 +3301,8 @@ contents_scale_factor); expected_perspective_surface_draw_transform.Translate( perspective_surface_offset); - expected_perspective_surface_draw_transform.PreconcatTransform( - perspective_matrix); - expected_perspective_surface_draw_transform.PreconcatTransform( - scale_small_matrix); + expected_perspective_surface_draw_transform.PreConcat(perspective_matrix); + expected_perspective_surface_draw_transform.PreConcat(scale_small_matrix); expected_perspective_surface_draw_transform.Scale( 1.0f / contents_scale_factor, 1.0f / contents_scale_factor); gfx::Transform expected_perspective_surface_layer_draw_transform;
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc index 0204347e..7d1e510c 100644 --- a/cc/trees/draw_property_utils.cc +++ b/cc/trees/draw_property_utils.cc
@@ -451,7 +451,7 @@ if (transform_tree_index != root_id) property_trees->transform_tree().CombineTransformsBetween( transform_tree_index, root_id, &to_3d_root); - to_3d_root.PreconcatTransform(root_node->to_parent); + to_3d_root.PreConcat(root_node->to_parent); return to_3d_root.IsBackFaceVisible(); } @@ -606,7 +606,7 @@ gfx::Transform::MakeTranslation(layer->offset_to_transform_parent().x(), layer->offset_to_transform_parent().y()); gfx::Transform ssxform = tree.ToScreen(layer->transform_tree_index()); - xform.ConcatTransform(ssxform); + xform.PostConcat(ssxform); return xform; }
diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc index 87594a7..f98f83df 100644 --- a/cc/trees/layer_tree_host_unittest_occlusion.cc +++ b/cc/trees/layer_tree_host_unittest_occlusion.cc
@@ -182,7 +182,7 @@ EXPECT_EQ(child_surface, child->render_target()); gfx::Transform transform = child_surface->draw_transform(); - transform.PreconcatTransform(child->DrawTransform()); + transform.PreConcat(child->DrawTransform()); EXPECT_OCCLUSION_EQ( Occlusion(transform, SimpleEnclosedRegion(), SimpleEnclosedRegion(gfx::Rect(13, 9, 10, 11))),
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc index 3dd0e67..783127a 100644 --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc
@@ -223,9 +223,9 @@ // A's from_screen will not produce the correct result. if (!dest || (dest->ancestors_are_invertible && dest->node_and_ancestors_are_flat)) { - transform->ConcatTransform(ToScreen(current->id)); + transform->PostConcat(ToScreen(current->id)); if (dest) - transform->ConcatTransform(FromScreen(dest->id)); + transform->PostConcat(FromScreen(dest->id)); return; } @@ -274,10 +274,10 @@ const TransformNode* node = Node(source_to_destination[index]); if (node->flattens_inherited_transform) combined_transform.FlattenTo2d(); - combined_transform.PreconcatTransform(node->to_parent); + combined_transform.PreConcat(node->to_parent); } - transform->ConcatTransform(combined_transform); + transform->PostConcat(combined_transform); } bool TransformTree::CombineInversesBetween(int source_id, @@ -291,9 +291,9 @@ // involved. if (current->ancestors_are_invertible && current->node_and_ancestors_are_flat) { - transform->PreconcatTransform(FromScreen(current->id)); + transform->PreConcat(FromScreen(current->id)); if (dest) - transform->PreconcatTransform(ToScreen(dest->id)); + transform->PreConcat(ToScreen(dest->id)); return true; } @@ -306,7 +306,7 @@ CombineTransformsBetween(dest_id, source_id, &dest_to_source); gfx::Transform source_to_dest; bool all_are_invertible = dest_to_source.GetInverse(&source_to_dest); - transform->PreconcatTransform(source_to_dest); + transform->PreConcat(source_to_dest); return all_are_invertible; } @@ -556,7 +556,7 @@ node->scroll_offset.OffsetFromOrigin()); transform.Translate(StickyPositionOffset(node)); transform.Translate(AnchorScrollOffset(node)); - transform.PreconcatTransform(node->local); + transform.PreConcat(node->local); transform.Translate3d(gfx::Point3F() - node->origin); node->set_to_parent(transform); @@ -569,7 +569,7 @@ gfx::Transform to_screen_space_transform = ToScreen(parent_node->id); if (node->flattens_inherited_transform) to_screen_space_transform.FlattenTo2d(); - to_screen_space_transform.PreconcatTransform(node->to_parent); + to_screen_space_transform.PreConcat(node->to_parent); node->ancestors_are_invertible = parent_node->ancestors_are_invertible; node->node_and_ancestors_are_flat = parent_node->node_and_ancestors_are_flat && node->to_parent.IsFlat(); @@ -705,7 +705,7 @@ set_needs_update(true); } - transform.ConcatTransform(root_from_screen); + transform.PostConcat(root_from_screen); TransformNode* contents_root_node = Node(kContentsRootPropertyNodeId); if (contents_root_node->local != transform) { contents_root_node->local = transform; @@ -1532,7 +1532,7 @@ gfx::Transform screen_space_transform = gfx::Transform::MakeTranslation( scroll_node->offset_to_transform_parent.x(), scroll_node->offset_to_transform_parent.y()); - screen_space_transform.ConcatTransform( + screen_space_transform.PostConcat( transform_tree.ToScreen(transform_node->id)); if (scroll_node->should_flatten) screen_space_transform.FlattenTo2d();
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni index b8d3f0f..1485e52 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni
@@ -834,6 +834,7 @@ "java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java", "java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java", "java/src/org/chromium/chrome/browser/offlinepages/OfflinePageOrigin.java", + "java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabData.java", "java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java", "java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java", "java/src/org/chromium/chrome/browser/offlinepages/PublishPageCallback.java",
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java index d40b0e7a..f76c4ff 100644 --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java
@@ -16,7 +16,7 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.feed.FeedActionDelegateImpl; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.feed.FeedReliabilityLogger; import org.chromium.chrome.browser.feed.FeedSurfaceCoordinator; import org.chromium.chrome.browser.feed.FeedSurfaceDelegate; @@ -83,7 +83,7 @@ SurfaceType.START_SURFACE, embeddingSurfaceConstructedTimeNs, swipeRefreshLayout, /*overScrollDisabled=*/true, parentView, new ExploreSurfaceActionDelegate( - snackbarManager, new BookmarkBridge(profile), crowButtonDelegate), + snackbarManager, new BookmarkModel(profile), crowButtonDelegate), HelpAndFeedbackLauncherImpl.getInstance(), tabModelSelector); mFeedSurfaceCoordinator.getView().setId(R.id.start_surface_explore_view); @@ -136,9 +136,9 @@ } private class ExploreSurfaceActionDelegate extends FeedActionDelegateImpl { - ExploreSurfaceActionDelegate(SnackbarManager snackbarManager, BookmarkBridge bookmarkBridge, + ExploreSurfaceActionDelegate(SnackbarManager snackbarManager, BookmarkModel bookmarkModel, CrowButtonDelegate crowButtonDelegate) { - super(mActivity, snackbarManager, mExploreSurfaceNavigationDelegate, bookmarkBridge, + super(mActivity, snackbarManager, mExploreSurfaceNavigationDelegate, bookmarkModel, crowButtonDelegate); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java index 51b19f7..970c319 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1730,7 +1730,7 @@ protected RootUiCoordinator createRootUiCoordinator() { return new TabbedRootUiCoordinator(this, this::onOmniboxFocusChanged, getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier, - mBookmarkBridgeSupplier, mTabBookmarkerSupplier, + mBookmarkModelSupplier, mTabBookmarkerSupplier, getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(), mStartSurfaceSupplier, mTabSwitcherSupplier, mIntentMetadataOneshotSupplier, mLayoutStateProviderSupplier, mStartSurfaceParentTabSupplier, @@ -1975,7 +1975,7 @@ getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(), getWindow().getDecorView(), this, mLayoutStateProviderSupplier, ReturnToChromeUtil.isStartSurfaceEnabled(this) ? mStartSurfaceSupplier : null, - mBookmarkBridgeSupplier, + mBookmarkModelSupplier, () -> getTabCreator(/*incognito=*/false) .launchUrl(NewTabPageUtils.encodeNtpUrl(
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java index 6204943..1b45aac 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -82,7 +82,6 @@ import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton; import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator; import org.chromium.chrome.browser.back_press.BackPressManager; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.bookmarks.TabBookmarker; @@ -290,7 +289,7 @@ protected TabModelSelectorProfileSupplier mTabModelProfileSupplier = new TabModelSelectorProfileSupplier(mTabModelSelectorSupplier); - protected ObservableSupplierImpl<BookmarkBridge> mBookmarkBridgeSupplier = + protected ObservableSupplierImpl<BookmarkModel> mBookmarkModelSupplier = new ObservableSupplierImpl<>(); protected ObservableSupplierImpl<TabBookmarker> mTabBookmarkerSupplier = new ObservableSupplierImpl<>(); @@ -472,9 +471,9 @@ // There's no corresponding call to removeObserver() for this addObserver() because // mTabModelProfileSupplier has the same lifecycle as this activity. mTabModelProfileSupplier.addObserver((profile) -> { - BookmarkBridge oldBridge = mBookmarkBridgeSupplier.get(); + BookmarkModel oldBridge = mBookmarkModelSupplier.get(); if (oldBridge != null) oldBridge.destroy(); - mBookmarkBridgeSupplier.set(profile == null ? null : new BookmarkBridge(profile)); + mBookmarkModelSupplier.set(profile == null ? null : new BookmarkModel(profile)); }); super.performPreInflationStartup(); @@ -520,7 +519,7 @@ // a recommended pattern. // clang-format off return new RootUiCoordinator(this, null, getShareDelegateSupplier(), - getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkBridgeSupplier, + getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkModelSupplier, mTabBookmarkerSupplier, getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), @@ -660,7 +659,7 @@ getTabModelSelectorSupplier(), mTabModelProfileSupplier, new ShareDelegateImpl.ShareSheetDelegate(), isCustomTab()); mShareDelegateSupplier.set(shareDelegate); - TabBookmarker tabBookmarker = new TabBookmarker(this, mBookmarkBridgeSupplier, + TabBookmarker tabBookmarker = new TabBookmarker(this, mBookmarkModelSupplier, mRootUiCoordinator::getBottomSheetController, this::getSnackbarManager, isCustomTab()); mTabBookmarkerSupplier.set(tabBookmarker); @@ -914,7 +913,7 @@ public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() { return new AppMenuPropertiesDelegateImpl(this, getActivityTabProvider(), getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(), - getWindow().getDecorView(), null, null, mBookmarkBridgeSupplier, + getWindow().getDecorView(), null, null, mBookmarkModelSupplier, /*incognitoReauthControllerOneshotSupplier=*/null); } @@ -1581,10 +1580,10 @@ destroyTabModels(); - if (mBookmarkBridgeSupplier != null) { - BookmarkBridge bookmarkBridge = mBookmarkBridgeSupplier.get(); - if (bookmarkBridge != null) bookmarkBridge.destroy(); - mBookmarkBridgeSupplier = null; + if (mBookmarkModelSupplier != null) { + BookmarkModel bookmarkModel = mBookmarkModelSupplier.get(); + if (bookmarkModel != null) bookmarkModel.destroy(); + mBookmarkModelSupplier = null; } if (mShareDelegateSupplier != null) { @@ -2495,7 +2494,7 @@ // TODO(crbug.com/1268976): Extract this code into a one-liner. List<BookmarkId> bookmarkIds = PowerBookmarkUtils.getBookmarkIdsWithSharedClusterIdForTab( - currentTab, mBookmarkBridgeSupplier.get()); + currentTab, mBookmarkModelSupplier.get()); SubscriptionsManager subscriptionsManager = null; if (ShoppingFeatures.isShoppingListEnabled()) { subscriptionsManager = new CommerceSubscriptionsServiceFactory() @@ -2503,7 +2502,7 @@ .getSubscriptionsManager(); } PowerBookmarkUtils.setPriceTrackingEnabledWithSnackbars(subscriptionsManager, - mBookmarkBridgeSupplier.get(), bookmarkIds, + mBookmarkModelSupplier.get(), bookmarkIds, /*enabled=*/false, mSnackbarManager, getResources()); RecordUserAction.record("MobileMenuDisablePriceTracking"); return true; @@ -2917,8 +2916,8 @@ @VisibleForTesting @Nullable - public BookmarkBridge getBookmarkBridgeForTesting() { - return mBookmarkBridgeSupplier.get(); + public BookmarkModel getBookmarkModelForTesting() { + return mBookmarkModelSupplier.get(); } @VisibleForTesting
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java index 0f09e99..274f6db 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
@@ -35,8 +35,8 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.banners.AppMenuVerbiage; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkFeatures; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.bookmarks.ReadingListFeatures; import org.chromium.chrome.browser.commerce.ShoppingFeatures; @@ -119,7 +119,7 @@ private CallbackController mIncognitoReauthCallbackController = new CallbackController(); private CallbackController mCallbackController = new CallbackController(); - private ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier; + private ObservableSupplier<BookmarkModel> mBookmarkModelSupplier; private boolean mUpdateMenuItemVisible; private ShareUtils mShareUtils; // Keeps track of which menu item was shown when installable app is detected. @@ -180,7 +180,7 @@ * @param layoutStateProvidersSupplier An {@link ObservableSupplier} for the * {@link LayoutStateProvider} associated with the containing activity. * @param startSurfaceSupplier An {@link OneshotSupplier} for the Start surface. - * @param bookmarkBridgeSupplier An {@link ObservableSupplier} for the {@link BookmarkBridge} + * @param bookmarkModelSupplier An {@link ObservableSupplier} for the {@link BookmarkModel} * @param incognitoReauthControllerOneshotSupplier An {@link OneshotSupplier} for the {@link * IncognitoReauthController} which is not null for tabbed Activity. */ @@ -189,7 +189,7 @@ TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView, @Nullable OneshotSupplier<LayoutStateProvider> layoutStateProvidersSupplier, @Nullable OneshotSupplier<StartSurface> startSurfaceSupplier, - ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + ObservableSupplier<BookmarkModel> bookmarkModelSupplier, @Nullable OneshotSupplier<IncognitoReauthController> incognitoReauthControllerOneshotSupplier) { mContext = context; @@ -228,7 +228,7 @@ startSurface.addStateChangeObserver(mStartSurfaceStateObserver); })); } - mBookmarkBridgeSupplier = bookmarkBridgeSupplier; + mBookmarkModelSupplier = bookmarkModelSupplier; mShareUtils = new ShareUtils(); } @@ -711,8 +711,8 @@ public boolean shouldCheckBookmarkStar(@NonNull Tab currentTab) { if (sItemBookmarkedForTesting != null) return sItemBookmarkedForTesting; - if (!mBookmarkBridgeSupplier.hasValue()) return false; - return mBookmarkBridgeSupplier.get().hasBookmarkIdForTab(currentTab); + if (!mBookmarkModelSupplier.hasValue()) return false; + return mBookmarkModelSupplier.get().hasBookmarkIdForTab(currentTab); } /** @@ -724,9 +724,9 @@ public boolean shouldHighlightReadingList(@NonNull Tab currentTab) { if (sItemInReadingListForTesting != null) return sItemInReadingListForTesting; - if (!mBookmarkBridgeSupplier.hasValue()) return false; + if (!mBookmarkModelSupplier.hasValue()) return false; BookmarkId existingBookmark = - mBookmarkBridgeSupplier.get().getUserBookmarkIdForTab(currentTab); + mBookmarkModelSupplier.get().getUserBookmarkIdForTab(currentTab); return existingBookmark != null && existingBookmark.getType() == BookmarkType.READING_LIST; } @@ -1084,13 +1084,13 @@ return; } - if (!mBookmarkBridgeSupplier.hasValue() || currentTab == null) { - // If the BookmarkBridge still isn't available, assume the bookmark menu item is not + if (!mBookmarkModelSupplier.hasValue() || currentTab == null) { + // If the BookmarkModel still isn't available, assume the bookmark menu item is not // editable. bookmarkMenuItemShortcut.setEnabled(false); } else { bookmarkMenuItemShortcut.setEnabled( - mBookmarkBridgeSupplier.get().isEditBookmarksEnabled()); + mBookmarkModelSupplier.get().isEditBookmarksEnabled()); } if (currentTab != null && shouldCheckBookmarkStar(currentTab)) { @@ -1115,13 +1115,13 @@ MenuItem bookmarkMenuItemAdd, MenuItem bookmarkMenuItemEdit, @Nullable Tab currentTab) { // If the bookmark menu item row is disabled, then hide both item. if (!BookmarkFeatures.isBookmarkMenuItemAsDedicatedRowEnabled() - || !mBookmarkBridgeSupplier.hasValue() || currentTab == null) { + || !mBookmarkModelSupplier.hasValue() || currentTab == null) { bookmarkMenuItemAdd.setVisible(false); bookmarkMenuItemEdit.setVisible(false); return; } - boolean editEnabled = mBookmarkBridgeSupplier.get().isEditBookmarksEnabled(); + boolean editEnabled = mBookmarkModelSupplier.get().isEditBookmarksEnabled(); bookmarkMenuItemAdd.setEnabled(editEnabled); bookmarkMenuItemEdit.setEnabled(editEnabled); @@ -1141,7 +1141,7 @@ @NonNull MenuItem readingListMenuItemDelete, @Nullable Tab currentTab) { // If the reading list item row is disabled, then hide both items. if (!ReadingListFeatures.isReadingListMenuItemAsDedicatedRowEnabled() - || !mBookmarkBridgeSupplier.hasValue() || currentTab == null + || !mBookmarkModelSupplier.hasValue() || currentTab == null || !ReadingListUtils.isReadingListSupported(currentTab.getUrl()) || mIsTypeSpecificBookmarkItemRowPresent) { readingListMenuItemAdd.setVisible(false); @@ -1151,7 +1151,7 @@ mIsTypeSpecificBookmarkItemRowPresent = true; - boolean editEnabled = mBookmarkBridgeSupplier.get().isEditBookmarksEnabled(); + boolean editEnabled = mBookmarkModelSupplier.get().isEditBookmarksEnabled(); readingListMenuItemAdd.setEnabled(editEnabled); readingListMenuItemDelete.setEnabled(editEnabled); @@ -1186,7 +1186,7 @@ } PowerBookmarkMeta existingBookmarkMeta = PowerBookmarkUtils.getBookmarkBookmarkMetaForTab( - mBookmarkBridgeSupplier.get(), currentTab); + mBookmarkModelSupplier.get(), currentTab); if (existingBookmarkMeta != null && !existingBookmarkMeta.hasShoppingSpecifics()) { startPriceTrackingMenuItem.setVisible(false); stopPriceTrackingMenuItem.setVisible(false); @@ -1195,14 +1195,14 @@ mIsTypeSpecificBookmarkItemRowPresent = true; - boolean editEnabled = mBookmarkBridgeSupplier.get().isEditBookmarksEnabled(); + boolean editEnabled = mBookmarkModelSupplier.get().isEditBookmarksEnabled(); startPriceTrackingMenuItem.setEnabled(editEnabled); stopPriceTrackingMenuItem.setEnabled(editEnabled); boolean priceTrackingEnabled = false; if (info != null) { priceTrackingEnabled = PowerBookmarkUtils.isPriceTrackingEnabledForClusterId( - info.productClusterId, mBookmarkBridgeSupplier.get()); + info.productClusterId, mBookmarkModelSupplier.get()); } startPriceTrackingMenuItem.setVisible(!priceTrackingEnabled); stopPriceTrackingMenuItem.setVisible(priceTrackingEnabled); @@ -1312,9 +1312,9 @@ mStartSurfaceState = state; } - void setBookmarkBridgeSupplierForTesting( - ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) { - mBookmarkBridgeSupplier = bookmarkBridgeSupplier; + void setBookmarkModelSupplierForTesting( + ObservableSupplier<BookmarkModel> bookmarkModelSupplier) { + mBookmarkModelSupplier = bookmarkModelSupplier; } /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java index 349ec4f..56bf16e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
@@ -8,7 +8,7 @@ import org.chromium.base.Callback; import org.chromium.base.ThreadUtils; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; import org.chromium.chrome.browser.feed.FeedActionDelegate; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -33,17 +33,17 @@ public class FeedActionDelegateImpl implements FeedActionDelegate { private static final String NEW_TAB_URL_HELP = "https://support.google.com/chrome/?p=new_tab"; private final NativePageNavigationDelegate mNavigationDelegate; - private final BookmarkBridge mBookmarkBridge; + private final BookmarkModel mBookmarkModel; private final Context mActivityContext; private final SnackbarManager mSnackbarManager; private final CrowButtonDelegate mCrowButtonDelegate; public FeedActionDelegateImpl(Context activityContext, SnackbarManager snackbarManager, - NativePageNavigationDelegate navigationDelegate, BookmarkBridge bookmarkBridge, + NativePageNavigationDelegate navigationDelegate, BookmarkModel bookmarkModel, CrowButtonDelegate crowButtonDelegate) { mActivityContext = activityContext; mNavigationDelegate = navigationDelegate; - mBookmarkBridge = bookmarkBridge; + mBookmarkModel = bookmarkModel; mSnackbarManager = snackbarManager; mCrowButtonDelegate = crowButtonDelegate; } @@ -95,10 +95,10 @@ @Override public void addToReadingList(String title, String url) { - mBookmarkBridge.finishLoadingBookmarkModel(() -> { + mBookmarkModel.finishLoadingBookmarkModel(() -> { assert ThreadUtils.runningOnUiThread(); BookmarkUtils.addToReadingList( - new GURL(url), title, mSnackbarManager, mBookmarkBridge, mActivityContext); + new GURL(url), title, mSnackbarManager, mBookmarkModel, mActivityContext); }); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java index 6b095bd..1ba9449 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java
@@ -5,7 +5,6 @@ package org.chromium.chrome.browser.bookmarks; import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import org.chromium.base.ObserverList; import org.chromium.chrome.browser.profiles.Profile; @@ -46,7 +45,6 @@ this(Profile.getLastUsedRegularProfile()); } - @VisibleForTesting public BookmarkModel(Profile profile) { super(profile); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java index 249e906..a9b1df4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkUtils.java
@@ -85,11 +85,11 @@ * Lookup the cluster id for the given tab and retrieve the corresponding bookmark id which * tracks the cluster id. * @param tab The tab to lookup the {@link BookmarkId} for. - * @param bookmarkBridge The {@link BookmarkBridge} used to lookup bookmark data. + * @param bookmarkModel The {@link BookmarkModel} used to lookup bookmark data. * @return The {@link BookmarkId} for the given tab or null. */ public static List<BookmarkId> getBookmarkIdsWithSharedClusterIdForTab( - @Nullable Tab tab, BookmarkBridge bookmarkBridge) { + @Nullable Tab tab, BookmarkModel bookmarkModel) { ShoppingService service = ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile()); @@ -99,20 +99,20 @@ if (info == null) return new ArrayList<>(); - return getBookmarkIdsForClusterId(info.productClusterId, bookmarkBridge); + return getBookmarkIdsForClusterId(info.productClusterId, bookmarkModel); } /** * Checks if the bookmark associated with the given cluster id has price tracking enabled. * @param clusterId The cluster id to lookup. - * @param bookmarkBridge The {@link BookmarkBridge} used to lookup bookmark data. + * @param bookmarkModel The {@link BookmarkModel} used to lookup bookmark data. * @return The {@link BookmarkId} for the given tab or null. */ public static boolean isPriceTrackingEnabledForClusterId( - Long clusterId, BookmarkBridge bookmarkBridge) { - List<BookmarkId> productIds = getBookmarkIdsForClusterId(clusterId, bookmarkBridge); + Long clusterId, BookmarkModel bookmarkModel) { + List<BookmarkId> productIds = getBookmarkIdsForClusterId(clusterId, bookmarkModel); for (BookmarkId productId : productIds) { - PowerBookmarkMeta meta = bookmarkBridge.getPowerBookmarkMeta(productId); + PowerBookmarkMeta meta = bookmarkModel.getPowerBookmarkMeta(productId); // Return any of the bookmarks with the given cluster id are price-tracked. if (meta != null && meta.hasShoppingSpecifics() @@ -150,26 +150,26 @@ * @param subscriptionsManager Manages price-tracking subscriptions. * @param snackbarManager Manages snackbars, non-null if a message should be sent to alert the * users of price-tracking events. - * @param bookmarkBridge The BookmarkBridge used to query bookmarks. + * @param bookmarkModel The BookmarkModel used to query bookmarks. * @param bookmarkId The BookmarkId to check the price-tracking status of. * @param enabled Whether price-tracking should be enabled. * @param callback The status callback. */ public static void setPriceTrackingEnabled(@Nullable SubscriptionsManager subscriptionsManager, - @NonNull BookmarkBridge bookmarkBridge, @Nullable BookmarkId bookmarkId, - boolean enabled, Callback<Integer> callback) { + @NonNull BookmarkModel bookmarkModel, @Nullable BookmarkId bookmarkId, boolean enabled, + Callback<Integer> callback) { if (bookmarkId == null || subscriptionsManager == null) return; - bookmarkBridge.finishLoadingBookmarkModel(() -> { - PowerBookmarkMeta meta = bookmarkBridge.getPowerBookmarkMeta(bookmarkId); + bookmarkModel.finishLoadingBookmarkModel(() -> { + PowerBookmarkMeta meta = bookmarkModel.getPowerBookmarkMeta(bookmarkId); if (meta == null || !meta.hasShoppingSpecifics()) return; CommerceSubscription subscription = createCommerceSubscriptionForPowerBookmarkMeta(meta); Callback<Integer> wrapperCallback = (status) -> { - if (bookmarkBridge.isDestroyed()) return; + if (bookmarkModel.isDestroyed()) return; if (status == SubscriptionsManager.StatusCode.OK) { - setPriceTrackingEnabledInMetadata(bookmarkBridge, bookmarkId, enabled); + setPriceTrackingEnabledInMetadata(bookmarkModel, bookmarkId, enabled); } callback.onResult(status); }; @@ -186,7 +186,7 @@ * Sets the price-tracking status of the given bookmarks. * * @param subscriptionsManager Manages price-tracking subscriptions. - * @param bookmarkBridge The BookmarkBridge used to query bookmarks. + * @param bookmarkModel The BookmarkModel used to query bookmarks. * @param bookmarkIds A list of BookmarkIds to set the price-tracking status of. * @param enabled Whether price-tracking should be enabled. * @param snackbarManager Manages snackbars, non-null if a message should be sent to alert the @@ -195,19 +195,19 @@ */ public static void setPriceTrackingEnabledWithSnackbars( @Nullable SubscriptionsManager subscriptionsManager, - @NonNull BookmarkBridge bookmarkBridge, @Nullable List<BookmarkId> bookmarkIds, + @NonNull BookmarkModel bookmarkModel, @Nullable List<BookmarkId> bookmarkIds, boolean enabled, SnackbarManager snackbarManager, Resources resources) { if (bookmarkIds == null || bookmarkIds.size() == 0 || subscriptionsManager == null) return; // Only the the first bookmark out of the list needs to query subscriptions manager. BookmarkId id = bookmarkIds.get(0); - setPriceTrackingEnabledWithSnackbars(subscriptionsManager, bookmarkBridge, id, enabled, + setPriceTrackingEnabledWithSnackbars(subscriptionsManager, bookmarkModel, id, enabled, snackbarManager, resources, (status) -> { if (status == SubscriptionsManager.StatusCode.OK) { // If the request was successful, set the metadata properly. for (int i = 1; i < bookmarkIds.size(); i++) { setPriceTrackingEnabledInMetadata( - bookmarkBridge, bookmarkIds.get(i), enabled); + bookmarkModel, bookmarkIds.get(i), enabled); } } }); @@ -217,7 +217,7 @@ * Checks if the given {@link BookmarkId} is price-tracked. * * @param subscriptionsManager Manages price-tracking subscriptions. - * @param bookmarkBridge The BookmarkBridge used to query bookmarks. + * @param bookmarkModel The BookmarkModel used to query bookmarks. * @param bookmarkId The BookmarkId to check the price-tracking status of. * @param enabled Whether price-tracking should be enabled. * @param snackbarManager Manages snackbars, non-null if a message should be sent to alert the @@ -228,15 +228,14 @@ */ public static void setPriceTrackingEnabledWithSnackbars( @Nullable SubscriptionsManager subscriptionsManager, - @NonNull BookmarkBridge bookmarkBridge, @Nullable BookmarkId bookmarkId, - boolean enabled, SnackbarManager snackbarManager, Resources resources, - Callback<Integer> callback) { + @NonNull BookmarkModel bookmarkModel, @Nullable BookmarkId bookmarkId, boolean enabled, + SnackbarManager snackbarManager, Resources resources, Callback<Integer> callback) { // Action to retry the subscription request on failure. SnackbarManager.SnackbarController retrySnackbarControllerAction = new SnackbarManager.SnackbarController() { @Override public void onAction(Object actionData) { - setPriceTrackingEnabledWithSnackbars(subscriptionsManager, bookmarkBridge, + setPriceTrackingEnabledWithSnackbars(subscriptionsManager, bookmarkModel, bookmarkId, enabled, snackbarManager, resources, callback); } }; @@ -262,26 +261,26 @@ callback.onResult(status); }; setPriceTrackingEnabled( - subscriptionsManager, bookmarkBridge, bookmarkId, enabled, wrapperCallback); + subscriptionsManager, bookmarkModel, bookmarkId, enabled, wrapperCallback); } /** * Update to the given price for the given bookmark id. * - * @param bookmarkBridge Used to read/write bookmark data. + * @param bookmarkModel Used to read/write bookmark data. * @param bookmarkId The bookmark id to update. * @param price The price to update to. */ - public static void updatePriceForBookmarkId(@NonNull BookmarkBridge bookmarkBridge, + public static void updatePriceForBookmarkId(@NonNull BookmarkModel bookmarkModel, @NonNull BookmarkId bookmarkId, @NonNull org.chromium.components.commerce.PriceTracking.ProductPrice price) { - PowerBookmarkMeta meta = bookmarkBridge.getPowerBookmarkMeta(bookmarkId); + PowerBookmarkMeta meta = bookmarkModel.getPowerBookmarkMeta(bookmarkId); if (meta == null) return; ProductPrice newPrice = ProductPrice.newBuilder() .setCurrencyCode(price.getCurrencyCode()) .setAmountMicros(price.getAmountMicros()) .build(); - bookmarkBridge.setPowerBookmarkMeta(bookmarkId, + bookmarkModel.setPowerBookmarkMeta(bookmarkId, PowerBookmarkMeta.newBuilder(meta) .setShoppingSpecifics( ShoppingSpecifics.newBuilder(meta.getShoppingSpecifics()) @@ -292,18 +291,18 @@ /** * Gets the power bookmark associated with the given tab. - * @param bookmarkBridge The {@link BookmarkBridge} to retrieve bookmark info. + * @param bookmarkModel The {@link BookmarkModel} to retrieve bookmark info. * @param tab The current {@link Tab} to check. * @return The {@link PowerBookmarkMeta} associated with the given tab or null. */ public static @Nullable PowerBookmarkMeta getBookmarkBookmarkMetaForTab( - @Nullable BookmarkBridge bookmarkBridge, @Nullable Tab tab) { - if (bookmarkBridge == null || tab == null) return null; + @Nullable BookmarkModel bookmarkModel, @Nullable Tab tab) { + if (bookmarkModel == null || tab == null) return null; - BookmarkId bookmarkId = bookmarkBridge.getUserBookmarkIdForTab(tab); + BookmarkId bookmarkId = bookmarkModel.getUserBookmarkIdForTab(tab); if (bookmarkId == null) return null; - return bookmarkBridge.getPowerBookmarkMeta(bookmarkId); + return bookmarkModel.getPowerBookmarkMeta(bookmarkId); } /** @return Whether the price tracking flag is set in the bookmark's meta. */ @@ -315,13 +314,13 @@ } private static List<BookmarkId> getBookmarkIdsForClusterId( - Long clusterId, BookmarkBridge bookmarkBridge) { + Long clusterId, BookmarkModel bookmarkModel) { List<BookmarkId> results = new ArrayList<>(); - List<BookmarkId> products = bookmarkBridge.getBookmarksOfType(PowerBookmarkType.SHOPPING); + List<BookmarkId> products = bookmarkModel.getBookmarksOfType(PowerBookmarkType.SHOPPING); if (products == null || products.size() == 0) return results; for (BookmarkId product : products) { - PowerBookmarkMeta meta = bookmarkBridge.getPowerBookmarkMeta(product); + PowerBookmarkMeta meta = bookmarkModel.getPowerBookmarkMeta(product); if (meta == null || !meta.hasShoppingSpecifics()) continue; Long productClusterId = meta.getShoppingSpecifics().getProductClusterId(); @@ -333,12 +332,12 @@ return results; } - private static void setPriceTrackingEnabledInMetadata(@NonNull BookmarkBridge bookmarkBridge, + private static void setPriceTrackingEnabledInMetadata(@NonNull BookmarkModel bookmarkModel, @Nullable BookmarkId bookmarkId, boolean enabled) { - PowerBookmarkMeta meta = bookmarkBridge.getPowerBookmarkMeta(bookmarkId); + PowerBookmarkMeta meta = bookmarkModel.getPowerBookmarkMeta(bookmarkId); if (meta == null || !meta.hasShoppingSpecifics()) return; - bookmarkBridge.setPowerBookmarkMeta(bookmarkId, + bookmarkModel.setPowerBookmarkMeta(bookmarkId, PowerBookmarkMeta.newBuilder(meta) .setShoppingSpecifics( ShoppingSpecifics.newBuilder(meta.getShoppingSpecifics()) @@ -369,12 +368,12 @@ * 2. The service has a USER_MANAGED subscription that is not in the user's local bookmarks. In * this case we remove the subscription from the service. * - * @param bookmarkBridge A means of accessing the user's bookmarks. + * @param bookmarkModel A means of accessing the user's bookmarks. * @param subscriptionsManager A handle to the subscriptions backend. */ public static void validateBookmarkedCommerceSubscriptions( - BookmarkBridge bookmarkBridge, SubscriptionsManager subscriptionsManager) { - if (subscriptionsManager == null || bookmarkBridge == null) return; + BookmarkModel bookmarkModel, SubscriptionsManager subscriptionsManager) { + if (subscriptionsManager == null || bookmarkModel == null) return; Runnable updater = () -> { // At this point native should be ready since the bookmark model has loaded. @@ -386,20 +385,20 @@ subscriptionsManager.getSubscriptions( CommerceSubscriptionType.PRICE_TRACK, true, (subscriptions) -> { doBookmarkedSubscriptionValidation( - bookmarkBridge, subscriptionsManager, subscriptions); + bookmarkModel, subscriptionsManager, subscriptions); }); }; // Make sure the bookmark model is loaded prior to attempting to operate on it. Otherwise // wait and then execute. - if (bookmarkBridge.isBookmarkModelLoaded()) { + if (bookmarkModel.isBookmarkModelLoaded()) { updater.run(); } else { - bookmarkBridge.addObserver(new BookmarkModelObserver() { + bookmarkModel.addObserver(new BookmarkModelObserver() { @Override public void bookmarkModelLoaded() { updater.run(); - bookmarkBridge.removeObserver(this); + bookmarkModel.removeObserver(this); } @Override @@ -408,13 +407,13 @@ } } - /** @see #validateBookmarkedCommerceSubscriptions(BookmarkBridge, SubscriptionsManager) */ - private static void doBookmarkedSubscriptionValidation(BookmarkBridge bookmarkBridge, + /** @see #validateBookmarkedCommerceSubscriptions(BookmarkModel, SubscriptionsManager) */ + private static void doBookmarkedSubscriptionValidation(BookmarkModel bookmarkModel, SubscriptionsManager subscriptionsManager, List<CommerceSubscription> subscriptions) { - if (bookmarkBridge.isDestroyed() || subscriptions == null) return; + if (bookmarkModel.isDestroyed() || subscriptions == null) return; List<BookmarkId> products = - bookmarkBridge.searchBookmarks("", null, PowerBookmarkType.SHOPPING, -1); + bookmarkModel.searchBookmarks("", null, PowerBookmarkType.SHOPPING, -1); // Even if we get nothing back from bookmarks, run through the process since we might need // to unsubscribe from products on the backend. @@ -440,7 +439,7 @@ // Iterate over all the bookmarked products and ensure the ones that are tracked agree // with the ones that the subscription manager thinks are tracked. for (BookmarkId product : products) { - PowerBookmarkMeta meta = bookmarkBridge.getPowerBookmarkMeta(product); + PowerBookmarkMeta meta = bookmarkModel.getPowerBookmarkMeta(product); if (!meta.hasShoppingSpecifics()) continue; ShoppingSpecifics specifics = meta.getShoppingSpecifics(); @@ -457,7 +456,7 @@ // to false. ShoppingSpecifics newSpecifics = ShoppingSpecifics.newBuilder(specifics).setIsPriceTracked(false).build(); - bookmarkBridge.setPowerBookmarkMeta(product, + bookmarkModel.setPowerBookmarkMeta(product, PowerBookmarkMeta.newBuilder(meta).setShoppingSpecifics(newSpecifics).build()); bookmarkFixCount++; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java index 61cf5a0..f19427f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java
@@ -27,7 +27,7 @@ */ public class TabBookmarker { private final Activity mActivity; - private final Supplier<BookmarkBridge> mBookmarkBridgeSupplier; + private final Supplier<BookmarkModel> mBookmarkModelSupplier; private final Supplier<BottomSheetController> mBottomSheetControllerSupplier; private final Supplier<SnackbarManager> mSnackbarManagerSupplier; private final boolean mIsCustomTab; @@ -35,18 +35,18 @@ /** * Constructor. * @param activity The current activity. - * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile. + * @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile. * @param bottomSheetControllerSupplier Supplier of the {@link BottomSheetController} for this * activity. * @param snackbarManagerSupplier Supplier of the {@link SnackbarManager}. * @param isCustomTab Whether this is a custom tab activity. */ public TabBookmarker(@NonNull Activity activity, - @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier, @NonNull Supplier<BottomSheetController> bottomSheetControllerSupplier, @NonNull Supplier<SnackbarManager> snackbarManagerSupplier, boolean isCustomTab) { mActivity = activity; - mBookmarkBridgeSupplier = bookmarkBridgeSupplier; + mBookmarkModelSupplier = bookmarkModelSupplier; mBottomSheetControllerSupplier = bottomSheetControllerSupplier; mSnackbarManagerSupplier = snackbarManagerSupplier; mIsCustomTab = isCustomTab; @@ -78,7 +78,7 @@ * @param currentTab The tab being currently shown. */ public void startOrModifyPriceTracking(Tab currentTab) { - BookmarkId bookmarkId = mBookmarkBridgeSupplier.get().getUserBookmarkIdForTab(currentTab); + BookmarkId bookmarkId = mBookmarkModelSupplier.get().getUserBookmarkIdForTab(currentTab); if (bookmarkId == null) { addOrEditBookmark(currentTab, BookmarkType.NORMAL, /* fromExplicitTrackUi=*/true); } else { @@ -96,7 +96,7 @@ } // Defense in depth against the UI being erroneously enabled. - BookmarkBridge bridge = mBookmarkBridgeSupplier.get(); + BookmarkModel bridge = mBookmarkModelSupplier.get(); if (bridge == null || !bridge.isEditBookmarksEnabled()) { assert false; return;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java index ab88a91..8fb5565d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java
@@ -8,8 +8,11 @@ import android.content.Context; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.drawable.ColorDrawable; import android.view.ViewGroup; +import android.widget.ImageView; +import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Px; @@ -35,6 +38,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.toolbar.ToolbarManager; +import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; import org.chromium.components.browser_ui.widget.chips.ChipProperties; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; import org.chromium.components.browser_ui.widget.scrim.ScrimProperties; @@ -42,6 +46,7 @@ import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.resources.ResourceManager; +import org.chromium.ui.util.ColorUtils; import java.util.List; @@ -877,6 +882,7 @@ // Details in https://crbug.com/848922. float statusBarAlpha = (maxBrightness - basePageBrightness) / (maxBrightness - minBrightness); + if (!getCanHideAndroidBrowserControls()) scrimAndroidToolbar(statusBarAlpha); if (statusBarAlpha == 0.0) { if (mScrimCoordinator != null) mScrimCoordinator.hideScrim(false); mScrimProperties = null; @@ -901,6 +907,39 @@ } } + private void scrimAndroidToolbar(float scrimFraction) { + int toolbarColor = mToolbarManager.getToolbar().getPrimaryColor(); + if (scrimFraction > 0.f) { + toolbarColor = getScrimmedColor(mActivity, toolbarColor, scrimFraction); + } + ToolbarLayout toolbarLayout = (ToolbarLayout) mActivity.findViewById(R.id.toolbar); + ColorDrawable toolbarBackground = (ColorDrawable) toolbarLayout.getBackground(); + toolbarBackground.setColor(toolbarColor); + + scrimImage(R.id.drag_handlebar, R.color.drag_handlebar_color_baseline, scrimFraction); + scrimImage(R.id.toolbar_hairline, R.color.divider_line_bg_color_baseline, scrimFraction); + } + + private void scrimImage(int viewId, int colorId, float scrimFraction) { + ImageView view = (ImageView) mActivity.findViewById(viewId); + if (view == null) return; + int baseColor = mActivity.getColor(colorId); + if (scrimFraction > 0.f) { + view.setColorFilter(getScrimmedColor(mActivity, baseColor, scrimFraction)); + } else { + view.clearColorFilter(); + } + } + + private static @ColorInt int getScrimmedColor( + Context context, @ColorInt int baseColor, float scrimFraction) { + int scrimColor = context.getResources().getColor(R.color.default_scrim_color); + float scrimColorAlpha = (scrimColor >>> 24) / 255f; + int scrimColorOpaque = scrimColor & 0xFF000000; + return ColorUtils.getColorWithOverlay( + baseColor, scrimColorOpaque, scrimFraction * scrimColorAlpha, false); + } + // ============================================================================================ // Selection position // ============================================================================================
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java index b7bfb179..5b13cee 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
@@ -153,7 +153,7 @@ // clang-format off mBaseCustomTabRootUiCoordinator = new BaseCustomTabRootUiCoordinator(this, getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier, - mBookmarkBridgeSupplier, mTabBookmarkerSupplier, + mBookmarkModelSupplier, mTabBookmarkerSupplier, getContextualSearchManagerSupplier(), getTabModelSelectorSupplier(), getBrowserControlsManager(), getWindowAndroid(), getLifecycleDispatcher(), getLayoutManagerSupplier(), @@ -382,7 +382,7 @@ == BrowserServicesIntentDataProvider.CLOSE_BUTTON_POSITION_END; return new CustomTabAppMenuPropertiesDelegate(this, getActivityTabProvider(), getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(), - getWindow().getDecorView(), mBookmarkBridgeSupplier, mVerifier, + getWindow().getDecorView(), mBookmarkModelSupplier, mVerifier, mIntentDataProvider.getUiType(), mIntentDataProvider.getMenuTitles(), mIntentDataProvider.isOpenedByChrome(), mIntentDataProvider.shouldShowShareMenuItem(),
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java index 7435a8e..e92c121a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
@@ -22,7 +22,7 @@ import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.app.reengagement.ReengagementActivity; import org.chromium.chrome.browser.back_press.BackPressManager; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.TabBookmarker; import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -86,7 +86,7 @@ * @param shareDelegateSupplier Supplies the {@link ShareDelegate}. * @param tabProvider The {@link ActivityTabProvider} to get current tab of the activity. * @param profileSupplier Supplier of the currently applicable profile. - * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile. + * @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile. * @param tabBookmarkerSupplier Supplier of {@link TabBookmarker} for bookmarking a given tab. * @param contextualSearchManagerSupplier Supplier of the {@link ContextualSearchManager}. * @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}. @@ -120,7 +120,7 @@ @NonNull ObservableSupplier<ShareDelegate> shareDelegateSupplier, @NonNull ActivityTabProvider tabProvider, @NonNull ObservableSupplier<Profile> profileSupplier, - @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier, @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier, @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier, @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier, @@ -152,7 +152,7 @@ @NonNull Supplier<CustomTabActivityTabController> tabController) { // clang-format off super(activity, null, shareDelegateSupplier, tabProvider, - profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier, + profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier, contextualSearchManagerSupplier, tabModelSelectorSupplier, new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(), () -> null,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java index 6ca0f5a..0035d360 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.DefaultBrowserInfo; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider.CustomTabsUiType; import org.chromium.chrome.browser.browserservices.ui.controller.Verifier; import org.chromium.chrome.browser.firstrun.FirstRunStatus; @@ -69,12 +69,12 @@ ActivityTabProvider activityTabProvider, MultiWindowModeStateDispatcher multiWindowModeStateDispatcher, TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView, - ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, Verifier verifier, + ObservableSupplier<BookmarkModel> bookmarkModelSupplier, Verifier verifier, @CustomTabsUiType final int uiType, List<String> menuEntries, boolean isOpenedByChrome, boolean showShare, boolean showStar, boolean showDownload, boolean isIncognito, boolean isStartIconMenu) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, - toolbarManager, decorView, null, null, bookmarkBridgeSupplier, null); + toolbarManager, decorView, null, null, bookmarkModelSupplier, null); mVerifier = verifier; mUiType = uiType; mMenuEntries = menuEntries;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java index b44cfea..c7990ad 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
@@ -198,7 +198,7 @@ */ private @NonNull String getHomepageUriIgnoringEnabledState() { if (HomepagePolicyManager.isHomepageManagedByPolicy()) { - return HomepagePolicyManager.getHomepageUrl(); + return HomepagePolicyManager.getHomepageUrl().getSpec(); } if (getPrefHomepageUseChromeNTP()) { return UrlConstants.NTP_NON_NATIVE_URL;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java index 1476bb3..ee772060c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java
@@ -4,8 +4,6 @@ package org.chromium.chrome.browser.homepage; -import android.text.TextUtils; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -20,6 +18,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.prefs.PrefService; import org.chromium.components.user_prefs.UserPrefs; +import org.chromium.url.GURL; /** * Provides information for the home page related policies. @@ -42,7 +41,9 @@ private static PrefService sPrefServiceForTesting; private boolean mIsHomepageLocationPolicyEnabled; - private String mHomepage; + + @NonNull + private GURL mHomepage; private boolean mIsInitializedWithNative; private PrefChangeRegistrar mPrefChangeRegistrar; @@ -73,7 +74,7 @@ * @return The homepage URL from the homepage preference. */ @NonNull - public static String getHomepageUrl() { + public static GURL getHomepageUrl() { return getInstance().getHomepagePreference(); } @@ -106,10 +107,25 @@ // Update feature flag related setting mSharedPreferenceManager = SharedPreferencesManager.getInstance(); - mHomepage = mSharedPreferenceManager.readString( - ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY, ""); - mIsHomepageLocationPolicyEnabled = !TextUtils.isEmpty(mHomepage); + String homepageLocationPolicyGurlSerialized = mSharedPreferenceManager.readString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, null); + if (homepageLocationPolicyGurlSerialized != null) { + mHomepage = GURL.deserialize(homepageLocationPolicyGurlSerialized); + } else { + String homepageLocationPolicy; + homepageLocationPolicy = mSharedPreferenceManager.readString( + ChromePreferenceKeys.DEPRECATED_HOMEPAGE_LOCATION_POLICY, null); + if (homepageLocationPolicy != null) { + // This url comes from a native gurl that is written into PrefService as a string, + // so we shouldn't need to call fixupUrl. + mHomepage = new GURL(homepageLocationPolicy); + } else { + mHomepage = GURL.emptyGURL(); + } + } + + mIsHomepageLocationPolicyEnabled = !mHomepage.isEmpty(); ChromeBrowserInitializer.getInstance().runNowOrAfterFullBrowserStarted( this::onFinishNativeInitialization); } @@ -159,21 +175,27 @@ assert mIsInitializedWithNative; PrefService prefService = getPrefService(); boolean isEnabled = prefService.isManagedPreference(Pref.HOME_PAGE); - String homepage = ""; + GURL homepage = GURL.emptyGURL(); if (isEnabled) { - homepage = prefService.getString(Pref.HOME_PAGE); - assert homepage != null; + String homepagePref = prefService.getString(Pref.HOME_PAGE); + assert homepagePref != null; + // This url comes from a native gurl that is written into PrefService as a string, + // so we shouldn't need to call fixupUrl. + homepage = new GURL(homepagePref); } // Early return when nothing changes - if (isEnabled == mIsHomepageLocationPolicyEnabled && homepage.equals(mHomepage)) return; + if (isEnabled == mIsHomepageLocationPolicyEnabled && homepage != null + && homepage.equals(mHomepage)) { + return; + } mIsHomepageLocationPolicyEnabled = isEnabled; mHomepage = homepage; // Update shared preference mSharedPreferenceManager.writeString( - ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY, mHomepage); + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, mHomepage.serialize()); // Update the listeners about the status for (HomepagePolicyStateListener listener : mListeners) { @@ -205,7 +227,7 @@ @VisibleForTesting @NonNull - public String getHomepagePreference() { + public GURL getHomepagePreference() { assert mIsHomepageLocationPolicyEnabled; return mHomepage; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java index 55ac4b1e..aeb3547e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
@@ -125,7 +125,7 @@ */ private String getHomepageForEditText() { if (HomepagePolicyManager.isHomepageManagedByPolicy()) { - return HomepagePolicyManager.getHomepageUrl(); + return HomepagePolicyManager.getHomepageUrl().getSpec(); } String defaultUrl = HomepageManager.getDefaultHomepageUri();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java index 3b3aff3..0fdc734 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -32,7 +32,7 @@ import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.feed.FeedActionDelegateImpl; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.compositor.layouts.content.InvalidationAwareThumbnailProvider; import org.chromium.chrome.browser.download.DownloadManagerService; @@ -498,7 +498,7 @@ mNewTabPageLayout = (NewTabPageLayout) inflater.inflate(R.layout.new_tab_page_layout, null); FeedActionDelegate actionDelegate = new FeedActionDelegateImpl(activity, snackbarManager, - mNewTabPageManager.getNavigationDelegate(), new BookmarkBridge(profile), + mNewTabPageManager.getNavigationDelegate(), new BookmarkModel(profile), crowButtonDelegate) { @Override public void openHelpPage() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabData.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabData.java new file mode 100644 index 0000000..1e10a46 --- /dev/null +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabData.java
@@ -0,0 +1,90 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.chrome.browser.offlinepages; + +import androidx.annotation.NonNull; + +import org.chromium.base.UserData; +import org.chromium.base.metrics.RecordHistogram; +import org.chromium.chrome.browser.tab.Tab; + +/** + * UserData object that holds the OfflinePage visibility status for the associated tab. This can be + * used to check the offline status of a tab without calling into native. + */ +public class OfflinePageTabData implements UserData { + private static final Class<OfflinePageTabData> USER_DATA_KEY = OfflinePageTabData.class; + private static final double SAMPLE_PROBABILITY = 0.01; + + /** + * Returns whether the given tab is showing an offline page. Returns {@code false} for a {@code + * null} or un-initialized tab. + */ + public static boolean isShowingOfflinePage(Tab tab) { + if (tab == null || !tab.isInitialized()) return false; + OfflinePageTabData offlinePageTabData = get(tab); + if (offlinePageTabData == null) return false; + boolean result = offlinePageTabData.isTabShowingOfflinePage(); + // Check to see if the cached result is correct, but only once every 100 calls. + if (Math.random() < SAMPLE_PROBABILITY) { + boolean freshResult = OfflinePageUtils.isOfflinePage(tab); + RecordHistogram.recordBooleanHistogram( + "OfflinePages.CachedOfflineStatusValid", freshResult == result); + result = freshResult; + } + + return result; + } + + /** + * Returns whether the given tab is showing a trusted offline page. Returns {@code false} for a + * {@code null} or un-initialized tab. + */ + public static boolean isShowingTrustedOfflinePage(Tab tab) { + if (tab == null || !tab.isInitialized()) return false; + OfflinePageTabData offlinePageTabData = get(tab); + return offlinePageTabData != null && offlinePageTabData.isTabShowingTrustedOfflinePage(); + } + + /** + * Returns the OfflinePageTabData instance for the given Tab object, creating it if does not yet + * exist. This can never return {@code null}, but is not safe to call if the tab has been + * destroyed. + */ + static OfflinePageTabData from(@NonNull Tab tab) { + assert tab.isInitialized(); + OfflinePageTabData offlinePageTabData = get(tab); + if (offlinePageTabData == null) { + offlinePageTabData = + tab.getUserDataHost().setUserData(USER_DATA_KEY, new OfflinePageTabData()); + } + return offlinePageTabData; + } + + private static OfflinePageTabData get(Tab tab) { + return tab.getUserDataHost().getUserData(USER_DATA_KEY); + } + + private boolean mIsTabShowingOfflinePage; + private boolean mIsTabShowingTrustedOfflinePage; + + OfflinePageTabData() {} + + public boolean isTabShowingOfflinePage() { + return mIsTabShowingOfflinePage; + } + + public boolean isTabShowingTrustedOfflinePage() { + return mIsTabShowingTrustedOfflinePage; + } + + void setIsTabShowingOfflinePage(boolean isTabShowingOfflinePage) { + mIsTabShowingOfflinePage = isTabShowingOfflinePage; + } + + void setIsTabShowingTrustedOfflinePage(boolean isTabShowingTrustedOfflinePage) { + mIsTabShowingTrustedOfflinePage = isTabShowingTrustedOfflinePage; + } +}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java index cfd83a3..b248f6b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java
@@ -180,18 +180,25 @@ Log.d(TAG, "onUrlUpdated"); if (!OfflinePageUtils.isOfflinePage(tab)) { stopObservingTab(tab); - } else { - if (isObservingTab(tab)) { - mObservedTabs.get(tab.getId()).isLoaded = false; - mObservedTabs.get(tab.getId()).wasSnackbarSeen = false; - } + } else if (isObservingTab(tab)) { + mObservedTabs.get(tab.getId()).isLoaded = false; + mObservedTabs.get(tab.getId()).wasSnackbarSeen = false; } // In case any snackbars are showing, dismiss them before we navigate away. mSnackbarManager.dismissSnackbars(mSnackbarController); } void startObservingTab(Tab tab) { - if (!OfflinePageUtils.isOfflinePage(tab)) return; + assert tab.isInitialized(); + boolean isOfflinePage = OfflinePageUtils.isOfflinePage(tab); + // Cache the offline state of the tab so we don't have to go to native every time we want to + // check this. + OfflinePageTabData offlinePageTabData = OfflinePageTabData.from(tab); + offlinePageTabData.setIsTabShowingOfflinePage(isOfflinePage); + offlinePageTabData.setIsTabShowingTrustedOfflinePage( + OfflinePageUtils.isShowingTrustedOfflinePage(tab.getWebContents())); + + if (!isOfflinePage) return; mCurrentTab = tab; @@ -217,6 +224,13 @@ void stopObservingTab(Tab tab) { // If we are observing the tab, stop. if (isObservingTab(tab)) { + assert tab.isInitialized(); + // Reset the cached offline state of the tab so we don't have to go to native every time + // we want to check this. + OfflinePageTabData offlinePageTabData = OfflinePageTabData.from(tab); + offlinePageTabData.setIsTabShowingOfflinePage(false); + offlinePageTabData.setIsTabShowingTrustedOfflinePage(false); + mObservedTabs.remove(tab.getId()); tab.removeObserver(this); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java index 6bd24abe..1775661 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/read_later/ReadingListUtils.java
@@ -10,7 +10,6 @@ import androidx.annotation.Nullable; import org.chromium.base.Log; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkUndoController; import org.chromium.chrome.browser.bookmarks.BookmarkUtils; @@ -73,14 +72,14 @@ * * @param activity The current Activity. * @param bottomsheetController The BottomsheetController, used to show the save flow. - * @param bookmarkBridge The BookmarkBridge which is used for bookmark operations. + * @param bookmarkModel The BookmarkModel which is used for bookmark operations. * @param bookmarkId The existing BookmarkId. * @param bookmarkType The intended bookmark type. * @return Whether the given bookmark item has been type-swapped and the save flow shown. */ public static boolean maybeTypeSwapAndShowSaveFlow(@NonNull Activity activity, @NonNull BottomSheetController bottomsheetController, - @NonNull BookmarkBridge bookmarkBridge, @NonNull BookmarkId bookmarkId, + @NonNull BookmarkModel bookmarkModel, @NonNull BookmarkId bookmarkId, @BookmarkType int bookmarkType) { if (!ReadingListFeatures.shouldAllowBookmarkTypeSwapping() || bookmarkId == null || bookmarkId.getType() != BookmarkType.NORMAL @@ -93,8 +92,8 @@ List<BookmarkId> bookmarkIds = new ArrayList<>(); bookmarkIds.add(bookmarkId); List<BookmarkId> typeSwappedBookmarks = new ArrayList<>(); - typeSwapBookmarksIfNecessary(bookmarkBridge, bookmarkIds, typeSwappedBookmarks, - bookmarkBridge.getReadingListFolder()); + typeSwapBookmarksIfNecessary(bookmarkModel, bookmarkIds, typeSwappedBookmarks, + bookmarkModel.getReadingListFolder()); assert typeSwappedBookmarks.size() == 1; if (typeSwappedBookmarks.size() != 1) return false; @@ -111,14 +110,14 @@ * Performs type swapping on the given bookmarks if necessary. The input list will be modified, * removing bookmarks that have been type swapped and thus don't need to be moved. * - * @param bookmarkBridge The BookmarkBridge to perform add/delete operations. + * @param bookmarkModel The BookmarkModel to perform add/delete operations. * @param bookmarksToMove The List of bookmarks to potentially type swap. * @param typeSwappedBookmarks The list of bookmarks which have been type-swapped and thus don't * need to be moved. * @param newParentId The new parentId to use, the {@link BookmarkType} of this is used to * determine if type-swapping is necessary. */ - public static void typeSwapBookmarksIfNecessary(BookmarkBridge bookmarkBridge, + public static void typeSwapBookmarksIfNecessary(BookmarkModel bookmarkModel, List<BookmarkId> bookmarksToMove, List<BookmarkId> typeSwappedBookmarks, BookmarkId newParentId) { if (!ReadingListFeatures.shouldAllowBookmarkTypeSwapping()) return; @@ -131,14 +130,14 @@ continue; } - BookmarkItem existingBookmark = bookmarkBridge.getBookmarkById(bookmarkId); + BookmarkItem existingBookmark = bookmarkModel.getBookmarkById(bookmarkId); BookmarkId newBookmark = null; if (newParentId.getType() == BookmarkType.NORMAL) { - newBookmark = bookmarkBridge.addBookmark(newParentId, - bookmarkBridge.getChildCount(newParentId), existingBookmark.getTitle(), + newBookmark = bookmarkModel.addBookmark(newParentId, + bookmarkModel.getChildCount(newParentId), existingBookmark.getTitle(), existingBookmark.getUrl()); } else if (newParentId.getType() == BookmarkType.READING_LIST) { - newBookmark = bookmarkBridge.addToReadingList( + newBookmark = bookmarkModel.addToReadingList( existingBookmark.getTitle(), existingBookmark.getUrl()); } @@ -146,7 +145,7 @@ Log.e(TAG, "Null bookmark after typeswapping."); continue; } - bookmarkBridge.deleteBookmark(bookmarkId); + bookmarkModel.deleteBookmark(bookmarkId); typeSwappedBookmarks.add(newBookmark); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java index b612795a4..ac55533 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
@@ -15,7 +15,7 @@ import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; import org.chromium.chrome.browser.app.creator.CreatorActivity; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils; import org.chromium.chrome.browser.feed.FeedFeatures; import org.chromium.chrome.browser.feed.webfeed.WebFeedFaviconFetcher; @@ -52,14 +52,14 @@ AppMenuDelegate appMenuDelegate, OneshotSupplier<LayoutStateProvider> layoutStateProvider, OneshotSupplier<StartSurface> startSurfaceSupplier, - ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + ObservableSupplier<BookmarkModel> bookmarkModelSupplier, WebFeedSnackbarController.FeedLauncher feedLauncher, ModalDialogManager modalDialogManager, SnackbarManager snackbarManager, @NonNull OneshotSupplier<IncognitoReauthController> incognitoReauthControllerOneshotSupplier) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, toolbarManager, decorView, layoutStateProvider, startSurfaceSupplier, - bookmarkBridgeSupplier, incognitoReauthControllerOneshotSupplier); + bookmarkModelSupplier, incognitoReauthControllerOneshotSupplier); mAppMenuDelegate = appMenuDelegate; mFeedLauncher = feedLauncher; mModalDialogManager = modalDialogManager;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java index 9162c7c..6868261c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -31,7 +31,7 @@ import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.banners.AppBannerInProductHelpController; import org.chromium.chrome.browser.banners.AppBannerInProductHelpControllerFactory; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.TabBookmarker; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -211,7 +211,7 @@ * @param shareDelegateSupplier Supplies the {@link ShareDelegate}. * @param tabProvider The {@link ActivityTabProvider} to get current tab of the activity. * @param profileSupplier Supplier of the currently applicable profile. - * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile. + * @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile. * @param contextualSearchManagerSupplier Supplier of the {@link ContextualSearchManager}. * @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}. * @param startSurfaceSupplier Supplier of the {@link StartSurface}. @@ -255,7 +255,7 @@ @NonNull ObservableSupplier<ShareDelegate> shareDelegateSupplier, @NonNull ActivityTabProvider tabProvider, @NonNull ObservableSupplier<Profile> profileSupplier, - @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier, @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier, @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier, @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier, @@ -291,7 +291,7 @@ OneshotSupplier<TabReparentingController> tabReparentingControllerSupplier, boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) { super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider, - profileSupplier, bookmarkBridgeSupplier, tabBookmarkerSupplier, + profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier, contextualSearchManagerSupplier, tabModelSelectorSupplier, startSurfaceSupplier, tabSwitcherSupplier, intentMetadataOneshotSupplier, layoutStateProviderOneshotSupplier, startSurfaceParentTabSupplier,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java index a28428a..aeb55bf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -43,7 +43,7 @@ import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton; import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment; import org.chromium.chrome.browser.back_press.BackPressManager; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkModelObserver; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -77,7 +77,7 @@ import org.chromium.chrome.browser.ntp.IncognitoNewTabPage; import org.chromium.chrome.browser.ntp.NewTabPage; import org.chromium.chrome.browser.ntp.NewTabPageUma; -import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; +import org.chromium.chrome.browser.offlinepages.OfflinePageTabData; import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; import org.chromium.chrome.browser.omnibox.BackKeyBehaviorDelegate; import org.chromium.chrome.browser.omnibox.LocationBar; @@ -215,8 +215,8 @@ private ActivityTabProvider.ActivityTabTabObserver mActivityTabTabObserver; private final ActivityTabProvider mActivityTabProvider; private final LocationBarModel mLocationBarModel; - private ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier; - private final Callback<BookmarkBridge> mBookmarkBridgeSupplierObserver; + private ObservableSupplier<BookmarkModel> mBookmarkModelSupplier; + private final Callback<BookmarkModel> mBookmarkModelSupplierObserver; private TemplateUrlServiceObserver mTemplateUrlObserver; private LocationBar mLocationBar; private FindToolbarManager mFindToolbarManager; @@ -404,7 +404,7 @@ * of toolbar interaction. * @param findToolbarManager The manager for the find in page function. * @param profileSupplier Supplier of the currently applicable profile. - * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile. + * @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile. * TODO(https://crbug.com/1084528): Use OneShotSupplier once it is ready. * @param layoutStateProviderSupplier Supplier of the {@link LayoutStateProvider}. * @param tabModelSelectorSupplier Supplier of the {@link TabModelSelector}. @@ -441,7 +441,7 @@ List<ButtonDataProvider> buttonDataProviders, ActivityTabProvider tabProvider, ScrimCoordinator scrimCoordinator, ToolbarActionModeCallback toolbarActionModeCallback, FindToolbarManager findToolbarManager, ObservableSupplier<Profile> profileSupplier, - ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + ObservableSupplier<BookmarkModel> bookmarkModelSupplier, @Nullable Supplier<Boolean> canAnimateNativeBrowserControls, OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier, OneshotSupplier<AppMenuCoordinator> appMenuCoordinatorSupplier, @@ -516,25 +516,28 @@ IncognitoUtils::getNonPrimaryOTRProfileFromWindowAndroid, new LocationBarModel.OfflineStatus() { @Override - public boolean isShowingTrustedOfflinePage(WebContents webContents) { - return OfflinePageUtils.isShowingTrustedOfflinePage(webContents); + public boolean isShowingTrustedOfflinePage(Tab tab) { + return OfflinePageTabData.isShowingTrustedOfflinePage(tab); } @Override public boolean isOfflinePage(Tab tab) { - return OfflinePageUtils.isOfflinePage(tab); + TraceEvent.begin("isOfflinePage"); + boolean ret = OfflinePageTabData.isShowingOfflinePage(tab); + TraceEvent.end("isOfflinePage"); + return ret; } }, SearchEngineLogoUtils.getInstance()); mControlContainer = controlContainer; assert mControlContainer != null; - mBookmarkBridgeSupplier = bookmarkBridgeSupplier; - // We need to capture a reference to setBookmarkBridge/setCurrentProfile in order to remove + mBookmarkModelSupplier = bookmarkModelSupplier; + // We need to capture a reference to setBookmarkModel/setCurrentProfile in order to remove // them later; there is no guarantee in the JLS that referencing the same method later will // reference the same object. - mBookmarkBridgeSupplierObserver = this::setBookmarkBridge; - mBookmarkBridgeSupplier.addObserver(mBookmarkBridgeSupplierObserver); + mBookmarkModelSupplierObserver = this::setBookmarkModel; + mBookmarkModelSupplier.addObserver(mBookmarkModelSupplierObserver); mLayoutStateProviderSupplier = layoutStateProviderSupplier; mLayoutStateProviderSupplier.onAvailable( @@ -681,8 +684,8 @@ toolbarPageInfo::show, IntentHandler::bringTabToFront, DownloadUtils::isAllowedToDownloadPage, NewTabPageUma::recordOmniboxNavigation, TabWindowManagerSingleton::getInstance, - (url) -> mBookmarkBridgeSupplier.hasValue() - && mBookmarkBridgeSupplier.get().isBookmarked(url), + (url) -> mBookmarkModelSupplier.hasValue() + && mBookmarkModelSupplier.get().isBookmarked(url), () -> { return mToolbar.getCurrentOptionalButtonVariant() == @@ -1485,12 +1488,12 @@ if (mTabModelSelector != null) { mTabModelSelector.removeObserver(mTabModelSelectorObserver); } - if (mBookmarkBridgeSupplier != null) { - BookmarkBridge bridge = mBookmarkBridgeSupplier.get(); + if (mBookmarkModelSupplier != null) { + BookmarkModel bridge = mBookmarkModelSupplier.get(); if (bridge != null) bridge.removeObserver(mBookmarksObserver); - mBookmarkBridgeSupplier.removeObserver(mBookmarkBridgeSupplierObserver); - mBookmarkBridgeSupplier = null; + mBookmarkModelSupplier.removeObserver(mBookmarkModelSupplierObserver); + mBookmarkModelSupplier = null; } if (mTemplateUrlObserver != null) { TemplateUrlServiceFactory.get().removeObserver(mTemplateUrlObserver); @@ -1903,9 +1906,9 @@ } private void updateBookmarkButtonStatus() { - if (mBookmarkBridgeSupplier == null) return; + if (mBookmarkModelSupplier == null) return; Tab currentTab = mLocationBarModel.getTab(); - BookmarkBridge bridge = mBookmarkBridgeSupplier.get(); + BookmarkModel bridge = mBookmarkModelSupplier.get(); boolean isBookmarked = currentTab != null && bridge != null && bridge.hasBookmarkIdForTab(currentTab); boolean editingAllowed = @@ -2027,9 +2030,9 @@ } } - private void setBookmarkBridge(BookmarkBridge bookmarkBridge) { - if (bookmarkBridge == null) return; - bookmarkBridge.addObserver(mBookmarksObserver); + private void setBookmarkModel(BookmarkModel bookmarkModel) { + if (bookmarkModel == null) return; + bookmarkModel.addObserver(mBookmarksObserver); } private void setLayoutStateProvider(LayoutStateProvider layoutStateProvider) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java index 4090e104..0337ca2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -43,7 +43,7 @@ import org.chromium.chrome.browser.app.omnibox.OmniboxPedalDelegateImpl; import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController; import org.chromium.chrome.browser.back_press.BackPressManager; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.bookmarks.TabBookmarker; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -253,7 +253,7 @@ private final ObservableSupplierImpl<MerchantTrustSignalsCoordinator> mMerchantTrustSignalsCoordinatorSupplier = new ObservableSupplierImpl<>(); protected final ObservableSupplier<Profile> mProfileSupplier; - private final ObservableSupplier<BookmarkBridge> mBookmarkBridgeSupplier; + private final ObservableSupplier<BookmarkModel> mBookmarkModelSupplier; private final ObservableSupplier<TabBookmarker> mTabBookmarkerSupplier; private final OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier; private BottomSheetObserver mBottomSheetObserver; @@ -319,7 +319,7 @@ * @param shareDelegateSupplier Supplies the {@link ShareDelegate}. * @param tabProvider The {@link ActivityTabProvider} to get current tab of the activity. * @param profileSupplier Supplier of the currently applicable profile. - * @param bookmarkBridgeSupplier Supplier of the bookmark bridge for the current profile. + * @param bookmarkModelSupplier Supplier of the bookmark bridge for the current profile. * @param tabBookmarkerSupplier Supplier of {@link TabBookmarker} for bookmarking a given tab. * @param contextualSearchManagerSupplier Supplier of the {@link ContextualSearchManager}. * @param tabModelSelectorSupplier Supplies the {@link TabModelSelector}. @@ -360,7 +360,7 @@ @NonNull ObservableSupplier<ShareDelegate> shareDelegateSupplier, @NonNull ActivityTabProvider tabProvider, @NonNull ObservableSupplier<Profile> profileSupplier, - @NonNull ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier, + @NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier, @NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier, @NonNull Supplier<ContextualSearchManager> contextualSearchManagerSupplier, @NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier, @@ -452,7 +452,7 @@ mAutofillSessionLifetimeController = null; } mProfileSupplier = profileSupplier; - mBookmarkBridgeSupplier = bookmarkBridgeSupplier; + mBookmarkModelSupplier = bookmarkModelSupplier; mTabBookmarkerSupplier = tabBookmarkerSupplier; mAppMenuSupplier = new OneshotSupplierImpl<>(); mContextualSearchManagerSupplier = contextualSearchManagerSupplier; @@ -786,7 +786,7 @@ // TODO(1293885): Remove this validator once we have an API on the backend that sends // success/failure information back. if (ShoppingFeatures.isShoppingListEnabled()) { - mBookmarkBridgeSupplier.addObserver((bridge) -> { + mBookmarkModelSupplier.addObserver((bridge) -> { PowerBookmarkUtils.validateBookmarkedCommerceSubscriptions(bridge, new CommerceSubscriptionsServiceFactory() .getForLastUsedProfile() @@ -1169,7 +1169,7 @@ mTabObscuringHandlerSupplier.get(), mShareDelegateSupplier, mIdentityDiscController, mButtonDataProviders, mActivityTabProvider, mScrimCoordinator, mActionModeControllerCallback, mFindToolbarManager, - mProfileSupplier, mBookmarkBridgeSupplier, mCanAnimateBrowserControls, + mProfileSupplier, mBookmarkModelSupplier, mCanAnimateBrowserControls, mLayoutStateProviderOneShotSupplier, mAppMenuSupplier, shouldShowMenuUpdateBadge(), mTabModelSelectorSupplier, mStartSurfaceSupplier, mOmniboxFocusStateSupplier, mIntentMetadataOneshotSupplier,
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/BookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/BookmarkTest.java index e601434..edcde3b 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/BookmarkTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/BookmarkTest.java
@@ -61,7 +61,6 @@ import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics; import org.chromium.chrome.browser.bookmarks.BookmarkActionBar; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkDelegate; import org.chromium.chrome.browser.bookmarks.BookmarkFolderRow; import org.chromium.chrome.browser.bookmarks.BookmarkItemRow; @@ -80,7 +79,6 @@ import org.chromium.chrome.browser.night_mode.ChromeNightModeTestUtils; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; @@ -154,7 +152,6 @@ private BookmarkManager mManager; private BookmarkModel mBookmarkModel; - private BookmarkBridge mBookmarkBridge; private RecyclerView mItemsContainer; // Constant but can only be initialized after parameterized test runner setup because this would // trigger native load / CommandLineFlag setup. @@ -182,9 +179,7 @@ public void setUp() { mActivityTestRule.startMainActivityOnBlankPage(); TestThreadUtils.runOnUiThreadBlocking(() -> { - mBookmarkModel = new BookmarkModel(Profile.fromWebContents( - mActivityTestRule.getActivity().getActivityTab().getWebContents())); - mBookmarkBridge = mActivityTestRule.getActivity().getBookmarkBridgeForTesting(); + mBookmarkModel = mActivityTestRule.getActivity().getBookmarkModelForTesting(); // Emulate sync disabled so promos are shown. when(mSyncService.isSyncRequested()).thenReturn(false); @@ -287,7 +282,7 @@ BookmarkTestUtil.waitForBookmarkModelLoaded(); // All actions with BookmarkModel needs to run on UI thread. TestThreadUtils.runOnUiThreadBlocking(() -> { - BookmarkId id = mBookmarkBridge.getUserBookmarkIdForTab( + BookmarkId id = mBookmarkModel.getUserBookmarkIdForTab( mActivityTestRule.getActivity().getActivityTabProvider().get()); Assert.assertTrue("The test page is not added as bookmark: ", mBookmarkModel.doesBookmarkExist(id)); @@ -321,7 +316,7 @@ BookmarkTestUtil.waitForBookmarkModelLoaded(); // All actions with BookmarkModel needs to run on UI thread. TestThreadUtils.runOnUiThreadBlocking(() -> { - BookmarkId id = mBookmarkBridge.getUserBookmarkIdForTab( + BookmarkId id = mBookmarkModel.getUserBookmarkIdForTab( mActivityTestRule.getActivity().getActivityTabProvider().get()); Assert.assertTrue("The test page is not added as bookmark: ", mBookmarkModel.doesBookmarkExist(id)); @@ -355,7 +350,7 @@ BookmarkTestUtil.waitForBookmarkModelLoaded(); // All actions with BookmarkModel needs to run on UI thread. TestThreadUtils.runOnUiThreadBlocking(() -> { - BookmarkId id = mBookmarkBridge.getUserBookmarkIdForTab( + BookmarkId id = mBookmarkModel.getUserBookmarkIdForTab( mActivityTestRule.getActivity().getActivityTabProvider().get()); Assert.assertTrue("The test page is not added as bookmark: ", mBookmarkModel.doesBookmarkExist(id));
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/ReadingListTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/ReadingListTest.java index 67a44f7..bba17a0 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/ReadingListTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/app/bookmarks/ReadingListTest.java
@@ -136,7 +136,7 @@ TestThreadUtils.runOnUiThreadBlocking(() -> { mBookmarkModel = new BookmarkModel(Profile.fromWebContents( mActivityTestRule.getActivity().getActivityTab().getWebContents())); - mBookmarkBridge = mActivityTestRule.getActivity().getBookmarkBridgeForTesting(); + mBookmarkBridge = mActivityTestRule.getActivity().getBookmarkModelForTesting(); // Emulate sync disabled so promos are shown. when(mSyncService.isSyncRequested()).thenReturn(false);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java index c46518f..39dbb42 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowTest.java
@@ -35,7 +35,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim; -import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.subscriptions.CommerceSubscription; import org.chromium.chrome.browser.subscriptions.SubscriptionsManager; import org.chromium.chrome.browser.user_education.UserEducationHelper; @@ -80,7 +79,6 @@ private BottomSheetController mBottomSheetController; private BottomSheetTestSupport mBottomSheetTestSupport; private BookmarkModel mBookmarkModel; - private BookmarkBridge mBookmarkBridge; @Before public void setUp() throws ExecutionException { @@ -95,9 +93,7 @@ mBottomSheetTestSupport = new BottomSheetTestSupport(mBottomSheetController); mBookmarkSaveFlowCoordinator = new BookmarkSaveFlowCoordinator( cta, mBottomSheetController, mSubscriptionsManager, mUserEducationHelper); - mBookmarkModel = new BookmarkModel(Profile.fromWebContents( - mActivityTestRule.getActivity().getActivityTab().getWebContents())); - mBookmarkBridge = mActivityTestRule.getActivity().getBookmarkBridgeForTesting(); + mBookmarkModel = mActivityTestRule.getActivity().getBookmarkModelForTesting(); }); loadBookmarkModel(); @@ -167,7 +163,7 @@ BookmarkId id = addBookmark("Test bookmark", new GURL("http://a.com")); PowerBookmarkMeta.Builder meta = PowerBookmarkMeta.newBuilder().setShoppingSpecifics( ShoppingSpecifics.newBuilder().setProductClusterId(1234L).build()); - mBookmarkBridge.setPowerBookmarkMeta(id, meta.build()); + mBookmarkModel.setPowerBookmarkMeta(id, meta.build()); mBookmarkSaveFlowCoordinator.show(id, /*fromHeuristicEntryPoint=*/false, /*wasBookmarkMoved=*/false, meta.build()); return null; @@ -185,7 +181,7 @@ BookmarkId id = addBookmark("Test bookmark", new GURL("http://a.com")); PowerBookmarkMeta.Builder meta = PowerBookmarkMeta.newBuilder().setShoppingSpecifics( ShoppingSpecifics.newBuilder().setProductClusterId(1234L).build()); - mBookmarkBridge.setPowerBookmarkMeta(id, meta.build()); + mBookmarkModel.setPowerBookmarkMeta(id, meta.build()); mBookmarkSaveFlowCoordinator.show( id, /*fromHeuristicEntryPoint=*/true, /*wasBookmarkMoved=*/false, meta.build()); return null; @@ -203,7 +199,7 @@ BookmarkId id = addBookmark("Test bookmark", new GURL("http://a.com")); PowerBookmarkMeta.Builder meta = PowerBookmarkMeta.newBuilder().setShoppingSpecifics( ShoppingSpecifics.newBuilder().setProductClusterId(1234L)); - mBookmarkBridge.setPowerBookmarkMeta(id, meta.build()); + mBookmarkModel.setPowerBookmarkMeta(id, meta.build()); mBookmarkSaveFlowCoordinator.show(id, /*fromHeuristicEntryPoint=*/false, /*wasBookmarkMoved=*/false, meta.build()); return null; @@ -282,4 +278,4 @@ return TestThreadUtils.runOnUiThreadBlocking( () -> mBookmarkModel.addBookmark(mBookmarkModel.getDefaultFolder(), 0, title, url)); } -} \ No newline at end of file +}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java index dbbc5da..cfe02895 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java
@@ -112,7 +112,7 @@ Assert.assertEquals("URL stored in shared preference should be the same as policy setting", TEST_URL, SharedPreferencesManager.getInstance().readString( - ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY, "")); + ChromePreferenceKeys.DEPRECATED_HOMEPAGE_LOCATION_POLICY, "")); // METRICS_HOMEPAGE_LOCATION_TYPE is recorded once in deferred start up tasks. Assert.assertEquals("Settings.Homepage.LocationType should record POLICY_OTHER once.", 1,
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java index 32358f3..822c0a5 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java
@@ -49,7 +49,6 @@ import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.ChromeTabbedActivityTestRule; import org.chromium.chrome.test.util.OmniboxTestUtils; -import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.test.util.ClickUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.ui.permissions.AndroidPermissionDelegate; @@ -83,7 +82,7 @@ public static final LocationBarModel.OfflineStatus OFFLINE_STATUS = new LocationBarModel.OfflineStatus() { @Override - public boolean isShowingTrustedOfflinePage(WebContents webContents) { + public boolean isShowingTrustedOfflinePage(Tab tab) { return false; }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java index 61ba772..ee1c82a 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
@@ -23,7 +23,7 @@ import org.chromium.base.test.util.Criteria; import org.chromium.base.test.util.CriteriaNotSatisfiedException; import org.chromium.base.test.util.Feature; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; @@ -57,7 +57,7 @@ private static final String MODIFIED_TITLE = "Chromium2"; private static final String FOLDER_TITLE = "Tech"; - private BookmarkBridge mBookmarkBridge; + private BookmarkModel mBookmarkModel; // A container to store bookmark information for data verification. private static class Bookmark { @@ -86,10 +86,10 @@ @Before public void setUp() throws Exception { TestThreadUtils.runOnUiThreadBlocking(() -> { - mBookmarkBridge = new BookmarkBridge(Profile.getLastUsedRegularProfile()); - // The BookmarkBridge needs to know how to handle partner bookmarks. + mBookmarkModel = new BookmarkModel(Profile.getLastUsedRegularProfile()); + // The BookmarkModel needs to know how to handle partner bookmarks. // Without this call to fake that knowledge for testing, it crashes. - mBookmarkBridge.loadEmptyPartnerBookmarkShimForTesting(); + mBookmarkModel.loadEmptyPartnerBookmarkShimForTesting(); }); mSyncTestRule.setUpAccountAndEnableSyncForTesting(); // Make sure initial state is clean. @@ -393,8 +393,8 @@ private BookmarkId addClientBookmark(final String title, final GURL url) { BookmarkId id = TestThreadUtils.runOnUiThreadBlockingNoException(() -> { - BookmarkId parentId = mBookmarkBridge.getMobileFolderId(); - return mBookmarkBridge.addBookmark(parentId, 0, title, url); + BookmarkId parentId = mBookmarkModel.getMobileFolderId(); + return mBookmarkModel.addBookmark(parentId, 0, title, url); }); Assert.assertNotNull("Failed to create bookmark.", id); return id; @@ -402,8 +402,8 @@ private BookmarkId addClientBookmarkFolder(final String title) { BookmarkId id = TestThreadUtils.runOnUiThreadBlockingNoException(() -> { - BookmarkId parentId = mBookmarkBridge.getMobileFolderId(); - return mBookmarkBridge.addFolder(parentId, 0, title); + BookmarkId parentId = mBookmarkModel.getMobileFolderId(); + return mBookmarkModel.addFolder(parentId, 0, title); }); Assert.assertNotNull("Failed to create bookmark folder.", id); return id; @@ -411,8 +411,8 @@ private String getBookmarkBarGuid() { return TestThreadUtils.runOnUiThreadBlockingNoException(() -> { - return mBookmarkBridge.getBookmarkGuidByIdForTesting( - mBookmarkBridge.getDesktopFolderId()); + return mBookmarkModel.getBookmarkGuidByIdForTesting( + mBookmarkModel.getDesktopFolderId()); }); } @@ -439,17 +439,17 @@ } private void deleteClientBookmark(final BookmarkId id) { - TestThreadUtils.runOnUiThreadBlocking(() -> { mBookmarkBridge.deleteBookmark(id); }); + TestThreadUtils.runOnUiThreadBlocking(() -> { mBookmarkModel.deleteBookmark(id); }); } private void setClientBookmarkTitle(final BookmarkId id, final String title) { TestThreadUtils.runOnUiThreadBlocking( - () -> { mBookmarkBridge.setBookmarkTitle(id, title); }); + () -> { mBookmarkModel.setBookmarkTitle(id, title); }); } private void moveClientBookmark(final BookmarkId id, final BookmarkId newParentId) { TestThreadUtils.runOnUiThreadBlocking( - () -> { mBookmarkBridge.moveBookmark(id, newParentId, 0 /* new index */); }); + () -> { mBookmarkModel.moveBookmark(id, newParentId, 0 /* new index */); }); } private List<Bookmark> getClientBookmarks() {
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java index 265b75a..a53eb0ec 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java
@@ -51,7 +51,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl.MenuGroup; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.device.DeviceConditions; @@ -159,7 +159,7 @@ @Mock public WebsitePreferenceBridge.Natives mWebsitePreferenceBridgeJniMock; @Mock - public BookmarkBridge mBookmarkBridge; + public BookmarkModel mBookmarkModel; @Mock private IdentityManager mIdentityManagerMock; @Mock @@ -177,7 +177,7 @@ new OneshotSupplierImpl<>(); private OneshotSupplierImpl<LayoutStateProvider> mLayoutStateProviderSupplier = new OneshotSupplierImpl<>(); - private ObservableSupplierImpl<BookmarkBridge> mBookmarkBridgeSupplier = + private ObservableSupplierImpl<BookmarkModel> mBookmarkModelSupplier = new ObservableSupplierImpl<>(); private OneshotSupplierImpl<StartSurface> mStartSurfaceSupplier = new OneshotSupplierImpl<>(); @@ -220,13 +220,13 @@ Mockito.when(mManagedBrowserUtilsJniMock.isBrowserManaged(mProfile)).thenReturn(false); Mockito.when(mManagedBrowserUtilsJniMock.getBrowserManagerName(mProfile)).thenReturn(""); - mBookmarkBridgeSupplier.set(mBookmarkBridge); + mBookmarkModelSupplier.set(mBookmarkModel); PowerBookmarkUtils.setPriceTrackingEligibleForTesting(false); PowerBookmarkUtils.setPowerBookmarkMetaForTesting(PowerBookmarkMeta.newBuilder().build()); mAppMenuPropertiesDelegate = Mockito.spy(new AppMenuPropertiesDelegateImpl( ContextUtils.getApplicationContext(), mActivityTabProvider, mMultiWindowModeStateDispatcher, mTabModelSelector, mToolbarManager, mDecorView, - mLayoutStateProviderSupplier, mStartSurfaceSupplier, mBookmarkBridgeSupplier, + mLayoutStateProviderSupplier, mStartSurfaceSupplier, mBookmarkModelSupplier, mIncognitoReauthControllerSupplier)); ShoppingServiceFactory.setShoppingServiceForTesting(mShoppingService); @@ -630,7 +630,7 @@ @Test public void updateBookmarkMenuItemShortcut() { - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); MenuItem bookmarkMenuItemShortcut = mock(MenuItem.class); mAppMenuPropertiesDelegate.updateBookmarkMenuItemShortcut( @@ -640,7 +640,7 @@ @Test public void updateBookmarkMenuItemShortcut_fromCCT() { - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); MenuItem bookmarkMenuItemShortcut = mock(MenuItem.class); mAppMenuPropertiesDelegate.updateBookmarkMenuItemShortcut( @@ -657,8 +657,8 @@ } @Test - public void updateBookmarkMenuItemShortcut_NullBookmarkBridge() { - mBookmarkBridgeSupplier.set(null); + public void updateBookmarkMenuItemShortcut_NullBookmarkModel() { + mBookmarkModelSupplier.set(null); MenuItem bookmarkMenuItemShortcut = mock(MenuItem.class); mAppMenuPropertiesDelegate.updateBookmarkMenuItemShortcut( @@ -669,7 +669,7 @@ @Test public void updateBookmarkMenuItemRow() { setBookmarkItemRowEnabled(true); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); MenuItem bookmarkMenuItemAdd = mock(MenuItem.class); MenuItem bookmarkMenuItemEdit = mock(MenuItem.class); @@ -685,7 +685,7 @@ setShoppingListItemRowEnabled(true); PowerBookmarkUtils.setPriceTrackingEligibleForTesting(true); setReadingListItemRowEnabled(true); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); MenuItem bookmarkMenuItemAdd = mock(MenuItem.class); MenuItem bookmarkMenuItemEdit = mock(MenuItem.class); @@ -724,9 +724,9 @@ } @Test - public void updateBookmarkMenuItemRow_NullBookmarkBridge() { + public void updateBookmarkMenuItemRow_NullBookmarkModel() { setBookmarkItemRowEnabled(true); - mBookmarkBridgeSupplier.set(null); + mBookmarkModelSupplier.set(null); MenuItem bookmarkMenuItemAdd = mock(MenuItem.class); MenuItem bookmarkMenuItemEdit = mock(MenuItem.class); @@ -739,7 +739,7 @@ @Test public void updateReadingListMenuItemRow() { setReadingListItemRowEnabled(true); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); MenuItem readingListMenuItemAdd = mock(MenuItem.class); MenuItem readingListMenuItemDelete = mock(MenuItem.class); @@ -762,9 +762,9 @@ } @Test - public void updateReadingListMenuItemRow_NullBookmarkBridge() { + public void updateReadingListMenuItemRow_NullBookmarkModel() { setReadingListItemRowEnabled(true); - mBookmarkBridgeSupplier.set(null); + mBookmarkModelSupplier.set(null); MenuItem readingListMenuItemAdd = mock(MenuItem.class); MenuItem readingListMenuItemDelete = mock(MenuItem.class); @@ -778,15 +778,15 @@ public void enablePriceTrackingItemRow() { setShoppingListItemRowEnabled(true); PowerBookmarkUtils.setPriceTrackingEligibleForTesting(true); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); - doReturn(mock(BookmarkId.class)).when(mBookmarkBridge).getUserBookmarkIdForTab(any()); + doReturn(mock(BookmarkId.class)).when(mBookmarkModel).getUserBookmarkIdForTab(any()); PowerBookmarkMeta meta = PowerBookmarkMeta.newBuilder() .setShoppingSpecifics( ShoppingSpecifics.newBuilder().setIsPriceTracked(false).build()) .build(); - doReturn(meta).when(mBookmarkBridge).getPowerBookmarkMeta(any()); + doReturn(meta).when(mBookmarkModel).getPowerBookmarkMeta(any()); MenuItem startPriceTrackingMenuItem = mock(MenuItem.class); MenuItem stopPriceTrackingMenuItem = mock(MenuItem.class); @@ -801,15 +801,15 @@ public void enablePriceTrackingItemRow_NullBookmarkId() { setShoppingListItemRowEnabled(true); PowerBookmarkUtils.setPriceTrackingEligibleForTesting(true); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); - doReturn(null).when(mBookmarkBridge).getUserBookmarkIdForTab(any()); + doReturn(null).when(mBookmarkModel).getUserBookmarkIdForTab(any()); PowerBookmarkMeta meta = PowerBookmarkMeta.newBuilder() .setShoppingSpecifics( ShoppingSpecifics.newBuilder().setIsPriceTracked(false).build()) .build(); - doReturn(meta).when(mBookmarkBridge).getPowerBookmarkMeta(any()); + doReturn(meta).when(mBookmarkModel).getPowerBookmarkMeta(any()); MenuItem startPriceTrackingMenuItem = mock(MenuItem.class); MenuItem stopPriceTrackingMenuItem = mock(MenuItem.class); @@ -824,14 +824,14 @@ public void enablePriceTrackingItemRow_PriceTrackingEnabled() { setShoppingListItemRowEnabled(true); PowerBookmarkUtils.setPriceTrackingEligibleForTesting(true); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); BookmarkId bookmarkId = mock(BookmarkId.class); List<BookmarkId> allBookmarks = new ArrayList<>(); allBookmarks.add(bookmarkId); - doReturn(bookmarkId).when(mBookmarkBridge).getUserBookmarkIdForTab(any()); + doReturn(bookmarkId).when(mBookmarkModel).getUserBookmarkIdForTab(any()); doReturn(allBookmarks) - .when(mBookmarkBridge) + .when(mBookmarkModel) .getBookmarksOfType(eq(PowerBookmarkType.SHOPPING)); Long clusterId = 1L; doReturn(new ShoppingService.ProductInfo("", new GURL(""), clusterId, 0, "", 0, "")) @@ -845,7 +845,7 @@ .build()) .build(); PowerBookmarkUtils.setPowerBookmarkMetaForTesting(meta); - doReturn(meta).when(mBookmarkBridge).getPowerBookmarkMeta(any()); + doReturn(meta).when(mBookmarkModel).getPowerBookmarkMeta(any()); MenuItem startPriceTrackingMenuItem = mock(MenuItem.class); MenuItem stopPriceTrackingMenuItem = mock(MenuItem.class); @@ -861,12 +861,12 @@ setShoppingListItemRowEnabled(true); PowerBookmarkUtils.setPriceTrackingEligibleForTesting(false); - doReturn(true).when(mBookmarkBridge).isEditBookmarksEnabled(); + doReturn(true).when(mBookmarkModel).isEditBookmarksEnabled(); BookmarkId bookmarkId = mock(BookmarkId.class); - doReturn(bookmarkId).when(mBookmarkBridge).getUserBookmarkIdForTab(any()); + doReturn(bookmarkId).when(mBookmarkModel).getUserBookmarkIdForTab(any()); doReturn(new ArrayList<BookmarkId>()) - .when(mBookmarkBridge) + .when(mBookmarkModel) .getBookmarksOfType(eq(PowerBookmarkType.SHOPPING)); MenuItem startPriceTrackingMenuItem = mock(MenuItem.class); @@ -879,13 +879,13 @@ @Test public void shouldCheckBookmarkStar() { - doReturn(true).when(mBookmarkBridge).hasBookmarkIdForTab(mTab); + doReturn(true).when(mBookmarkModel).hasBookmarkIdForTab(mTab); assertTrue(mAppMenuPropertiesDelegate.shouldCheckBookmarkStar(mTab)); } @Test - public void shouldCheckBookmarkStar_NullBookmarkBridge() { - mBookmarkBridgeSupplier.set(null); + public void shouldCheckBookmarkStar_NullBookmarkModel() { + mBookmarkModelSupplier.set(null); Assert.assertFalse(mAppMenuPropertiesDelegate.shouldCheckBookmarkStar(mTab)); }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinatorTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinatorTest.java index 05fce27..324a04fb 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinatorTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinatorTest.java
@@ -42,7 +42,6 @@ import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.JniMocker; import org.chromium.chrome.R; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator; import org.chromium.chrome.browser.feed.sections.SectionHeaderListProperties; @@ -174,8 +173,6 @@ @Mock private SectionHeaderView mSectionHeaderView; @Mock - private BookmarkBridge mBookmarkBridge; - @Mock private FeedActionDelegate mFeedActionDelegate; // Mocked JNI.
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepageManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepageManagerTest.java index c448eb0..15f5ff31 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepageManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepageManagerTest.java
@@ -24,18 +24,20 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.embedder_support.util.UrlUtilities; +import org.chromium.url.GURL; import org.chromium.url.JUnitTestGURLs; +import org.chromium.url.ShadowGURL; /** Unit tests for {@link HomepageManager}. */ @RunWith(BaseRobolectricTestRunner.class) @Config(shadows = {HomepageManagerTest.ShadowHomepagePolicyManager.class, HomepageManagerTest.ShadowUrlUtilities.class, - HomepageManagerTest.ShadowPartnerBrowserCustomizations.class}) + HomepageManagerTest.ShadowPartnerBrowserCustomizations.class, ShadowGURL.class}) public class HomepageManagerTest { /** Shadow for {@link HomepagePolicyManager}. */ @Implements(HomepagePolicyManager.class) public static class ShadowHomepagePolicyManager { - static String sHomepageUrl; + static GURL sHomepageUrl; @Implementation public static boolean isHomepageManagedByPolicy() { @@ -43,7 +45,7 @@ } @Implementation - public static String getHomepageUrl() { + public static GURL getHomepageUrl() { return sHomepageUrl; } } @@ -52,7 +54,7 @@ static class ShadowUrlUtilities { @Implementation public static boolean isNTPUrl(String url) { - return UrlConstants.NTP_URL.equals(url); + return JUnitTestGURLs.NTP_URL.equals(url); } } @@ -77,30 +79,28 @@ @Before public void setUp() { MockitoAnnotations.initMocks(this); + ShadowPartnerBrowserCustomizations.setPartnerBrowserCustomizations( + mPartnerBrowserCustomizations); } @Test @SmallTest public void testIsHomepageNonNtp() { - ShadowHomepagePolicyManager.sHomepageUrl = ""; + ShadowHomepagePolicyManager.sHomepageUrl = GURL.emptyGURL(); Assert.assertFalse( "Empty string should fall back to NTP", HomepageManager.isHomepageNonNtp()); - ShadowHomepagePolicyManager.sHomepageUrl = null; - Assert.assertFalse("Null should fall back to the NTP", HomepageManager.isHomepageNonNtp()); - - ShadowHomepagePolicyManager.sHomepageUrl = "www.example.com"; + ShadowHomepagePolicyManager.sHomepageUrl = + JUnitTestGURLs.getGURL(JUnitTestGURLs.EXAMPLE_URL); Assert.assertTrue("Random web page is not the NTP", HomepageManager.isHomepageNonNtp()); - ShadowHomepagePolicyManager.sHomepageUrl = UrlConstants.NTP_URL; + ShadowHomepagePolicyManager.sHomepageUrl = JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL); Assert.assertFalse("NTP should be considered the NTP", HomepageManager.isHomepageNonNtp()); } @Test @SmallTest public void testGetDefaultHomepageUri() { - ShadowPartnerBrowserCustomizations.setPartnerBrowserCustomizations( - mPartnerBrowserCustomizations); Mockito.doNothing() .when(mPartnerBrowserCustomizations) .setPartnerHomepageListener(Matchers.anyObject()); @@ -115,7 +115,7 @@ Assert.assertEquals( UrlConstants.NTP_NON_NATIVE_URL, HomepageManager.getDefaultHomepageUri()); - final String blueUrl = "https://www.blue.com/"; + final String blueUrl = JUnitTestGURLs.BLUE_1; SharedPreferencesManager.getInstance().writeString( ChromePreferenceKeys.HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI, blueUrl); SharedPreferencesManager.getInstance().writeString(
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java index 01d203cb..52f31b3 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/HomepagePolicyManagerTest.java
@@ -27,16 +27,18 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager; import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.prefs.PrefService; -import org.chromium.content_public.browser.test.util.TestThreadUtils; +import org.chromium.url.GURL; +import org.chromium.url.JUnitTestGURLs; +import org.chromium.url.ShadowGURL; /** * Tests for the {@link HomepagePolicyManager}. */ @RunWith(BaseRobolectricTestRunner.class) -@Config(manifest = Config.NONE) +@Config(manifest = Config.NONE, shadows = ShadowGURL.class) public class HomepagePolicyManagerTest { - public static final String TEST_URL = "http://127.0.0.1:8000/foo.html"; - public static final String CHROME_NTP = "chrome-native://newtab/"; + public static final String TEST_URL = JUnitTestGURLs.EXAMPLE_URL; + public static final String CHROME_NTP = JUnitTestGURLs.NTP_URL; @Rule public TestRule mProcessor = new Features.JUnitProcessor(); @@ -61,7 +63,7 @@ // Reset shared preference mSharedPreferenceManager = SharedPreferencesManager.getInstance(); - setHomepageInSharedPreference(""); + setHomepageInSharedPreference(GURL.emptyGURL()); ChromeBrowserInitializer.setForTesting(mChromeBrowserInitializer); @@ -75,8 +77,8 @@ } /** - * Set up the homepage location for Mock PrefService, and create HomepagePolicyManager - * instance. + * Set up the homepage location for Mock PrefService, and create HomepagePolicyManager instance. + * * @param homepageLocation homepage preference that will be returned by mock pref service */ private void setupNewHomepagePolicyManagerForTests(boolean isPolicyEnabled, @@ -85,15 +87,13 @@ .thenReturn(isPolicyEnabled); Mockito.when(mMockPrefService.getString(Pref.HOME_PAGE)).thenReturn(homepageLocation); - TestThreadUtils.runOnUiThreadBlocking(() -> { - mHomepagePolicyManager = new HomepagePolicyManager(mMockRegistrar, listener); - HomepagePolicyManager.setInstanceForTests(mHomepagePolicyManager); - }); + mHomepagePolicyManager = new HomepagePolicyManager(mMockRegistrar, listener); + HomepagePolicyManager.setInstanceForTests(mHomepagePolicyManager); } - private void setHomepageInSharedPreference(String homepageLocation) { + private void setHomepageInSharedPreference(GURL homepageLocation) { mSharedPreferenceManager.writeString( - ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY, homepageLocation); + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, homepageLocation.serialize()); } @Test @@ -112,7 +112,7 @@ @Test @SmallTest public void testEmptyInstance_EnabledFromSharedPreference() { - setHomepageInSharedPreference(CHROME_NTP); + setHomepageInSharedPreference(JUnitTestGURLs.getGURL(CHROME_NTP)); // Create a new empty instance HomepagePolicyManager manager = new HomepagePolicyManager(); @@ -122,7 +122,7 @@ Assert.assertTrue("#isHomepageManagedByPolicy not consistent with test setting", manager.isHomepageLocationPolicyEnabled()); Assert.assertEquals("#getHomepageUrl not consistent with test setting", CHROME_NTP, - manager.getHomepagePreference()); + manager.getHomepagePreference().getSpec()); } @Test @@ -144,12 +144,13 @@ Assert.assertTrue("#isHomepageManagedByPolicy not consistent with test setting", HomepagePolicyManager.isHomepageManagedByPolicy()); Assert.assertEquals("#getHomepageUrl not consistent with test setting", TEST_URL, - HomepagePolicyManager.getHomepageUrl()); + HomepagePolicyManager.getHomepageUrl().getSpec()); + String homepageGurlSerialized = mSharedPreferenceManager.readString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, ""); + GURL homepageGurl = GURL.deserialize(homepageGurlSerialized); Assert.assertEquals("Updated HomepageLocation should be stored in shared preference", - TEST_URL, - mSharedPreferenceManager.readString( - ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY, "")); + TEST_URL, homepageGurl.getSpec()); } @Test @@ -160,12 +161,13 @@ Assert.assertTrue("#isHomepageManagedByPolicy not consistent with test setting", HomepagePolicyManager.isHomepageManagedByPolicy()); Assert.assertEquals("#getHomepageUrl not consistent with test setting", CHROME_NTP, - HomepagePolicyManager.getHomepageUrl()); + HomepagePolicyManager.getHomepageUrl().getSpec()); + String homepageGurlSerialized = mSharedPreferenceManager.readString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, ""); + GURL homepageGurl = GURL.deserialize(homepageGurlSerialized); Assert.assertEquals("Updated HomepageLocation should be stored in shared preference", - CHROME_NTP, - mSharedPreferenceManager.readString( - ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY, "")); + CHROME_NTP, homepageGurl.getSpec()); } @Test @@ -187,18 +189,18 @@ mHomepagePolicyManager.addListener(mListener); // A new policy URL is set, which triggers the refresh of native manager. - final String newUrl = "https://www.anothertesturl.com"; + final String newUrl = JUnitTestGURLs.URL_1; Mockito.when(mMockPrefService.isManagedPreference(Pref.HOME_PAGE)).thenReturn(true); Mockito.when(mMockPrefService.getString(Pref.HOME_PAGE)).thenReturn(newUrl); // Update the preference, so that the policy will be enabled. - TestThreadUtils.runOnUiThreadBlocking(() -> mHomepagePolicyManager.onPreferenceChange()); + mHomepagePolicyManager.onPreferenceChange(); // The homepage retrieved from homepage manager should be in sync with pref setting Assert.assertTrue("Policy should be enabled after refresh", mHomepagePolicyManager.isHomepageLocationPolicyEnabled()); Assert.assertEquals("#getHomepageUrl not consistent with test setting", newUrl, - mHomepagePolicyManager.getHomepagePreference()); + mHomepagePolicyManager.getHomepagePreference().getSpec()); Mockito.verify(mListener, Mockito.times(1)).onHomepagePolicyUpdate(); } @@ -216,8 +218,7 @@ // Update the preference, so that the policy will be disabled. Mockito.when(mMockPrefService.isManagedPreference(Pref.HOME_PAGE)).thenReturn(false); Mockito.when(mMockPrefService.getString(Pref.HOME_PAGE)).thenReturn(""); - TestThreadUtils.runOnUiThreadBlocking( - () -> { mHomepagePolicyManager.onPreferenceChange(); }); + mHomepagePolicyManager.onPreferenceChange(); // The homepage retrieved from homepage manager should be in sync with pref setting. Assert.assertFalse("Policy should be disabled after refresh", @@ -243,7 +244,7 @@ Assert.assertTrue("Policy should be enabled after refresh", mHomepagePolicyManager.isHomepageLocationPolicyEnabled()); Assert.assertEquals("#getHomepageUrl not consistent with test setting", TEST_URL, - mHomepagePolicyManager.getHomepagePreference()); + mHomepagePolicyManager.getHomepagePreference().getSpec()); // However, because the native setting is consistent with cached value in SharedPreference, // listeners will not receive update. @@ -254,6 +255,42 @@ @SmallTest public void testIllegal_GetHomepageUrl() { setupNewHomepagePolicyManagerForTests(false, "", null); - TestThreadUtils.runOnUiThreadBlocking(() -> { HomepagePolicyManager.getHomepageUrl(); }); + HomepagePolicyManager.getHomepageUrl(); + } + + @Test + @SmallTest + public void testGurlPreferenceKeysMigrationInConstructor() { + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.DEPRECATED_HOMEPAGE_LOCATION_POLICY, null); + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, null); + mHomepagePolicyManager = new HomepagePolicyManager(); + Assert.assertFalse(mHomepagePolicyManager.isHomepageLocationPolicyEnabled()); + + final String url1 = JUnitTestGURLs.URL_1; + final String url2 = JUnitTestGURLs.URL_2; + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.DEPRECATED_HOMEPAGE_LOCATION_POLICY, url1); + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, null); + mHomepagePolicyManager = new HomepagePolicyManager(); + Assert.assertEquals(url1, mHomepagePolicyManager.getHomepagePreference().getSpec()); + + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.DEPRECATED_HOMEPAGE_LOCATION_POLICY, null); + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, + JUnitTestGURLs.getGURL(url1).serialize()); + mHomepagePolicyManager = new HomepagePolicyManager(); + Assert.assertEquals(url1, mHomepagePolicyManager.getHomepagePreference().getSpec()); + + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.DEPRECATED_HOMEPAGE_LOCATION_POLICY, url1); + SharedPreferencesManager.getInstance().writeString( + ChromePreferenceKeys.HOMEPAGE_LOCATION_POLICY_GURL, + JUnitTestGURLs.getGURL(url2).serialize()); + mHomepagePolicyManager = new HomepagePolicyManager(); + Assert.assertEquals(url2, mHomepagePolicyManager.getHomepagePreference().getSpec()); } }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsUnitTest.java index 05fcf29..02f0d941 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsUnitTest.java
@@ -252,9 +252,7 @@ @SmallTest @Feature({"Homepage"}) public void testStartUp_Policies_Customized() { - setHomepagePolicy(TEST_URL_BAR); - Mockito.doReturn(true).when(mMockHomepagePolicyManger).isHomepageLocationPolicyEnabled(); - Mockito.doReturn(TEST_URL_BAR).when(mMockHomepagePolicyManger).getHomepagePreference(); + setHomepagePolicy(JUnitTestGURLs.getGURL(TEST_URL_BAR)); launchHomepageSettings(); @@ -283,7 +281,7 @@ @SmallTest @Feature({"Homepage"}) public void testStartUp_Policies_NTP() { - setHomepagePolicy(CHROME_NTP); + setHomepagePolicy(JUnitTestGURLs.getGURL(CHROME_NTP)); launchHomepageSettings(); @@ -548,7 +546,7 @@ .getHomePageUrl(); } - private void setHomepagePolicy(String homepagePolicy) { + private void setHomepagePolicy(GURL homepagePolicy) { Mockito.doReturn(true).when(mMockHomepagePolicyManger).isHomepageLocationPolicyEnabled(); Mockito.doReturn(homepagePolicy).when(mMockHomepagePolicyManger).getHomepagePreference(); }
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java index ed9c6571..f7a5b81 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java
@@ -27,6 +27,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; +import org.chromium.base.UserDataHost; import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.Feature; import org.chromium.chrome.browser.app.ChromeActivity; @@ -91,8 +92,14 @@ doReturn(false).when(mTab).isFrozen(); doReturn(false).when(mTab).isHidden(); doReturn(mWindowAndroid).when(mTab).getWindowAndroid(); + doReturn(true).when(mTab).isInitialized(); doReturn(mActivityRef).when(mWindowAndroid).getActivity(); + UserDataHost userDataHost = new UserDataHost(); + OfflinePageTabData offlinePageTabData = new OfflinePageTabData(); + userDataHost.setUserData(OfflinePageTabData.class, offlinePageTabData); + doReturn(userDataHost).when(mTab).getUserDataHost(); + // Setting up mock snackbar manager. doNothing().when(mSnackbarManager).dismissSnackbars(eq(mSnackbarController)); @@ -157,6 +164,9 @@ doReturn(false).when(mOfflinePageUtils).isOfflinePage(any(Tab.class)); observer.startObservingTab(mTab); + assertFalse(OfflinePageTabData.isShowingOfflinePage(mTab)); + assertFalse(OfflinePageTabData.isShowingTrustedOfflinePage(mTab)); + assertFalse(observer.isObservingNetworkChanges()); assertFalse(observer.isObservingTab(mTab)); verify(observer, times(0)).showReloadSnackbar(any(Tab.class)); @@ -164,6 +174,8 @@ doReturn(true).when(mOfflinePageUtils).isOfflinePage(any(Tab.class)); observer.startObservingTab(mTab); + assertTrue(OfflinePageTabData.isShowingOfflinePage(mTab)); + assertTrue(observer.isObservingNetworkChanges()); assertTrue(observer.isObservingTab(mTab)); verify(observer, times(0)).showReloadSnackbar(any(Tab.class)); @@ -422,11 +434,13 @@ assertFalse(observer.wasSnackbarSeen(mTab)); verify(observer, times(0)).stopObservingTab(any(Tab.class)); verify(mSnackbarManager, times(1)).dismissSnackbars(eq(mSnackbarController)); + assertTrue(OfflinePageTabData.isShowingOfflinePage(mTab)); // URL updated and tab no longer shows offline page. doReturn(false).when(mOfflinePageUtils).isOfflinePage(any(Tab.class)); observer.onUrlUpdated(mTab); + assertFalse(OfflinePageTabData.isShowingOfflinePage(mTab)); assertFalse(observer.isObservingTab(mTab)); assertFalse(observer.isLoadedTab(mTab)); assertFalse(observer.wasSnackbarSeen(mTab));
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/read_later/ReadingListUtilsUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/read_later/ReadingListUtilsUnitTest.java index 2df2da2..7ed85d8 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/read_later/ReadingListUtilsUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/read_later/ReadingListUtilsUnitTest.java
@@ -25,7 +25,6 @@ import org.chromium.base.FeatureList; import org.chromium.base.FeatureList.TestValues; import org.chromium.base.test.BaseRobolectricTestRunner; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.tab.Tab; @@ -44,7 +43,7 @@ @Config(manifest = Config.NONE) public class ReadingListUtilsUnitTest { @Mock - BookmarkBridge mBookmarkModel; + BookmarkModel mBookmarkModel; @Mock BookmarkId mBookmarkId; @@ -190,21 +189,21 @@ BookmarkItem existingBookmark = new BookmarkItem(existingBookmarkId, "Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL), /*isFolder=*/false, /*parent=*/null, /*isEditable=*/true, /*isManaged=*/false, /*dateAdded*/ 0, /*read=*/false); - BookmarkBridge bookmarkBridge = Mockito.mock(BookmarkBridge.class); - doReturn(existingBookmark).when(bookmarkBridge).getBookmarkById(existingBookmarkId); + BookmarkModel bookmarkModel = Mockito.mock(BookmarkModel.class); + doReturn(existingBookmark).when(bookmarkModel).getBookmarkById(existingBookmarkId); BookmarkId newBookmarkId = new BookmarkId(0, BookmarkType.READING_LIST); doReturn(newBookmarkId) - .when(bookmarkBridge) + .when(bookmarkModel) .addToReadingList("Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); ArrayList<BookmarkId> bookmarks = new ArrayList<>(); bookmarks.add(existingBookmarkId); ArrayList<BookmarkId> typeSwappedBookmarks = new ArrayList<>(); ReadingListUtils.typeSwapBookmarksIfNecessary( - bookmarkBridge, bookmarks, typeSwappedBookmarks, parentId); - verify(bookmarkBridge) + bookmarkModel, bookmarks, typeSwappedBookmarks, parentId); + verify(bookmarkModel) .addToReadingList("Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); - verify(bookmarkBridge).deleteBookmark(existingBookmarkId); + verify(bookmarkModel).deleteBookmark(existingBookmarkId); Assert.assertEquals(0, bookmarks.size()); Assert.assertEquals(1, typeSwappedBookmarks.size()); } @@ -219,21 +218,21 @@ BookmarkItem existingBookmark = new BookmarkItem(existingBookmarkId, "Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL), /*isFolder=*/false, /*parent=*/null, /*isEditable=*/true, /*isManaged=*/false, /*dateAdded*/ 0, /*read=*/false); - BookmarkBridge bookmarkBridge = Mockito.mock(BookmarkBridge.class); - doReturn(existingBookmark).when(bookmarkBridge).getBookmarkById(existingBookmarkId); + BookmarkModel bookmarkModel = Mockito.mock(BookmarkModel.class); + doReturn(existingBookmark).when(bookmarkModel).getBookmarkById(existingBookmarkId); BookmarkId newBookmarkId = new BookmarkId(0, BookmarkType.NORMAL); doReturn(newBookmarkId) - .when(bookmarkBridge) + .when(bookmarkModel) .addBookmark(parentId, 0, "Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); ArrayList<BookmarkId> bookmarks = new ArrayList<>(); bookmarks.add(existingBookmarkId); ArrayList<BookmarkId> typeSwappedBookmarks = new ArrayList<>(); ReadingListUtils.typeSwapBookmarksIfNecessary( - bookmarkBridge, bookmarks, typeSwappedBookmarks, parentId); - verify(bookmarkBridge) + bookmarkModel, bookmarks, typeSwappedBookmarks, parentId); + verify(bookmarkModel) .addBookmark(parentId, 0, "Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); - verify(bookmarkBridge).deleteBookmark(existingBookmarkId); + verify(bookmarkModel).deleteBookmark(existingBookmarkId); Assert.assertEquals(0, bookmarks.size()); Assert.assertEquals(1, typeSwappedBookmarks.size()); } @@ -252,17 +251,17 @@ BookmarkItem existingBookmark2 = new BookmarkItem(existingBookmarkId2, "Test2", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL), /*isFolder=*/false, /*parent=*/null, /*isEditable=*/true, /*isManaged=*/false, /*dateAdded*/ 0, /*read=*/false); - BookmarkBridge bookmarkBridge = Mockito.mock(BookmarkBridge.class); - doReturn(existingBookmark1).when(bookmarkBridge).getBookmarkById(existingBookmarkId1); - doReturn(existingBookmark2).when(bookmarkBridge).getBookmarkById(existingBookmarkId2); + BookmarkModel bookmarkModel = Mockito.mock(BookmarkModel.class); + doReturn(existingBookmark1).when(bookmarkModel).getBookmarkById(existingBookmarkId1); + doReturn(existingBookmark2).when(bookmarkModel).getBookmarkById(existingBookmarkId2); BookmarkId newBookmarkId1 = new BookmarkId(3, BookmarkType.NORMAL); doReturn(newBookmarkId1) - .when(bookmarkBridge) + .when(bookmarkModel) .addBookmark(parentId, 0, "Test1", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); BookmarkId newBookmarkId2 = new BookmarkId(4, BookmarkType.NORMAL); doReturn(newBookmarkId2) - .when(bookmarkBridge) + .when(bookmarkModel) .addBookmark(parentId, 0, "Test2", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); ArrayList<BookmarkId> bookmarks = new ArrayList<>(); @@ -270,16 +269,16 @@ bookmarks.add(existingBookmarkId2); ArrayList<BookmarkId> typeSwappedBookmarks = new ArrayList<>(); ReadingListUtils.typeSwapBookmarksIfNecessary( - bookmarkBridge, bookmarks, typeSwappedBookmarks, parentId); + bookmarkModel, bookmarks, typeSwappedBookmarks, parentId); Assert.assertEquals(0, bookmarks.size()); Assert.assertEquals(2, typeSwappedBookmarks.size()); - verify(bookmarkBridge) + verify(bookmarkModel) .addBookmark(parentId, 0, "Test1", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); - verify(bookmarkBridge).deleteBookmark(existingBookmarkId1); - verify(bookmarkBridge) + verify(bookmarkModel).deleteBookmark(existingBookmarkId1); + verify(bookmarkModel) .addBookmark(parentId, 0, "Test2", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL)); - verify(bookmarkBridge).deleteBookmark(existingBookmarkId2); + verify(bookmarkModel).deleteBookmark(existingBookmarkId2); } @Test @@ -292,13 +291,13 @@ BookmarkItem existingBookmark = new BookmarkItem(existingBookmarkId, "Test", JUnitTestGURLs.getGURL(JUnitTestGURLs.NTP_URL), /*isFolder=*/false, /*parent=*/null, /*isEditable=*/true, /*isManaged=*/false, /*dateAdded*/ 0, /*read=*/false); - BookmarkBridge bookmarkBridge = Mockito.mock(BookmarkBridge.class); + BookmarkModel bookmarkModel = Mockito.mock(BookmarkModel.class); ArrayList<BookmarkId> bookmarks = new ArrayList<>(); bookmarks.add(existingBookmarkId); ArrayList<BookmarkId> typeSwappedBookmarks = new ArrayList<>(); ReadingListUtils.typeSwapBookmarksIfNecessary( - bookmarkBridge, bookmarks, typeSwappedBookmarks, parentId); + bookmarkModel, bookmarks, typeSwappedBookmarks, parentId); Assert.assertEquals(1, bookmarks.size()); Assert.assertEquals(0, typeSwappedBookmarks.size()); Assert.assertEquals(existingBookmarkId, bookmarks.get(0));
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java index e5e2366a..fc14678 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java
@@ -38,7 +38,7 @@ import org.chromium.base.test.util.JniMocker; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils; import org.chromium.chrome.browser.commerce.ShoppingServiceFactory; import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils; @@ -171,7 +171,7 @@ new OneshotSupplierImpl<>(); private OneshotSupplierImpl<IncognitoReauthController> mIncognitoReauthControllerSupplier = new OneshotSupplierImpl<>(); - private ObservableSupplierImpl<BookmarkBridge> mBookmarkBridgeSupplier = + private ObservableSupplierImpl<BookmarkModel> mBookmarkModelSupplier = new ObservableSupplierImpl<>(); private TabbedAppMenuPropertiesDelegate mTabbedAppMenuPropertiesDelegate; @@ -221,7 +221,7 @@ new TabbedAppMenuPropertiesDelegate(ContextUtils.getApplicationContext(), mActivityTabProvider, mMultiWindowModeStateDispatcher, mTabModelSelector, mToolbarManager, mDecorView, mAppMenuDelegate, mLayoutStateProviderSupplier, - null, mBookmarkBridgeSupplier, mFeedLauncher, mDialogManager, + null, mBookmarkModelSupplier, mFeedLauncher, mDialogManager, mSnackbarManager, mIncognitoReauthControllerSupplier)); SharedPreferencesManager.getInstance().removeKeysWithPrefix( ChromePreferenceKeys.MULTI_INSTANCE_URL);
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/LocationBarModelUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/LocationBarModelUnitTest.java index 6d9ee9bb..6050049 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/LocationBarModelUnitTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/toolbar/LocationBarModelUnitTest.java
@@ -55,7 +55,6 @@ import org.chromium.components.omnibox.OmniboxUrlEmphasizerJni; import org.chromium.components.url_formatter.UrlFormatter; import org.chromium.components.url_formatter.UrlFormatterJni; -import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; import org.chromium.url.GURL; import org.chromium.url.ShadowGURL; @@ -145,7 +144,7 @@ public static final LocationBarModel.OfflineStatus OFFLINE_STATUS = new LocationBarModel.OfflineStatus() { @Override - public boolean isShowingTrustedOfflinePage(WebContents webContents) { + public boolean isShowingTrustedOfflinePage(Tab tab) { return false; }
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 2651f09..23e9111 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc
@@ -73,6 +73,7 @@ #include "components/nacl/common/buildflags.h" #include "components/services/heap_profiling/public/cpp/profiling_client.h" #include "components/startup_metric_utils/browser/startup_metric_utils.h" +#include "components/version_info/channel.h" #include "components/version_info/version_info.h" #include "content/public/app/initialize_mojo_core.h" #include "content/public/common/content_client.h" @@ -806,6 +807,10 @@ chrome::CacheChannelInfo(); #endif + // TODO(https://crbug.com/1360376): Consider deferring this to run after + // startup. + RequestUnwindPrerequisitesInstallation(chrome::GetChannel()); + return absl::nullopt; }
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 41fd973..0b16816f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -7163,6 +7163,18 @@ <message name="IDS_READ_ANYTHING_LETTER_SPACING_COMBOBOX_LABEL" desc="Accessibility label for the letter spacing combobox of the Read Anything feature." translateable="false"> Letter spacing </message> + <message name="IDS_READ_ANYTHING_SPACING_COMBOBOX_TIGHT" desc="Combobox option for setting letter and line spacing of text in the Read Anything feature. Tight means that letters/lines are spaced closely together." translateable="false"> + Tight + </message> + <message name="IDS_READ_ANYTHING_SPACING_COMBOBOX_DEFAULT" desc="Combobox option for setting letter and line spacing of text in the Read Anything feature. Default means that leters/lines are spaced in a standard manner." translateable="false"> + Default + </message> + <message name="IDS_READ_ANYTHING_SPACING_COMBOBOX_LOOSE" desc="Combobox option for setting letter and line spacing of text in the Read Anything feature. Loose means that letters/lines are spaced far apart." translateable="false"> + Loose + </message> + <message name="IDS_READ_ANYTHING_SPACING_COMBOBOX_VERY_LOOSE" desc="Combobox option for setting letter and line spacing of text in the Read Anything feature. Very loose means that letters/lines are spaced very far apart." translateable="false"> + Very loose + </message> <!-- User note strings --> <message name="IDS_USER_NOTE_TITLE" desc="Title of the User note feature, which gives users access to private user notes.">
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index ae9a4e2..ec7be1c 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -5094,10 +5094,10 @@ "speech/crosapi_tts_engine_delegate_ash.h", "speech/network_speech_recognizer.cc", "speech/network_speech_recognizer.h", - "speech/on_device_speech_recognizer.cc", - "speech/on_device_speech_recognizer.h", "speech/speech_recognition_constants.cc", "speech/speech_recognition_constants.h", + "speech/speech_recognition_recognizer_client_impl.cc", + "speech/speech_recognition_recognizer_client_impl.h", "speech/speech_recognizer.cc", "speech/speech_recognizer.h", "speech/speech_recognizer_delegate.h",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 9ad74d6..c2a80b4 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -1189,13 +1189,21 @@ kSidePanelJourneysOpensFromOmniboxParams, std::size(kSidePanelJourneysOpensFromOmniboxParams), nullptr}, }; -const FeatureEntry::FeatureParam kJourneysContentClusteringParams[] = { +const FeatureEntry::FeatureParam kJourneysJaccardSimilarityParams[] = { {"collections_blocklist", "/collection/software"}, {"exclude_entities_that_have_no_collections", "true"}, + {"use_content_clustering_cosine_similarity", "false"}, +}; +const FeatureEntry::FeatureParam kJourneysCosineSimilarityParams[] = { + {"collections_blocklist", "/collection/software"}, + {"exclude_entities_that_have_no_collections", "true"}, + {"use_content_clustering_cosine_similarity", "true"}, }; const FeatureEntry::FeatureVariation kJourneysContentClusteringVariations[] = { - {"With Blocklist", kJourneysContentClusteringParams, - std::size(kJourneysContentClusteringParams), nullptr}, + {"Jaccard Similarity With Blocklist", kJourneysJaccardSimilarityParams, + std::size(kJourneysJaccardSimilarityParams), nullptr}, + {"Cosine Similarity With Blocklist", kJourneysCosineSimilarityParams, + std::size(kJourneysCosineSimilarityParams), nullptr}, }; const FeatureEntry::FeatureParam kJourneysLabelsWithEntitiesParams[] = { {"labels_from_entities", "true"}, @@ -5473,6 +5481,11 @@ flag_descriptions::kOmniboxLocalHistoryZeroSuggestBeyondNTPDescription, kOsAll, FEATURE_VALUE_TYPE(omnibox::kLocalHistoryZeroSuggestBeyondNTP)}, + {"omnibox-on-clobber-focus-type-on-android", + flag_descriptions::kOmniboxOnClobberFocusTypeOnAndroidName, + flag_descriptions::kOmniboxOnClobberFocusTypeOnAndroidDescription, kOsAll, + FEATURE_VALUE_TYPE(omnibox::kOmniboxOnClobberFocusTypeOnAndroid)}, + {"omnibox-on-focus-suggestions-contextual-web", flag_descriptions::kOmniboxFocusTriggersContextualWebZeroSuggestName, flag_descriptions:: @@ -6570,12 +6583,6 @@ flag_descriptions::kDisableQuickAnswersV2TranslationDescription, kOsCrOS | kOsLacros, FEATURE_VALUE_TYPE(chromeos::features::kDisableQuickAnswersV2Translation)}, - - {"quick-answers-for-more-locales", - flag_descriptions::kQuickAnswersForMoreLocalesName, - flag_descriptions::kQuickAnswersForMoreLocalesDescription, - kOsCrOS | kOsLacros, - FEATURE_VALUE_TYPE(chromeos::features::kQuickAnswersForMoreLocales)}, #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_ANDROID)
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index d823e3a..ce21fd52 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -233,6 +233,12 @@ auto page_class = OmniboxEventProto::PageClassification(j_page_classification); + bool interaction_clobber_focus_type = + base::FeatureList::IsEnabled( + omnibox::kOmniboxOnClobberFocusTypeOnAndroid) && + !BaseSearchProvider::IsNTPPage(page_class); + if (interaction_clobber_focus_type) + omnibox_text.clear(); // Proactively start up a renderer, to reduce the time to display search // results, especially if a Service Worker is used. This is done in a PostTask @@ -255,7 +261,17 @@ ChromeAutocompleteSchemeClassifier(profile_)); input_.set_current_url(current_url); input_.set_current_title(current_title); - input_.set_focus_type(metrics::OmniboxFocusType::INTERACTION_FOCUS); + + // Assign focus type to INTERACTION_CLOBBER to non-NTP zero-prefix requests + input_.set_focus_type(interaction_clobber_focus_type + ? metrics::OmniboxFocusType::INTERACTION_CLOBBER + : metrics::OmniboxFocusType::INTERACTION_FOCUS); + + base::UmaHistogramEnumeration("Omnibox.ZeroPrefixFocusType", + input_.focus_type(), + static_cast<metrics::OmniboxFocusType>( + metrics::OmniboxFocusType_MAX + 1)); + autocomplete_controller_->Start(input_); }
diff --git a/chrome/browser/android/vr/vr_controller.cc b/chrome/browser/android/vr/vr_controller.cc index c599ba8..292817f0 100644 --- a/chrome/browser/android/vr/vr_controller.cc +++ b/chrome/browser/android/vr/vr_controller.cc
@@ -205,7 +205,7 @@ GetTransform(&controller); GetRelativePointerTransform(out); - out->ConcatTransform(controller); + out->PostConcat(controller); } float VrController::GetOpacity() const {
diff --git a/chrome/browser/ash/child_accounts/COMMON_METADATA b/chrome/browser/ash/child_accounts/COMMON_METADATA new file mode 100644 index 0000000..703e0f1 --- /dev/null +++ b/chrome/browser/ash/child_accounts/COMMON_METADATA
@@ -0,0 +1,15 @@ +# Metadata information for this directory. +# +# For more information on DIR_METADATA files, see: +# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md +# +# For the schema of this file, see Metadata message: +# https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto + +# ChromeOS FamilyExperiences team +team_email: "cros-families-eng@google.com" +os: CHROME_OS +buganizer { + # ChromeOS > Software > Family > Parental controls + component_id: 1090157 +} \ No newline at end of file
diff --git a/chrome/browser/ash/child_accounts/DIR_METADATA b/chrome/browser/ash/child_accounts/DIR_METADATA new file mode 100644 index 0000000..eff0b992 --- /dev/null +++ b/chrome/browser/ash/child_accounts/DIR_METADATA
@@ -0,0 +1 @@ +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc index 159b17c..f297418 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc
@@ -18,16 +18,16 @@ namespace ash { -EasyUnlockKeyManager::EasyUnlockKeyManager() {} +EasyUnlockKeyManager::EasyUnlockKeyManager() = default; -EasyUnlockKeyManager::~EasyUnlockKeyManager() {} +EasyUnlockKeyManager::~EasyUnlockKeyManager() = default; void EasyUnlockKeyManager::RefreshKeys(const UserContext& user_context, const base::Value::List& remote_devices, RefreshKeysCallback callback) { EasyUnlockTpmKeyManager* tpm_key_manager = - EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser( - user_context.GetAccountId().GetUserEmail()); + EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForAccountId( + user_context.GetAccountId()); if (!tpm_key_manager) { PA_LOG(ERROR) << "No TPM key manager."; std::move(callback).Run(false); @@ -62,8 +62,8 @@ base::Value::List remote_devices, RefreshKeysCallback callback) { EasyUnlockTpmKeyManager* tpm_key_manager = - EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser( - user_context.GetAccountId().GetUserEmail()); + EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForAccountId( + user_context.GetAccountId()); const std::string tpm_public_key = tpm_key_manager->GetPublicTpmKey(user_context.GetAccountId());
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc index 7b80732..125c65a 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc
@@ -10,7 +10,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "components/account_id/account_id.h" -#include "components/user_manager/known_user.h" #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" @@ -36,12 +35,10 @@ ->GetServiceForBrowserContext(browser_context, true)); } -EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::GetForUser( - const std::string& user_id) { +EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::GetForAccountId( + const AccountId& account_id) { user_manager::UserManager* user_manager = user_manager::UserManager::Get(); - const user_manager::User* user = - user_manager->FindUser(user_manager::known_user::GetAccountId( - user_id, std::string() /* id */, AccountType::UNKNOWN)); + const user_manager::User* user = user_manager->FindUser(account_id); if (!user) return nullptr; Profile* profile = ProfileHelper::Get()->GetProfileByUser(user); @@ -55,7 +52,7 @@ "EasyUnlockTpmKeyManager", ProfileSelections::BuildRedirectedInIncognito()) {} -EasyUnlockTpmKeyManagerFactory::~EasyUnlockTpmKeyManagerFactory() {} +EasyUnlockTpmKeyManagerFactory::~EasyUnlockTpmKeyManagerFactory() = default; KeyedService* EasyUnlockTpmKeyManagerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const {
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h index 0a7b9f8..f50ef6b4 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h
@@ -5,9 +5,10 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_EASY_UNLOCK_EASY_UNLOCK_TPM_KEY_MANAGER_FACTORY_H_ #define CHROME_BROWSER_ASH_LOGIN_EASY_UNLOCK_EASY_UNLOCK_TPM_KEY_MANAGER_FACTORY_H_ -#include <string> - #include "chrome/browser/profiles/profile_keyed_service_factory.h" +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" + +class AccountId; namespace content { class BrowserContext; @@ -27,7 +28,7 @@ static EasyUnlockTpmKeyManagerFactory* GetInstance(); static EasyUnlockTpmKeyManager* Get(content::BrowserContext* context); - static EasyUnlockTpmKeyManager* GetForUser(const std::string& user_id); + static EasyUnlockTpmKeyManager* GetForAccountId(const AccountId& account_id); EasyUnlockTpmKeyManagerFactory(const EasyUnlockTpmKeyManagerFactory&) = delete;
diff --git a/chrome/browser/chromeos/extensions/speech/speech_recognition_private_recognizer.cc b/chrome/browser/chromeos/extensions/speech/speech_recognition_private_recognizer.cc index 0d7ddc22..446fa68 100644 --- a/chrome/browser/chromeos/extensions/speech/speech_recognition_private_recognizer.cc +++ b/chrome/browser/chromeos/extensions/speech/speech_recognition_private_recognizer.cc
@@ -8,10 +8,11 @@ #include "chrome/browser/chromeos/extensions/speech/speech_recognition_private_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/speech/network_speech_recognizer.h" -#include "chrome/browser/speech/on_device_speech_recognizer.h" +#include "chrome/browser/speech/speech_recognition_recognizer_client_impl.h" #include "components/language/core/browser/pref_names.h" #include "components/prefs/pref_service.h" #include "content/public/browser/storage_partition.h" +#include "media/mojo/mojom/speech_recognition_service.mojom.h" namespace { const char kSpeechRecognitionError[] = "A speech recognition error occurred"; @@ -39,8 +40,9 @@ bool is_final, const absl::optional<media::SpeechRecognitionResult>& full_result) { // TODO(crbug.com/1220107): NetworkSpeechRecognizer adds spaces between - // results, but OnDeviceSpeechRecognizer doesn't. Add behavior in - // OnDeviceSpeechRecognizer so it's consistent with NetworkSpeechRecognizer. + // results, but SpeechRecognitionRecognizerClientImpl doesn't. Add behavior in + // SpeechRecognitionRecognizerClientImpl so it's consistent with + // NetworkSpeechRecognizer. if (!interim_results_ && !is_final) { // If |interim_results_| is false, then don't handle the result unless this // is a final result. @@ -104,11 +106,18 @@ // Choose which type of speech recognition, either on-device or network. Profile* profile = Profile::FromBrowserContext(context_); - if (OnDeviceSpeechRecognizer::IsOnDeviceSpeechRecognizerAvailable(locale_)) { + if (SpeechRecognitionRecognizerClientImpl:: + IsOnDeviceSpeechRecognizerAvailable(locale_)) { type_ = speech::SpeechRecognitionType::kOnDevice; - speech_recognizer_ = std::make_unique<OnDeviceSpeechRecognizer>( - GetWeakPtr(), profile, locale_, - /*recognition_mode_ime=*/true, /*enable_formatting=*/false); + speech_recognizer_ = + std::make_unique<SpeechRecognitionRecognizerClientImpl>( + GetWeakPtr(), profile, + media::mojom::SpeechRecognitionOptions::New( + media::mojom::SpeechRecognitionMode::kIme, + /*enable_formatting=*/false, + /*language=*/locale_, + /*is_server_based=*/false, + media::mojom::RecognizerClientType::kDictation)); } else { type_ = speech::SpeechRecognitionType::kNetwork; speech_recognizer_ = std::make_unique<NetworkSpeechRecognizer>(
diff --git a/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc b/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc index 2103a94..6934294 100644 --- a/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc +++ b/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc
@@ -270,4 +270,54 @@ desk_Id.AsLowercaseString()))); } +WmDesksPrivateGetActiveDeskFunction::WmDesksPrivateGetActiveDeskFunction() = + default; +WmDesksPrivateGetActiveDeskFunction::~WmDesksPrivateGetActiveDeskFunction() = + default; + +ExtensionFunction::ResponseAction WmDesksPrivateGetActiveDeskFunction::Run() { + base::GUID desk_id = DesksClient::Get()->GetActiveDesk(); + OnGetActiveDesk({}, desk_id); + return AlreadyResponded(); +} + +// Error is always empty right now. The interface is to keep compatible +// with future lacros implementation. +void WmDesksPrivateGetActiveDeskFunction::OnGetActiveDesk( + std::string error_string, + const base::GUID& desk_Id) { + if (!error_string.empty()) { + Respond(Error(std::move(error_string))); + return; + } + + Respond(ArgumentList(api::wm_desks_private::GetActiveDesk::Results::Create( + desk_Id.AsLowercaseString()))); +} + +WmDesksPrivateSwitchDeskFunction::WmDesksPrivateSwitchDeskFunction() = default; +WmDesksPrivateSwitchDeskFunction::~WmDesksPrivateSwitchDeskFunction() = default; + +ExtensionFunction::ResponseAction WmDesksPrivateSwitchDeskFunction::Run() { + std::unique_ptr<api::wm_desks_private::SwitchDesk::Params> params( + api::wm_desks_private::SwitchDesk::Params::Create(args())); + EXTENSION_FUNCTION_VALIDATE(params); + base::GUID uuid = base::GUID::ParseCaseInsensitive(params->desk_uuid); + if (!uuid.is_valid()) + return RespondNow(Error(kInvalidUuidError)); + + std::string error = DesksClient::Get()->SwitchDesk(uuid); + OnSwitchDesk(error); + return AlreadyResponded(); +} + +// The interface is to keep compatible with future lacros implementation. +void WmDesksPrivateSwitchDeskFunction::OnSwitchDesk(std::string error_string) { + if (!error_string.empty()) { + Respond(Error(std::move(error_string))); + return; + } + Respond(NoArguments()); +} + } // namespace extensions
diff --git a/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.h b/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.h index 1939611..c8909c2 100644 --- a/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.h +++ b/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.h
@@ -176,6 +176,46 @@ void OnRecalledSavedDesk(std::string error_string, const base::GUID& desk_Id); }; +class WmDesksPrivateGetActiveDeskFunction : public ExtensionFunction { + public: + WmDesksPrivateGetActiveDeskFunction(); + WmDesksPrivateGetActiveDeskFunction( + const WmDesksPrivateGetActiveDeskFunction&) = delete; + WmDesksPrivateGetActiveDeskFunction& operator=( + const WmDesksPrivateGetActiveDeskFunction&) = delete; + + DECLARE_EXTENSION_FUNCTION("wmDesksPrivate.getActiveDesk", + WMDESKSPRIVATE_GETACTIVEDESK) + + protected: + ~WmDesksPrivateGetActiveDeskFunction() override; + + // ExtensionFunction: + ResponseAction Run() override; + + void OnGetActiveDesk(std::string error_string, const base::GUID& desk_Id); +}; + +class WmDesksPrivateSwitchDeskFunction : public ExtensionFunction { + public: + WmDesksPrivateSwitchDeskFunction(); + WmDesksPrivateSwitchDeskFunction(const WmDesksPrivateSwitchDeskFunction&) = + delete; + WmDesksPrivateSwitchDeskFunction& operator=( + const WmDesksPrivateSwitchDeskFunction&) = delete; + + DECLARE_EXTENSION_FUNCTION("wmDesksPrivate.switchDesk", + WMDESKSPRIVATE_SWITCHDESK) + + protected: + ~WmDesksPrivateSwitchDeskFunction() override; + + // ExtensionFunction: + ResponseAction Run() override; + + void OnSwitchDesk(std::string error_string); +}; + } // namespace extensions #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_WM_WM_DESKS_PRIVATE_API_H_
diff --git a/chrome/browser/commerce/price_tracking/android/DEPS b/chrome/browser/commerce/price_tracking/android/DEPS index 0ef13e8..c5f1536 100644 --- a/chrome/browser/commerce/price_tracking/android/DEPS +++ b/chrome/browser/commerce/price_tracking/android/DEPS
@@ -2,7 +2,7 @@ "+chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java", "+chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java", "+chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java", - "+chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java", + "+chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java", "+chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkModelObserver.java", "+chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java", "+chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java",
diff --git a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java index f8fec31..bb6d816 100644 --- a/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java +++ b/chrome/browser/commerce/price_tracking/android/java/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerImpl.java
@@ -29,7 +29,7 @@ import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.base.metrics.RecordHistogram; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.bookmarks.BookmarkModelObserver; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.document.ChromeLauncherActivity; @@ -93,7 +93,7 @@ "Commerce.PriceDrops.UserManaged.NotificationCount"; private static NotificationManagerProxy sNotificationManagerForTesting; - private static BookmarkBridge sBookmarkBridgeForTesting; + private static BookmarkModel sBookmarkModelForTesting; /** * Used to host click logic for "turn off alert" action intent. @@ -244,11 +244,11 @@ String.format( Locale.US, "Failed to remove subscriptions. Status: %d", status)); }; - final BookmarkBridge bookmarkBridge; - if (sBookmarkBridgeForTesting != null) { - bookmarkBridge = sBookmarkBridgeForTesting; + final BookmarkModel bookmarkModel; + if (sBookmarkModelForTesting != null) { + bookmarkModel = sBookmarkModelForTesting; } else { - bookmarkBridge = new BookmarkBridge(Profile.getLastUsedRegularProfile()); + bookmarkModel = new BookmarkModel(Profile.getLastUsedRegularProfile()); } Runnable unsubscribeRunnable = () -> { @@ -269,14 +269,14 @@ }; // Only attempt to unsubscribe once the corresponding bookmarks can also be updated. - if (bookmarkBridge.isBookmarkModelLoaded()) { + if (bookmarkModel.isBookmarkModelLoaded()) { unsubscribeRunnable.run(); } else { - bookmarkBridge.addObserver(new BookmarkModelObserver() { + bookmarkModel.addObserver(new BookmarkModelObserver() { @Override public void bookmarkModelLoaded() { unsubscribeRunnable.run(); - bookmarkBridge.removeObserver(this); + bookmarkModel.removeObserver(this); } @Override @@ -419,13 +419,13 @@ } /** - * Set a mock BookmarkBridge for testing so we don't need to access Profile. + * Set a mock BookmarkModel for testing so we don't need to access Profile. * - * @param bookmarkBridge The bookmark bridge to use. + * @param bookmarkModel The bookmark bridge to use. */ @VisibleForTesting - public static void setBookmarkBridgeForTesting(BookmarkBridge bookmarkBridge) { - sBookmarkBridgeForTesting = bookmarkBridge; + public static void setBookmarkModelForTesting(BookmarkModel bookmarkModel) { + sBookmarkModelForTesting = bookmarkModel; } /**
diff --git a/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java b/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java index 3a38cea7..067bc57 100644 --- a/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java +++ b/chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java
@@ -40,7 +40,7 @@ import org.chromium.base.ContextUtils; import org.chromium.base.IntentUtils; import org.chromium.base.test.util.CommandLineFlags; -import org.chromium.chrome.browser.bookmarks.BookmarkBridge; +import org.chromium.chrome.browser.bookmarks.BookmarkModel; import org.chromium.chrome.browser.browserservices.intents.WebappConstants; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; @@ -105,15 +105,15 @@ private SubscriptionsManagerImpl mMockSubscriptionsManager; @Mock - private BookmarkBridge mMockBookmarkBridge; + private BookmarkModel mMockBookmarkModel; @Before public void setUp() { mMockNotificationManager = new MockNotificationManagerProxy(); PriceDropNotificationManagerImpl.setNotificationManagerForTesting(mMockNotificationManager); mPriceDropNotificationManager = PriceDropNotificationManagerFactory.create(); - when(mMockBookmarkBridge.isBookmarkModelLoaded()).thenReturn(true); - PriceDropNotificationManagerImpl.setBookmarkBridgeForTesting(mMockBookmarkBridge); + when(mMockBookmarkModel.isBookmarkModelLoaded()).thenReturn(true); + PriceDropNotificationManagerImpl.setBookmarkModelForTesting(mMockBookmarkModel); } @After
diff --git a/chrome/browser/dips/BUILD.gn b/chrome/browser/dips/BUILD.gn index fee2ffd8..75305ec6 100644 --- a/chrome/browser/dips/BUILD.gn +++ b/chrome/browser/dips/BUILD.gn
@@ -6,6 +6,7 @@ testonly = true sources = [ "cookie_access_filter_unittest.cc", + "dips_bounce_detector_unittest.cc", "dips_database_unittest.cc", "dips_storage_unittest.cc", "dips_utils_unittest.cc", @@ -15,6 +16,7 @@ "//base", "//base/test:test_support", "//chrome/browser", + "//components/ukm:test_support", "//testing/gtest", "//url", ]
diff --git a/chrome/browser/dips/cookie_access_filter.cc b/chrome/browser/dips/cookie_access_filter.cc index 74ed64b..68b46f87 100644 --- a/chrome/browser/dips/cookie_access_filter.cc +++ b/chrome/browser/dips/cookie_access_filter.cc
@@ -9,9 +9,10 @@ CookieAccessFilter::CookieAccessFilter() = default; CookieAccessFilter::~CookieAccessFilter() = default; -void CookieAccessFilter::AddAccess(const GURL& url, Type type) { - CookieAccessType t = (type == Type::kChange ? CookieAccessType::kWrite - : CookieAccessType::kRead); +void CookieAccessFilter::AddAccess(const GURL& url, CookieOperation op) { + CookieAccessType t = + (op == CookieOperation::kChange ? CookieAccessType::kWrite + : CookieAccessType::kRead); if (!accesses_.empty() && accesses_.back().url == url) { // Coalesce accesses for the same URL. They may have come from separate // visits, but we can't distinguish them from redundant calls, which are
diff --git a/chrome/browser/dips/cookie_access_filter.h b/chrome/browser/dips/cookie_access_filter.h index 0d2fac9..d6520221 100644 --- a/chrome/browser/dips/cookie_access_filter.h +++ b/chrome/browser/dips/cookie_access_filter.h
@@ -8,7 +8,6 @@ #include <vector> #include "chrome/browser/dips/dips_utils.h" -#include "services/network/public/mojom/cookie_access_observer.mojom.h" #include "url/gurl.h" // Filters a chain of URLs to the ones which accessed cookies. @@ -20,10 +19,8 @@ CookieAccessFilter(); ~CookieAccessFilter(); - using Type = network::mojom::CookieAccessDetails::Type; - // Record that `url` accessed cookies. - void AddAccess(const GURL& url, Type type); + void AddAccess(const GURL& url, CookieOperation op); // Clear `result` and fill it with the the type of cookie access for each URL. // `result` will have the same length as `urls`. Returns true iff every
diff --git a/chrome/browser/dips/cookie_access_filter_unittest.cc b/chrome/browser/dips/cookie_access_filter_unittest.cc index 224491e..e48e194 100644 --- a/chrome/browser/dips/cookie_access_filter_unittest.cc +++ b/chrome/browser/dips/cookie_access_filter_unittest.cc
@@ -42,7 +42,7 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -54,7 +54,7 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -66,7 +66,7 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url2, CookieAccessFilter::Type::kChange); + filter.AddAccess(url2, CookieOperation::kChange); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -78,7 +78,7 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(GURL("http://other.com"), CookieAccessFilter::Type::kRead); + filter.AddAccess(GURL("http://other.com"), CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_FALSE(filter.Filter({url1, url2}, &result)); @@ -90,8 +90,8 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -103,9 +103,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -117,9 +117,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url1, url2}, &result)); @@ -132,9 +132,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -146,9 +146,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url1, url2}, &result)); @@ -161,9 +161,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -175,9 +175,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url1, url2}, &result)); @@ -190,9 +190,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2}, &result)); @@ -204,9 +204,9 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url1, CookieOperation::kRead); + filter.AddAccess(url2, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url1, url2}, &result)); @@ -219,10 +219,10 @@ GURL url1("http://example.com"); GURL url2("http://google.com"); CookieAccessFilter filter; - filter.AddAccess(url1, CookieAccessFilter::Type::kChange); - filter.AddAccess(url2, CookieAccessFilter::Type::kRead); - filter.AddAccess(url2, CookieAccessFilter::Type::kChange); - filter.AddAccess(url1, CookieAccessFilter::Type::kRead); + filter.AddAccess(url1, CookieOperation::kChange); + filter.AddAccess(url2, CookieOperation::kRead); + filter.AddAccess(url2, CookieOperation::kChange); + filter.AddAccess(url1, CookieOperation::kRead); std::vector<CookieAccessType> result; ASSERT_TRUE(filter.Filter({url1, url2, url1}, &result));
diff --git a/chrome/browser/dips/dips_bounce_detector.cc b/chrome/browser/dips/dips_bounce_detector.cc index 54b33c3..2ac351d4 100644 --- a/chrome/browser/dips/dips_bounce_detector.cc +++ b/chrome/browser/dips/dips_bounce_detector.cc
@@ -7,6 +7,7 @@ #include <cmath> #include <vector> +#include "base/bind.h" #include "base/feature_list.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" @@ -27,40 +28,23 @@ using blink::mojom::EngagementLevel; using content::NavigationHandle; +ServerBounceDetectionState::ServerBounceDetectionState() = default; +ServerBounceDetectionState::~ServerBounceDetectionState() = default; +ServerBounceDetectionState::ServerBounceDetectionState( + NavigationHandle& navigation_handle) {} + +NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(ServerBounceDetectionState); + namespace { // Controls whether UKM metrics are collected for DIPS. BASE_FEATURE(kDipsUkm, "DipsUkm", base::FEATURE_ENABLED_BY_DEFAULT); -// ServerBounceDetectionState gets attached to NavigationHandle (which is a -// SupportsUserData subclass) to store data needed to detect stateful -// server-side redirects. -class ServerBounceDetectionState - : public content::NavigationHandleUserData<ServerBounceDetectionState> { - public: - DIPSNavigationStart navigation_start; - CookieAccessFilter filter; - - private: - explicit ServerBounceDetectionState( - content::NavigationHandle& navigation_handle) {} - - friend NavigationHandleUserData; - NAVIGATION_HANDLE_USER_DATA_KEY_DECL(); -}; - // The amount of time since finishing navigation to a page that a client-side // redirect must happen within to count as a bounce (provided that all other // criteria are met as well). const int kBounceThresholdSeconds = 10; -NAVIGATION_HANDLE_USER_DATA_KEY_IMPL(ServerBounceDetectionState); - -// The TickClock that a new DIPSBounceDetector will use internally. Exposed as a -// global so that browser tests (which don't call the DIPSBounceDetector -// constructor directly) can inject a fake clock. -base::TickClock* g_clock = nullptr; - RedirectCategory ClassifyRedirect(CookieAccessType access, EngagementLevel engagement) { switch (access) { @@ -110,13 +94,21 @@ } // namespace -DIPSBounceDetector::DIPSBounceDetector(content::WebContents* web_contents) +DIPSWebContentsObserver::DIPSWebContentsObserver( + content::WebContents* web_contents) : content::WebContentsObserver(web_contents), - content::WebContentsUserData<DIPSBounceDetector>(*web_contents), + content::WebContentsUserData<DIPSWebContentsObserver>(*web_contents), dips_service_(DIPSService::Get(web_contents->GetBrowserContext())), site_engagement_service_(site_engagement::SiteEngagementService::Get( web_contents->GetBrowserContext())), - clock_(g_clock ? g_clock : base::DefaultTickClock::GetInstance()), + detector_(this, base::DefaultTickClock::GetInstance()) {} + +DIPSWebContentsObserver::~DIPSWebContentsObserver() = default; + +DIPSBounceDetector::DIPSBounceDetector(DIPSBounceDetectorDelegate* delegate, + const base::TickClock* clock) + : clock_(clock), + delegate_(delegate), // It's safe to use unretained because the callback is owned by the // DIPSRedirectContext which is owned by this. redirect_context_(base::BindRepeating(&DIPSBounceDetector::HandleRedirect, @@ -130,24 +122,19 @@ redirect_context_.SetRedirectHandlerForTesting(handler); // IN-TEST } -/*static*/ -base::TickClock* DIPSBounceDetector::SetTickClockForTesting( - base::TickClock* clock) { - return std::exchange(g_clock, clock); -} +DIPSBounceDetectorDelegate::~DIPSBounceDetectorDelegate() = default; -DIPSCookieMode DIPSBounceDetector::GetCookieMode() const { +DIPSNavigationHandle::~DIPSNavigationHandle() = default; + +DIPSCookieMode DIPSWebContentsObserver::GetCookieMode() const { return GetDIPSCookieMode( web_contents()->GetBrowserContext()->IsOffTheRecord(), dips_service_->ShouldBlockThirdPartyCookies()); } -ukm::SourceId DIPSBounceDetector::GetRedirectSourceId( - NavigationHandle* navigation_handle, - int index) { +ukm::SourceId DIPSNavigationHandle::GetRedirectSourceId(int index) const { return ukm::UkmRecorder::GetSourceIdForRedirectUrl( - base::PassKey<DIPSBounceDetector>(), - navigation_handle->GetRedirectChain()[index]); + base::PassKey<DIPSNavigationHandle>(), GetRedirectChain()[index]); } DIPSRedirectChainInfo::DIPSRedirectChainInfo(const GURL& initial_url, @@ -261,8 +248,7 @@ void DIPSBounceDetector::HandleRedirect(const DIPSRedirectInfo& redirect, const DIPSRedirectChainInfo& chain) { const std::string site = GetSiteForDIPS(redirect.url); - EngagementLevel level = - site_engagement_service_->GetEngagementLevel(redirect.url); + EngagementLevel level = delegate_->GetEngagementLevel(redirect.url); bool initial_site_same = (site == chain.initial_site); bool final_site_same = (site == chain.final_site); DCHECK_LE(0, redirect.index); @@ -290,23 +276,71 @@ } RedirectCategory category = ClassifyRedirect(redirect.access_type, level); - UmaHistogramBounceCategory(category, GetCookieMode(), redirect.redirect_type); + UmaHistogramBounceCategory(category, delegate_->GetCookieMode(), + redirect.redirect_type); } -void DIPSBounceDetector::DidStartNavigation( +const GURL& DIPSWebContentsObserver::GetLastCommittedURL() const { + return web_contents()->GetLastCommittedURL(); +} + +ukm::SourceId DIPSWebContentsObserver::GetPageUkmSourceId() const { + return web_contents()->GetPrimaryMainFrame()->GetPageUkmSourceId(); +} + +blink::mojom::EngagementLevel DIPSWebContentsObserver::GetEngagementLevel( + const GURL& url) const { + return site_engagement_service_->GetEngagementLevel(url); +} + +// A thin wrapper around NavigationHandle to implement DIPSNavigationHandle. +class DIPSNavigationHandleImpl : public DIPSNavigationHandle { + public: + explicit DIPSNavigationHandleImpl(NavigationHandle* handle) + : handle_(handle) {} + + bool HasUserGesture() const override { + return handle_->HasUserGesture() || !handle_->IsRendererInitiated(); + } + + ServerBounceDetectionState* GetServerState() override { + return ServerBounceDetectionState::GetOrCreateForNavigationHandle(*handle_); + } + + bool HasCommitted() const override { return handle_->HasCommitted(); } + + const GURL& GetPreviousPrimaryMainFrameURL() const override { + return handle_->GetPreviousPrimaryMainFrameURL(); + } + + const std::vector<GURL>& GetRedirectChain() const override { + return handle_->GetRedirectChain(); + } + + private: + raw_ptr<NavigationHandle> handle_; +}; + +void DIPSWebContentsObserver::DidStartNavigation( NavigationHandle* navigation_handle) { - base::TimeTicks now = clock_->NowTicks(); if (!navigation_handle->IsInPrimaryMainFrame() || navigation_handle->IsSameDocument()) { return; } + DIPSNavigationHandleImpl dips_handle(navigation_handle); + detector_.DidStartNavigation(&dips_handle); +} + +void DIPSBounceDetector::DidStartNavigation( + DIPSNavigationHandle* navigation_handle) { + base::TimeTicks now = clock_->NowTicks(); + DIPSRedirectInfoPtr client_redirect; if (client_detection_state_.has_value()) { base::TimeDelta bounce_time = now - client_detection_state_->page_load_time; if (!navigation_handle->HasUserGesture() && - navigation_handle->IsRendererInitiated() && (bounce_time < base::TimeDelta(base::Seconds(kBounceThresholdSeconds)))) { // Time between page load and client-side redirect starting is only @@ -315,12 +349,12 @@ UmaHistogramTimeToBounce(bounce_time); client_redirect = std::make_unique<DIPSRedirectInfo>( - /*url=*/web_contents()->GetLastCommittedURL(), + /*url=*/delegate_->GetLastCommittedURL(), /*redirect_type=*/DIPSRedirectType::kClient, /*access_type=*/client_detection_state_->cookie_access_type, /*index=*/redirect_context_.size(), /*source_id=*/ - web_contents()->GetPrimaryMainFrame()->GetPageUkmSourceId(), + delegate_->GetPageUkmSourceId(), /*client_bounce_delay=*/bounce_time, /*has_sticky_activation=*/ client_detection_state_->received_user_activation); @@ -334,56 +368,72 @@ // has ended; but for code simplicity, we ignore that.) } - auto* server_state = - ServerBounceDetectionState::GetOrCreateForNavigationHandle( - *navigation_handle); + ServerBounceDetectionState* server_state = + navigation_handle->GetServerState(); if (client_redirect) { server_state->navigation_start = std::move(client_redirect); } else { - server_state->navigation_start = web_contents()->GetLastCommittedURL(); + server_state->navigation_start = delegate_->GetLastCommittedURL(); } } -void DIPSBounceDetector::OnCookiesAccessed( +void DIPSWebContentsObserver::OnCookiesAccessed( content::RenderFrameHost* render_frame_host, const content::CookieAccessDetails& details) { if (!render_frame_host->IsInPrimaryMainFrame()) { return; } + detector_.OnClientCookiesAccessed(details.url, details.type); +} + +void DIPSBounceDetector::OnClientCookiesAccessed(const GURL& url, + CookieOperation op) { if (client_detection_state_ && - GetSiteForDIPS(details.url) == client_detection_state_->current_site) { + GetSiteForDIPS(url) == client_detection_state_->current_site) { client_detection_state_->cookie_access_type = client_detection_state_->cookie_access_type | - (details.type == content::CookieAccessDetails::Type::kChange - ? CookieAccessType::kWrite - : CookieAccessType::kRead); + (op == CookieOperation::kChange ? CookieAccessType::kWrite + : CookieAccessType::kRead); } } -void DIPSBounceDetector::OnCookiesAccessed( +void DIPSWebContentsObserver::OnCookiesAccessed( NavigationHandle* navigation_handle, const content::CookieAccessDetails& details) { if (!navigation_handle->IsInPrimaryMainFrame()) { return; } - auto* state = - ServerBounceDetectionState::GetForNavigationHandle(*navigation_handle); + DIPSNavigationHandleImpl dips_handle(navigation_handle); + detector_.OnServerCookiesAccessed(&dips_handle, details.url, details.type); +} + +void DIPSBounceDetector::OnServerCookiesAccessed( + DIPSNavigationHandle* navigation_handle, + const GURL& url, + CookieOperation op) { + ServerBounceDetectionState* state = navigation_handle->GetServerState(); if (state) { - state->filter.AddAccess(details.url, details.type); + state->filter.AddAccess(url, op); } } -void DIPSBounceDetector::DidFinishNavigation( +void DIPSWebContentsObserver::DidFinishNavigation( NavigationHandle* navigation_handle) { - base::TimeTicks now = clock_->NowTicks(); if (!navigation_handle->IsInPrimaryMainFrame() || navigation_handle->IsSameDocument()) { return; } + DIPSNavigationHandleImpl dips_handle(navigation_handle); + detector_.DidFinishNavigation(&dips_handle); +} + +void DIPSBounceDetector::DidFinishNavigation( + DIPSNavigationHandle* navigation_handle) { + base::TimeTicks now = clock_->NowTicks(); // Iff the primary page changed, reset the client detection state while // storing the page load time and previous_url. A primary page change is // verified by checking IsInPrimaryMainFrame, !IsSameDocument, and @@ -394,8 +444,8 @@ GetSiteForDIPS(navigation_handle->GetURL()), now); } - auto* server_state = - ServerBounceDetectionState::GetForNavigationHandle(*navigation_handle); + ServerBounceDetectionState* server_state = + navigation_handle->GetServerState(); if (!server_state) { return; @@ -405,7 +455,8 @@ std::vector<CookieAccessType> access_types; bool filter_success = server_state->filter.Filter( navigation_handle->GetRedirectChain(), &access_types); - UmaHistogramCookieAccessFilterResult(filter_success, GetCookieMode()); + UmaHistogramCookieAccessFilterResult(filter_success, + delegate_->GetCookieMode()); for (size_t i = 0; i < access_types.size() - 1; i++) { redirects.push_back(std::make_unique<DIPSRedirectInfo>( @@ -417,7 +468,7 @@ server_state->navigation_start) ? redirect_context_.size() + i + 1 : i, - /*source_id=*/GetRedirectSourceId(navigation_handle, i))); + /*source_id=*/navigation_handle->GetRedirectSourceId(i))); } // This call handles all the logic for terminating the redirect chain when @@ -435,15 +486,23 @@ } } -void DIPSBounceDetector::FrameReceivedUserActivation( +void DIPSWebContentsObserver::FrameReceivedUserActivation( content::RenderFrameHost* render_frame_host) { + detector_.OnUserActivation(); +} + +void DIPSBounceDetector::OnUserActivation() { if (client_detection_state_.has_value()) client_detection_state_->received_user_activation = true; } -void DIPSBounceDetector::WebContentsDestroyed() { - // Handle the current chain before the tab closes and the state is lost. - redirect_context_.EndChain(web_contents()->GetLastCommittedURL()); +void DIPSWebContentsObserver::WebContentsDestroyed() { + detector_.BeforeDestruction(); } -WEB_CONTENTS_USER_DATA_KEY_IMPL(DIPSBounceDetector); +void DIPSBounceDetector::BeforeDestruction() { + // Handle the current chain before the tab closes and the state is lost. + redirect_context_.EndChain(delegate_->GetLastCommittedURL()); +} + +WEB_CONTENTS_USER_DATA_KEY_IMPL(DIPSWebContentsObserver);
diff --git a/chrome/browser/dips/dips_bounce_detector.h b/chrome/browser/dips/dips_bounce_detector.h index b949bc2..630371b 100644 --- a/chrome/browser/dips/dips_bounce_detector.h +++ b/chrome/browser/dips/dips_bounce_detector.h
@@ -5,16 +5,21 @@ #ifndef CHROME_BROWSER_DIPS_DIPS_BOUNCE_DETECTOR_H_ #define CHROME_BROWSER_DIPS_DIPS_BOUNCE_DETECTOR_H_ +#include <memory> #include <string> #include <variant> #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "chrome/browser/dips/cookie_access_filter.h" #include "chrome/browser/dips/dips_utils.h" #include "content/public/browser/cookie_access_details.h" +#include "content/public/browser/navigation_handle.h" +#include "content/public/browser/navigation_handle_user_data.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" #include "services/metrics/public/cpp/ukm_source_id.h" +#include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom-shared.h" #include "url/gurl.h" namespace base { @@ -149,33 +154,122 @@ std::vector<DIPSRedirectInfoPtr> redirects_; }; -class DIPSBounceDetector - : public content::WebContentsObserver, - public content::WebContentsUserData<DIPSBounceDetector> { +// A simplified interface to WebContents, DIPSService, and SiteEngagementService +// that can be faked in tests. Needed to allow unit testing DIPSBounceDetector. +class DIPSBounceDetectorDelegate { public: - ~DIPSBounceDetector() override; + virtual ~DIPSBounceDetectorDelegate(); + virtual DIPSCookieMode GetCookieMode() const = 0; + virtual const GURL& GetLastCommittedURL() const = 0; + virtual ukm::SourceId GetPageUkmSourceId() const = 0; + virtual blink::mojom::EngagementLevel GetEngagementLevel( + const GURL&) const = 0; +}; + +// ServerBounceDetectionState gets attached to NavigationHandle (which is a +// SupportsUserData subclass) to store data needed to detect stateful +// server-side redirects. +class ServerBounceDetectionState + : public content::NavigationHandleUserData<ServerBounceDetectionState> { + public: + ServerBounceDetectionState(); + ~ServerBounceDetectionState() override; + + DIPSNavigationStart navigation_start; + CookieAccessFilter filter; + + private: + explicit ServerBounceDetectionState( + content::NavigationHandle& navigation_handle); + + friend NavigationHandleUserData; + NAVIGATION_HANDLE_USER_DATA_KEY_DECL(); +}; + +// A simplified interface to content::NavigationHandle that can be faked in +// tests. Needed to allow unit testing DIPSBounceDetector. +class DIPSNavigationHandle { + public: + virtual ~DIPSNavigationHandle(); + + // See content::NavigationHandle for an explanation of these methods: + const GURL& GetURL() const { return GetRedirectChain().back(); } + virtual const GURL& GetPreviousPrimaryMainFrameURL() const = 0; + virtual bool HasCommitted() const = 0; + virtual const std::vector<GURL>& GetRedirectChain() const = 0; + // This method has one important (simplifying) change from + // content::NavigationHandle::HasUserGesture(): it returns true if the + // navigation was not renderer-initiated. + virtual bool HasUserGesture() const = 0; + + // Get a SourceId of type REDIRECT_ID for the index'th URL in the redirect + // chain. + ukm::SourceId GetRedirectSourceId(int index) const; + // Calls ServerBounceDetectionState::GetOrCreateForNavigationHandle(). We + // declare this instead of making DIPSNavigationHandle a subclass of + // SupportsUserData, because ServerBounceDetectionState inherits from + // NavigationHandleUserData, whose helper functions only work with actual + // content::NavigationHandle, not any SupportsUserData. + virtual ServerBounceDetectionState* GetServerState() = 0; +}; + +// Detects client/server-side bounces and handles them (currently by collecting +// metrics). +class DIPSBounceDetector { + public: + explicit DIPSBounceDetector(DIPSBounceDetectorDelegate* delegate, + const base::TickClock* clock); + ~DIPSBounceDetector(); DIPSBounceDetector(const DIPSBounceDetector&) = delete; DIPSBounceDetector& operator=(const DIPSBounceDetector&) = delete; - void SetRedirectHandlerForTesting(DIPSRedirectHandler handler); + // The following methods are based on WebContentsObserver, simplified. + void DidStartNavigation(DIPSNavigationHandle* navigation_handle); + void OnClientCookiesAccessed(const GURL& url, CookieOperation op); + void OnServerCookiesAccessed(DIPSNavigationHandle* navigation_handle, + const GURL& url, + CookieOperation op); + void DidFinishNavigation(DIPSNavigationHandle* navigation_handle); + void OnUserActivation(); + void BeforeDestruction(); - // This must be called prior to the DIPSBounceDetector being constructed. - static base::TickClock* SetTickClockForTesting(base::TickClock* clock); - - private: - explicit DIPSBounceDetector(content::WebContents* web_contents); - // So WebContentsUserData::CreateForWebContents() can call the constructor. - friend class content::WebContentsUserData<DIPSBounceDetector>; - - DIPSCookieMode GetCookieMode() const; - ukm::SourceId GetRedirectSourceId( - content::NavigationHandle* navigation_handle, - int index); - - // Called when any redirect is detected. void HandleRedirect(const DIPSRedirectInfo& redirect, const DIPSRedirectChainInfo& chain); + // Use the passed handler instead of DIPSBounceDetector::HandleRedirect(). + void SetRedirectHandlerForTesting(DIPSRedirectHandler handler); + + private: + raw_ptr<const base::TickClock> clock_; + raw_ptr<DIPSBounceDetectorDelegate> delegate_; + absl::optional<ClientBounceDetectionState> client_detection_state_; + DIPSRedirectContext redirect_context_; +}; + +// A thin wrapper around DIPSBounceDetector to use it as a WebContentsObserver. +class DIPSWebContentsObserver + : public content::WebContentsObserver, + public content::WebContentsUserData<DIPSWebContentsObserver>, + public DIPSBounceDetectorDelegate { + public: + ~DIPSWebContentsObserver() override; + + void SetRedirectHandlerForTesting(DIPSRedirectHandler handler) { + detector_.SetRedirectHandlerForTesting(handler); + } + + private: + explicit DIPSWebContentsObserver(content::WebContents* web_contents); + // So WebContentsUserData::CreateForWebContents() can call the constructor. + friend class content::WebContentsUserData<DIPSWebContentsObserver>; + + // DIPSBounceDetectorDelegate overrides: + DIPSCookieMode GetCookieMode() const override; + const GURL& GetLastCommittedURL() const override; + ukm::SourceId GetPageUkmSourceId() const override; + blink::mojom::EngagementLevel GetEngagementLevel(const GURL&) const override; + + // WebContentsObserver overrides: void DidStartNavigation( content::NavigationHandle* navigation_handle) override; void OnCookiesAccessed(content::RenderFrameHost* render_frame_host, @@ -188,15 +282,13 @@ content::RenderFrameHost* render_frame_host) override; void WebContentsDestroyed() override; - // raw_ptr<> is safe here DIPSService is a KeyedService, associated with the - // BrowserContext/Profile which will outlive the WebContents that - // DIPSBounceDetector is observing. + // raw_ptr<> is safe here because DIPSService is a KeyedService, associated + // with the BrowserContext/Profile which will outlive the WebContents that + // DIPSWebContentsObserver is observing. raw_ptr<DIPSService> dips_service_; // raw_ptr<> is safe here for the same reasons as above. raw_ptr<site_engagement::SiteEngagementService> site_engagement_service_; - absl::optional<ClientBounceDetectionState> client_detection_state_; - raw_ptr<const base::TickClock> clock_; - DIPSRedirectContext redirect_context_; + DIPSBounceDetector detector_; WEB_CONTENTS_USER_DATA_KEY_DECL(); };
diff --git a/chrome/browser/dips/dips_bounce_detector_browsertest.cc b/chrome/browser/dips/dips_bounce_detector_browsertest.cc index 1eda2bd..721a0c53 100644 --- a/chrome/browser/dips/dips_bounce_detector_browsertest.cc +++ b/chrome/browser/dips/dips_bounce_detector_browsertest.cc
@@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/simple_test_tick_clock.h" -#include "base/time/time.h" #include "chrome/browser/dips/dips_bounce_detector.h" #include "base/files/file_path.h" @@ -13,12 +11,10 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/dips/dips_utils.h" #include "chrome/test/base/chrome_test_utils.h" -#include "components/ukm/test_ukm_recorder.h" #include "content/public/browser/cookie_access_details.h" #include "content/public/browser/navigation_handle.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" -#include "content/public/test/hit_test_region_observer.h" #include "content/public/test/test_utils.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/http_request.h" @@ -42,6 +38,7 @@ using testing::ElementsAre; using testing::Eq; using testing::Gt; +using testing::IsEmpty; using testing::Pair; using ukm::builders::DIPS_Redirect; @@ -93,14 +90,24 @@ base::RunLoop run_loop_; }; -} // namespace - // Returns a simplified URL representation for ease of comparison in tests. // Just host+path. std::string FormatURL(const GURL& url) { return base::StrCat({url.host_piece(), url.path_piece()}); } +void AppendRedirect(std::vector<std::string>* redirects, + const DIPSRedirectInfo& redirect, + const DIPSRedirectChainInfo& chain) { + redirects->push_back(base::StringPrintf( + "[%d/%d] %s -> %s (%s) -> %s", redirect.index + 1, chain.length, + FormatURL(chain.initial_url).c_str(), FormatURL(redirect.url).c_str(), + CookieAccessTypeToString(redirect.access_type).data(), + FormatURL(chain.final_url).c_str())); +} + +} // namespace + // Keeps a log of DidStartNavigation, OnCookiesAccessed, and DidFinishNavigation // executions. class WCOCallbackLogger @@ -184,10 +191,6 @@ class DIPSBounceDetectorBrowserTest : public PlatformBrowserTest { protected: - void SetUpInProcessBrowserTestFixture() override { - DIPSBounceDetector::SetTickClockForTesting(&test_clock_); - } - void SetUpOnMainThread() override { ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("a.test", "127.0.0.1"); @@ -198,23 +201,18 @@ host_resolver()->AddRule("e.test", "127.0.0.1"); host_resolver()->AddRule("f.test", "127.0.0.1"); host_resolver()->AddRule("g.test", "127.0.0.1"); - bounce_detector_ = - DIPSBounceDetector::FromWebContents(GetActiveWebContents()); - } - - void TearDownInProcessBrowserTestFixture() override { - DIPSBounceDetector::SetTickClockForTesting(nullptr); + web_contents_observer_ = + DIPSWebContentsObserver::FromWebContents(GetActiveWebContents()); } content::WebContents* GetActiveWebContents() { return chrome_test_utils::GetActiveWebContents(this); } - DIPSBounceDetector* bounce_detector() { return bounce_detector_; } - - void SetDIPSTime(base::TimeTicks ticks) { test_clock_.SetNowTicks(ticks); } - - void AdvanceDIPSTime(base::TimeDelta delta) { test_clock_.Advance(delta); } + void StartAppendingRedirectsTo(std::vector<std::string>* redirects) { + web_contents_observer_->SetRedirectHandlerForTesting( + base::BindRepeating(&AppendRedirect, redirects)); + } void CreateImageAndWaitForCookieAccess(const GURL& image_url) { WebContents* web_contents = GetActiveWebContents(); @@ -242,8 +240,7 @@ } private: - base::SimpleTestTickClock test_clock_; - raw_ptr<DIPSBounceDetector> bounce_detector_ = nullptr; + raw_ptr<DIPSWebContentsObserver> web_contents_observer_ = nullptr; }; // The timing of WCO::OnCookiesAccessed() execution is unpredictable for @@ -302,7 +299,7 @@ // test will intentionally fail if it happens so that we'll notice. EXPECT_THAT( logger->log(), - testing::ElementsAre( + ElementsAre( ("DidStartNavigation(a.test/cross-site/b.test/cross-site-with-cookie/" "c.test/cross-site-with-cookie/d.test/set-cookie)"), ("OnCookiesAccessed(NavigationHandle, Read: " @@ -323,54 +320,6 @@ "DidFinishNavigation(d.test/set-cookie)")); } -void AppendRedirectURL(std::vector<std::string>* urls, - const DIPSRedirectInfo& redirect, - const DIPSRedirectChainInfo& chain) { - if (redirect.access_type != CookieAccessType::kNone) { - urls->push_back( - base::StrCat({FormatURL(redirect.url), " (", - CookieAccessTypeToString(redirect.access_type), ")"})); - } -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulServerRedirect_URL) { - GURL redirect_url = embedded_test_server()->GetURL( - "a.test", - "/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/d.test/" - "title1.html"); - GURL final_url = embedded_test_server()->GetURL("d.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - - // Set cookies on a.test, b.test and d.test (but not c.test). - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("a.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("b.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("d.test", "/set-cookie?name=value"))); - - std::vector<std::string> stateful_redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirectURL, &stateful_redirects)); - - // Visit the redirect. - ASSERT_TRUE(content::NavigateToURL(web_contents, redirect_url, final_url)); - EndRedirectChain(); - - // a.test and b.test are stateful redirects. c.test had no cookies, and d.test - // was not a redirect. - EXPECT_THAT( - stateful_redirects, - testing::ElementsAre( - ("a.test/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/" - "d.test/title1.html (ReadWrite)"), - ("b.test/cross-site/c.test/cross-site/d.test/title1.html (Read)"))); -} - // An EmbeddedTestServer request handler for // /cross-site-with-samesite-none-cookie URLs. Like /cross-site-with-cookie, but // the cookie has additional Secure and SameSite=None attributes. @@ -426,9 +375,8 @@ const std::string iframe_id = "test"; content::WebContents* web_contents = GetActiveWebContents(); - std::vector<std::string> stateful_redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirectURL, &stateful_redirects)); + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); ASSERT_TRUE(content::NavigateToURL(web_contents, root_url)); ASSERT_TRUE( @@ -437,655 +385,7 @@ // b.test had a stateful redirect, but because it was in an iframe, we ignored // it. - EXPECT_THAT(stateful_redirects, testing::IsEmpty()); -} - -void AppendRedirect(std::vector<std::string>* redirects, - const DIPSRedirectInfo& redirect, - const DIPSRedirectChainInfo& chain) { - if (redirect.access_type != CookieAccessType::kNone) { - redirects->push_back(base::StrCat({FormatURL(chain.initial_url), " -> ", - FormatURL(redirect.url), " -> ", - FormatURL(chain.final_url)})); - } -} - -// Tests that a stateful client-side redirect that occurs in less than -// 10 seconds is recognized. -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulRedirect_Client) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - GURL bounce_url = embedded_test_server()->GetURL("b.test", "/title1.html"); - GURL final_url = embedded_test_server()->GetURL("c.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - content::RenderFrameHost* frame; - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); - - // Start logging WebContentsObserver callbacks. - WCOCallbackLogger::CreateForWebContents(web_contents); - auto* logger = WCOCallbackLogger::FromWebContents(web_contents); - - // Visit initial page - ASSERT_TRUE(content::NavigateToURL(web_contents, initial_url)); - frame = web_contents->GetPrimaryMainFrame(); - // Wait for navigation to finish to initial page - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - // Wait until we can click. - content::WaitForHitTestData(frame); - // Advance TimeTicks 10 seconds - AdvanceDIPSTime(base::TimeDelta(base::Seconds(10))); - // Navigate to interstitial page via "mouse click" - UserActivationObserver observer(web_contents, frame); - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", bounce_url), - content::EXECUTE_SCRIPT_DEFAULT_OPTIONS)); - observer.Wait(); - - // Wait for navigation to finish to interstitial page - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Write Cookie via JS on bounce page - CookieAccessObserver cookie_observer(web_contents, frame); - ASSERT_TRUE(content::ExecJs(frame, "document.cookie = 'foo=bar';", - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - cookie_observer.Wait(); - // Initiate client-side redirect via JS without click - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", final_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to final page - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - - EXPECT_THAT(logger->log(), testing::ElementsAre( - ("DidStartNavigation(a.test/title1.html)"), - ("DidFinishNavigation(a.test/title1.html)"), - ("DidStartNavigation(b.test/title1.html)"), - ("DidFinishNavigation(b.test/title1.html)"), - ("OnCookiesAccessed(RenderFrameHost, " - "Change: b.test/title1.html)"), - ("DidStartNavigation(c.test/title1.html)"), - ("DidFinishNavigation(c.test/title1.html)"))); - EndRedirectChain(); - - EXPECT_THAT( - redirects, - testing::ElementsAre( - ("a.test/title1.html -> b.test/title1.html -> c.test/title1.html"))); -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulRedirect_Server) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - GURL redirect_url = embedded_test_server()->GetURL( - "a.test", - "/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/d.test/" - "title1.html"); - GURL final_url = embedded_test_server()->GetURL("d.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - - // Set cookies on a.test, b.test and d.test (but not c.test). - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("a.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("b.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("d.test", "/set-cookie?name=value"))); - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); - - ASSERT_TRUE(content::NavigateToURL(web_contents, initial_url)); - // Visit the redirect. - ASSERT_TRUE(content::NavigateToURL(web_contents, redirect_url, final_url)); - EndRedirectChain(); - - // a.test and b.test are stateful redirects. c.test had no cookies, and d.test - // was not a redirect. - EXPECT_THAT(redirects, - testing::ElementsAre( - ("a.test/title1.html -> " - "a.test/cross-site-with-cookie/b.test/cross-site/c.test/" - "cross-site/d.test/title1.html -> d.test/title1.html"), - ("a.test/title1.html -> " - "b.test/cross-site/c.test/cross-site/d.test/title1.html -> " - "d.test/title1.html"))); -} - -// Tests behavior for recognizing stateful client-side redirect that happens -// between stateful server-side redirects. -// TODO(https://crbug.com/1345215): Flaky on Mac. -#if BUILDFLAG(IS_MAC) -#define MAYBE_DetectStatefulRedirect_ServerClient \ - DISABLED_DetectStatefulRedirect_ServerClient -#else -#define MAYBE_DetectStatefulRedirect_ServerClient \ - DetectStatefulRedirect_ServerClient -#endif -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - MAYBE_DetectStatefulRedirect_ServerClient) { - GURL initial1_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - GURL redirect1_url = embedded_test_server()->GetURL( - "a.test", "/cross-site-with-cookie/b.test/title1.html"); - GURL bounce_url = embedded_test_server()->GetURL("b.test", "/title1.html"); - GURL initial2_url = embedded_test_server()->GetURL("c.test", "/title1.html"); - GURL redirect2_url = embedded_test_server()->GetURL( - "c.test", "/cross-site-with-cookie/d.test/title1.html"); - GURL final_url = embedded_test_server()->GetURL("d.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - content::RenderFrameHost* frame; - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); - - // Start logging WebContentsObserver callbacks. - WCOCallbackLogger::CreateForWebContents(web_contents); - auto* logger = WCOCallbackLogger::FromWebContents(web_contents); - - // Visit initial page 1. - ASSERT_TRUE(content::NavigateToURL(web_contents, initial1_url)); - // Visit the redirect (a.test -> b.test with cookies). - ASSERT_TRUE(content::NavigateToURL(web_contents, redirect1_url, bounce_url)); - - // Wait for navigation to finish to bounce page (b.test). - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Advance TimeTicks by 1 second. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Write Cookie via JS on bounce page. - CookieAccessObserver cookie_observer(web_contents, frame); - ASSERT_TRUE(content::ExecJs(frame, "document.cookie = 'foo=bar';", - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - cookie_observer.Wait(); - // Initiate client-side redirect via JS without click (to initial page 2). - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", initial2_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to redirect page 2 (c.test). - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - // Visit the redirect (c.test -> d.test with cookies). - ASSERT_TRUE(content::NavigateToURL(web_contents, redirect2_url, final_url)); - - EXPECT_THAT(logger->log(), testing::ElementsAre( - ("DidStartNavigation(a.test/title1.html)"), - ("DidFinishNavigation(a.test/title1.html)"), - ("DidStartNavigation(a.test/" - "cross-site-with-cookie/b.test/title1.html)"), - ("OnCookiesAccessed(NavigationHandle, " - "Change: a.test/cross-site-with-cookie/" - "b.test/title1.html)"), - ("DidFinishNavigation(b.test/title1.html)"), - ("OnCookiesAccessed(RenderFrameHost, " - "Change: b.test/title1.html)"), - ("DidStartNavigation(c.test/title1.html)"), - ("DidFinishNavigation(c.test/title1.html)"), - ("DidStartNavigation(c.test/" - "cross-site-with-cookie/d.test/title1.html)"), - ("OnCookiesAccessed(NavigationHandle, " - "Change: c.test/cross-site-with-cookie/" - "d.test/title1.html)"), - ("DidFinishNavigation(d.test/title1.html)"))); - EndRedirectChain(); - - EXPECT_THAT( - redirects, - testing::ElementsAre( - ("a.test/title1.html -> " - "a.test/cross-site-with-cookie/b.test/title1.html -> " - "c.test/title1.html"), - ("a.test/title1.html -> b.test/title1.html -> c.test/title1.html"), - ("c.test/title1.html -> " - "c.test/cross-site-with-cookie/d.test/title1.html -> " - "d.test/title1.html"))); -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulClientRedirect_Chain) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - GURL bounce1_url = embedded_test_server()->GetURL("b.test", "/title1.html"); - GURL bounce2_url = embedded_test_server()->GetURL("c.test", "/title1.html"); - GURL bounce3_url = embedded_test_server()->GetURL("d.test", "/title1.html"); - GURL final_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - content::RenderFrameHost* frame; - - // a.test -(click)-> b.test -(UA-redir)-> c.test -(redir)-> d.test -(redir)-> - // a.test - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); - - // Visit initial page. - ASSERT_TRUE(content::NavigateToURL(web_contents, initial_url)); - // Wait for navigation to finish to initial page. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Wait until we can click. - content::WaitForHitTestData(frame); - // Advance TimeTicks 10 seconds. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(10))); - // Navigate to bounce page 1 via "mouse click". - UserActivationObserver observer(web_contents, frame); - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", bounce1_url), - content::EXECUTE_SCRIPT_DEFAULT_OPTIONS)); - observer.Wait(); - - // Wait for navigation to finish to bounce page 1. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Wait until we can click. - content::WaitForHitTestData(frame); - // simulate mouse click - UserActivationObserver observer2(web_contents, frame); - SimulateMouseClick(web_contents, 0, blink::WebMouseEvent::Button::kLeft); - observer2.Wait(); - // Advance TimeTicks by 1 second. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Write Cookie via JS on bounce page 1. - CookieAccessObserver cookie_observer1(web_contents, frame); - ASSERT_TRUE(content::ExecJs(frame, "document.cookie = 'foo=bar';", - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - cookie_observer1.Wait(); - // Initiate client-side redirect via JS without click. - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", bounce2_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to bounce page 2. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Advance TimeTicks by 1 second. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Write Cookie via JS on bounce page 2. - CookieAccessObserver cookie_observer2(web_contents, frame); - ASSERT_TRUE(content::ExecJs(frame, "document.cookie = 'foo=bar';", - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - cookie_observer2.Wait(); - // Initiate client-side redirect to via JS without click. - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", bounce3_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to bounce page 3. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Advance TimeTicks by 1 second. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Write Cookie via JS on bounce page 3. - CookieAccessObserver cookie_observer3(web_contents, frame); - ASSERT_TRUE(content::ExecJs(frame, "document.cookie = 'foo=bar';", - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - cookie_observer3.Wait(); - // Initiate client-side redirect to final page via JS without click. - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", final_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to final page (a.test). - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - EndRedirectChain(); - - // c.test and d.test are stateful bounces, but b.test is not counted as a - // bounce because it received user activation shortly before redirecting away. - EXPECT_THAT( - redirects, - testing::ElementsAre( - ("b.test/title1.html -> c.test/title1.html -> a.test/title1.html"), - ("b.test/title1.html -> d.test/title1.html -> a.test/title1.html"))); -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulServerRedirect_NoContent) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - // The redirect chain ends in a 204 No Content response, which doesn't commit. - GURL redirect_url = embedded_test_server()->GetURL( - "a.test", - "/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/d.test/" - "nocontent"); - content::WebContents* web_contents = GetActiveWebContents(); - - // Set cookies on a.test, b.test and d.test (but not c.test). - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("a.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("b.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("d.test", "/set-cookie?name=value"))); - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); - - ASSERT_TRUE(content::NavigateToURL(web_contents, initial_url)); - // Visit the redirect (note that the user ends up back at initial_url). - ASSERT_TRUE(content::NavigateToURL(web_contents, redirect_url, - /*expected_commit_url=*/initial_url)); - EndRedirectChain(); - - // a.test and b.test are stateful redirects. c.test had no cookies, and d.test - // was not a redirect. - EXPECT_THAT(redirects, - testing::ElementsAre( - ("a.test/title1.html -> " - "a.test/cross-site-with-cookie/b.test/cross-site/c.test/" - "cross-site/d.test/nocontent -> d.test/nocontent"), - ("a.test/title1.html -> " - "b.test/cross-site/c.test/cross-site/d.test/nocontent -> " - "d.test/nocontent"))); -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulServerRedirect_404Error) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - // The redirect chain ends in a 404 error. - GURL redirect_url = embedded_test_server()->GetURL( - "a.test", - "/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/d.test/404"); - content::WebContents* web_contents = GetActiveWebContents(); - - // Set cookies on a.test, b.test and d.test (but not c.test). - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("a.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("b.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("d.test", "/set-cookie?name=value"))); - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); - - ASSERT_TRUE(content::NavigateToURL(web_contents, initial_url)); - // Visit the redirect, ending up on an error page. - ASSERT_FALSE(content::NavigateToURL(web_contents, redirect_url)); - ASSERT_TRUE(content::IsLastCommittedEntryOfPageType( - web_contents, content::PAGE_TYPE_ERROR)); - EndRedirectChain(); - - // a.test and b.test are stateful redirects. c.test had no cookies, and d.test - // was not a redirect. - EXPECT_THAT(redirects, - testing::ElementsAre( - ("a.test/title1.html -> " - "a.test/cross-site-with-cookie/b.test/cross-site/c.test/" - "cross-site/d.test/404 -> d.test/404"), - ("a.test/title1.html -> " - "b.test/cross-site/c.test/cross-site/d.test/404 -> " - "d.test/404"))); -} - -const std::vector<std::string>& GetAllRedirectMetrics() { - static const std::vector<std::string> kAllRedirectMetrics = { - "ClientBounceDelay", - "CookieAccessType", - "HasStickyActivation", - "InitialAndFinalSitesSame", - "RedirectAndFinalSiteSame", - "RedirectAndInitialSiteSame", - "RedirectChainIndex", - "RedirectChainLength", - "RedirectType", - "SiteEngagementLevel", - }; - return kAllRedirectMetrics; -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - Histograms_BounceCategory_Client) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - GURL bounce1_url = embedded_test_server()->GetURL("b.test", "/title1.html"); - GURL bounce2_url = embedded_test_server()->GetURL("c.test", "/title1.html"); - GURL final_url = embedded_test_server()->GetURL("d.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - content::RenderFrameHost* frame; - - // Set cookies on b.test. Note that browser-initiated navigations like - // these are treated as a sign of user engagement. - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("b.test", "/set-cookie?name=value"))); - - // Set cookies on c.test without of user engagement signal. - ASSERT_TRUE(NavigateToURLFromRendererWithoutUserGesture( - web_contents->GetPrimaryMainFrame(), - embedded_test_server()->GetURL("c.test", "/set-cookie?name=value"))); - - // a.test -(click) -> b.test -(redir)-> c.test -(redir) -> d.test - - // Visit initial page. - ASSERT_TRUE(content::NavigateToURL(web_contents, initial_url)); - // Wait for navigation to finish to initial page. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Wait until we can click. - content::WaitForHitTestData(frame); - // Advance TimeTicks 10 seconds. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(10))); - // Navigate to bounce page 1 via "mouse click" and monitor the histograms. - base::HistogramTester histograms; - ukm::TestAutoSetUkmRecorder ukm_recorder; - UserActivationObserver observer(web_contents, frame); - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", bounce1_url), - content::EXECUTE_SCRIPT_DEFAULT_OPTIONS)); - observer.Wait(); - - // Wait for navigation to finish to bounce page 1. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Wait until we can click. - content::WaitForHitTestData(frame); - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Initiate client-side redirect via JS without click. - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", bounce2_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to bounce page 2. - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - frame = web_contents->GetPrimaryMainFrame(); - // Advance TimeTicks by 1 second. - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); - // Write Cookie via JS on bounce page 2 (c.test). - CookieAccessObserver cookie_observer(web_contents, frame); - ASSERT_TRUE(content::ExecJs(frame, "document.cookie = 'foo=bar';", - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - cookie_observer.Wait(); - // Initiate client-side redirect to final page via JS without click. - ASSERT_TRUE(content::ExecJs( - frame, content::JsReplace("window.location.href = $1;", final_url), - content::EXECUTE_SCRIPT_NO_USER_GESTURE)); - - // Wait for navigation to finish to final page (d.test). - EXPECT_TRUE(content::WaitForLoadStop(web_contents)); - EndRedirectChain(); - - // Verify the correct histogram was used for all samples. - base::HistogramTester::CountsMap expected_counts; - expected_counts["Privacy.DIPS.BounceCategoryClient.Standard"] = 2; - EXPECT_THAT( - histograms.GetTotalCountsForPrefix("Privacy.DIPS.BounceCategoryClient."), - testing::ContainerEq(expected_counts)); - // Verify the proper values were recorded. b.test is a has user engagement - // and read cookies, while c.test has no user engagement and wrote cookies. - EXPECT_THAT( - histograms.GetAllSamples("Privacy.DIPS.BounceCategoryClient.Standard"), - testing::ElementsAre( - // c.test - Bucket((int)RedirectCategory::kReadWriteCookies_NoEngagement, 1), - // b.test - Bucket((int)RedirectCategory::kReadCookies_HasEngagement, 1))); - - // Verify a redirect time metric was recorded for each bounce. - histograms.ExpectBucketCount( - "Privacy.DIPS.TimeFromNavigationCommitToClientBounce", - static_cast<base::HistogramBase::Sample>( - base::Seconds(1).InMilliseconds()), - /*expected_count=*/2); - - std::vector<ukm::TestUkmRecorder::HumanReadableUkmEntry> ukm_entries = - ukm_recorder.GetEntries("DIPS.Redirect", GetAllRedirectMetrics()); - ASSERT_EQ(2u, ukm_entries.size()); - - EXPECT_THAT( - FormatURL( - ukm_recorder.GetSourceForSourceId(ukm_entries[0].source_id)->url()), - Eq("b.test/title1.html")); - EXPECT_THAT(ukm::GetSourceIdType(ukm_entries[0].source_id), - Eq(ukm::SourceIdType::NAVIGATION_ID)); - EXPECT_THAT( - ukm_entries[0].metrics, - ElementsAre(Pair("ClientBounceDelay", 1), - Pair("CookieAccessType", (int)CookieAccessType::kRead), - Pair("HasStickyActivation", false), - Pair("InitialAndFinalSitesSame", false), - Pair("RedirectAndFinalSiteSame", false), - Pair("RedirectAndInitialSiteSame", false), - Pair("RedirectChainIndex", 0), Pair("RedirectChainLength", 2), - Pair("RedirectType", (int)DIPSRedirectType::kClient), - Pair("SiteEngagementLevel", Gt((int)EngagementLevel::NONE)))); - - EXPECT_THAT( - FormatURL( - ukm_recorder.GetSourceForSourceId(ukm_entries[1].source_id)->url()), - Eq("c.test/title1.html")); - EXPECT_THAT(ukm::GetSourceIdType(ukm_entries[1].source_id), - Eq(ukm::SourceIdType::NAVIGATION_ID)); - EXPECT_THAT( - ukm_entries[1].metrics, - ElementsAre(Pair("ClientBounceDelay", 1), - Pair("CookieAccessType", (int)CookieAccessType::kReadWrite), - Pair("HasStickyActivation", false), - Pair("InitialAndFinalSitesSame", false), - Pair("RedirectAndFinalSiteSame", false), - Pair("RedirectAndInitialSiteSame", false), - Pair("RedirectChainIndex", 1), Pair("RedirectChainLength", 2), - Pair("RedirectType", (int)DIPSRedirectType::kClient), - Pair("SiteEngagementLevel", (int)EngagementLevel::NONE))); -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - Histograms_BounceCategory_Server) { - GURL initial_url = embedded_test_server()->GetURL("a.test", "/title1.html"); - GURL redirect_url = embedded_test_server()->GetURL( - "a.test", - "/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/d.test/" - "title1.html"); - GURL final_url = embedded_test_server()->GetURL("d.test", "/title1.html"); - content::WebContents* web_contents = GetActiveWebContents(); - - // Set cookies on a.test and b.test. Note that browser-initiated navigations - // like these are treated as a sign of user engagement. - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("a.test", "/set-cookie?name=value"))); - ASSERT_TRUE(content::NavigateToURL( - web_contents, - embedded_test_server()->GetURL("b.test", "/set-cookie?name=value"))); - // Navigate to starting page. - ASSERT_TRUE(content::NavigateToURLFromRenderer(web_contents, initial_url)); - - // Visit the redirect and monitor the histograms. - base::HistogramTester histograms; - ukm::TestAutoSetUkmRecorder ukm_recorder; - ASSERT_TRUE(content::NavigateToURLFromRenderer(web_contents, redirect_url, - final_url)); - EndRedirectChain(); - - // Verify the correct histogram was used for all samples. - base::HistogramTester::CountsMap expected_counts; - expected_counts["Privacy.DIPS.BounceCategoryServer.Standard"] = 2; - EXPECT_THAT( - histograms.GetTotalCountsForPrefix("Privacy.DIPS.BounceCategoryServer."), - testing::ContainerEq(expected_counts)); - // Verify the proper values were recorded. Note that the a.test redirect was - // not reported because the previously committed page was also on a.test. - EXPECT_THAT( - histograms.GetAllSamples("Privacy.DIPS.BounceCategoryServer.Standard"), - testing::ElementsAre( - // c.test - Bucket((int)RedirectCategory::kNoCookies_NoEngagement, 1), - // b.test - Bucket((int)RedirectCategory::kReadCookies_HasEngagement, 1))); - - std::vector<ukm::TestUkmRecorder::HumanReadableUkmEntry> ukm_entries = - ukm_recorder.GetEntries("DIPS.Redirect", GetAllRedirectMetrics()); - ASSERT_EQ(3u, ukm_entries.size()); - - EXPECT_THAT( - FormatURL( - ukm_recorder.GetSourceForSourceId(ukm_entries[0].source_id)->url()), - Eq("a.test/cross-site-with-cookie/b.test/cross-site/c.test/cross-site/" - "d.test/title1.html")); - EXPECT_THAT(ukm::GetSourceIdType(ukm_entries[0].source_id), - Eq(ukm::SourceIdType::REDIRECT_ID)); - EXPECT_THAT( - ukm_entries[0].metrics, - ElementsAre(Pair("ClientBounceDelay", 0), - Pair("CookieAccessType", (int)CookieAccessType::kReadWrite), - Pair("HasStickyActivation", false), - Pair("InitialAndFinalSitesSame", false), - Pair("RedirectAndFinalSiteSame", false), - Pair("RedirectAndInitialSiteSame", true), - Pair("RedirectChainIndex", 0), Pair("RedirectChainLength", 3), - Pair("RedirectType", (int)DIPSRedirectType::kServer), - Pair("SiteEngagementLevel", Gt((int)EngagementLevel::NONE)))); - - EXPECT_THAT( - FormatURL( - ukm_recorder.GetSourceForSourceId(ukm_entries[1].source_id)->url()), - Eq("b.test/cross-site/c.test/cross-site/d.test/title1.html")); - EXPECT_THAT(ukm::GetSourceIdType(ukm_entries[1].source_id), - Eq(ukm::SourceIdType::REDIRECT_ID)); - EXPECT_THAT( - ukm_entries[1].metrics, - ElementsAre(Pair("ClientBounceDelay", 0), - Pair("CookieAccessType", (int)CookieAccessType::kRead), - Pair("HasStickyActivation", false), - Pair("InitialAndFinalSitesSame", false), - Pair("RedirectAndFinalSiteSame", false), - Pair("RedirectAndInitialSiteSame", false), - Pair("RedirectChainIndex", 1), Pair("RedirectChainLength", 3), - Pair("RedirectType", (int)DIPSRedirectType::kServer), - Pair("SiteEngagementLevel", Gt((int)EngagementLevel::NONE)))); - - EXPECT_THAT( - FormatURL( - ukm_recorder.GetSourceForSourceId(ukm_entries[2].source_id)->url()), - Eq("c.test/cross-site/d.test/title1.html")); - EXPECT_THAT(ukm::GetSourceIdType(ukm_entries[2].source_id), - Eq(ukm::SourceIdType::REDIRECT_ID)); - EXPECT_THAT( - ukm_entries[2].metrics, - ElementsAre(Pair("ClientBounceDelay", 0), - Pair("CookieAccessType", (int)CookieAccessType::kNone), - Pair("HasStickyActivation", false), - Pair("InitialAndFinalSitesSame", false), - Pair("RedirectAndFinalSiteSame", false), - Pair("RedirectAndInitialSiteSame", false), - Pair("RedirectChainIndex", 2), Pair("RedirectChainLength", 3), - Pair("RedirectType", (int)DIPSRedirectType::kServer), - Pair("SiteEngagementLevel", (int)EngagementLevel::NONE))); + EXPECT_THAT(redirects, IsEmpty()); } // This test verifies that a third-party cookie access doesn't cause a client @@ -1110,8 +410,7 @@ WebContents* web_contents = GetActiveWebContents(); std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); + StartAppendingRedirectsTo(&redirects); // Start logging WebContentsObserver callbacks. WCOCallbackLogger::CreateForWebContents(web_contents); @@ -1127,8 +426,6 @@ // Navigate with a click (not a redirect). ASSERT_TRUE(content::NavigateToURLFromRenderer(web_contents, bounce_url)); - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); // Cause a third-party cookie read. CreateImageAndWaitForCookieAccess(image_url); // Navigate without a click (i.e. by redirecting). @@ -1136,7 +433,7 @@ final_url)); EXPECT_THAT(logger->log(), - testing::ElementsAre( + ElementsAre( // Set cookie on d.test ("DidStartNavigation(d.test/set-cookie)"), ("OnCookiesAccessed(NavigationHandle, " @@ -1155,8 +452,10 @@ ("DidFinishNavigation(c.test/title1.html)"))); EndRedirectChain(); - // b.test is not considered a stateful bounce. - EXPECT_THAT(redirects, testing::IsEmpty()); + // b.test is a bounce, but not stateful. + EXPECT_THAT(redirects, ElementsAre("[1/1] a.test/title1.html" + " -> b.test/title1.html (None)" + " -> c.test/title1.html")); } // This test verifies that a same-site cookie access DOES cause a client @@ -1171,8 +470,7 @@ WebContents* web_contents = GetActiveWebContents(); std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendRedirect, &redirects)); + StartAppendingRedirectsTo(&redirects); // Start logging WebContentsObserver callbacks. WCOCallbackLogger::CreateForWebContents(web_contents); @@ -1188,8 +486,6 @@ // Navigate with a click (not a redirect). ASSERT_TRUE(content::NavigateToURLFromRenderer(web_contents, bounce_url)); - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); // Cause a same-site cookie read. CreateImageAndWaitForCookieAccess(image_url); // Navigate without a click (i.e. by redirecting). @@ -1197,7 +493,7 @@ final_url)); EXPECT_THAT(logger->log(), - testing::ElementsAre( + ElementsAre( // Set cookie on sub.b.test ("DidStartNavigation(sub.b.test/set-cookie)"), ("OnCookiesAccessed(NavigationHandle, " @@ -1218,20 +514,9 @@ // b.test IS considered a stateful bounce, even though the cookie was read by // an image hosted on sub.b.test. - EXPECT_THAT( - redirects, - testing::ElementsAre( - ("a.test/title1.html -> b.test/title1.html -> c.test/title1.html"))); -} - -void AppendAnyRedirect(std::vector<std::string>* redirects, - const DIPSRedirectInfo& redirect, - const DIPSRedirectChainInfo& chain) { - redirects->push_back(base::StringPrintf( - "[%d/%d] %s -> %s (%s) -> %s", redirect.index + 1, chain.length, - FormatURL(chain.initial_url).c_str(), FormatURL(redirect.url).c_str(), - CookieAccessTypeToString(redirect.access_type).data(), - FormatURL(chain.final_url).c_str())); + EXPECT_THAT(redirects, + ElementsAre(("[1/1] a.test/title1.html -> b.test/title1.html " + "(Read) -> c.test/title1.html"))); } // This test verifies that consecutive redirect chains are combined into one. @@ -1240,8 +525,7 @@ WebContents* web_contents = GetActiveWebContents(); std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendAnyRedirect, &redirects)); + StartAppendingRedirectsTo(&redirects); // Visit initial page on a.test ASSERT_TRUE(content::NavigateToURL( @@ -1255,14 +539,10 @@ "/cross-site/c.test/title1.html"), embedded_test_server()->GetURL("c.test", "/title1.html"))); - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::Seconds(1)); // Navigate without a click (i.e. by C-redirecting) to d.test ASSERT_TRUE(content::NavigateToURLFromRendererWithoutUserGesture( web_contents, embedded_test_server()->GetURL("d.test", "/title1.html"))); - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::Seconds(1)); // Navigate without a click (i.e. by C-redirecting) to e.test, which // S-redirects to f.test ASSERT_TRUE(content::NavigateToURLFromRendererWithoutUserGesture( @@ -1272,9 +552,9 @@ embedded_test_server()->GetURL("f.test", "/title1.html"))); EndRedirectChain(); - EXPECT_THAT(redirects, - testing::ElementsAre( - ("[1/4] a.test/title1.html -> " + EXPECT_THAT( + redirects, + ElementsAre(("[1/4] a.test/title1.html -> " "b.test/cross-site/c.test/title1.html (None) -> " "f.test/title1.html"), ("[2/4] a.test/title1.html -> c.test/title1.html (None) -> " @@ -1287,89 +567,11 @@ } IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, - DetectStatefulRedirect_UncommittedChain) { - WebContents* web_contents = GetActiveWebContents(); - - std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendAnyRedirect, &redirects)); - - // Visit initial page on a.test - ASSERT_TRUE(content::NavigateToURL( - web_contents, embedded_test_server()->GetURL("a.test", "/title1.html"))); - - // Navigate with a click (not a redirect) to b.test, which S-redirects to - // c.test - ASSERT_TRUE(content::NavigateToURLFromRenderer( - web_contents, - embedded_test_server()->GetURL("b.test", - "/cross-site/c.test/title1.html"), - embedded_test_server()->GetURL("c.test", "/title1.html"))); - - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::Seconds(1)); - // Navigate without a click (i.e. by C-redirecting) to d.test which redirects - // to e.test but doesn't commit. - ASSERT_TRUE(content::NavigateToURLFromRendererWithoutUserGesture( - web_contents, - embedded_test_server()->GetURL("d.test", "/cross-site/e.test/nocontent"), - /* empty URL since the navigation doesn't commit: */ GURL::EmptyGURL())); - ASSERT_EQ("c.test/title1.html", - FormatURL(web_contents->GetLastCommittedURL())); - - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::Seconds(1)); - // Navigate with a click (not a redirect) to d.test which redirects - // to e.test but doesn't commit. - ASSERT_TRUE(content::NavigateToURLFromRenderer( - web_contents, - embedded_test_server()->GetURL("d.test", "/cross-site/e.test/nocontent"), - /* empty URL since the navigation doesn't commit: */ GURL::EmptyGURL())); - ASSERT_EQ("c.test/title1.html", - FormatURL(web_contents->GetLastCommittedURL())); - - // Advance TimeTicks by 1 second - AdvanceDIPSTime(base::Seconds(1)); - // Navigate without a click (i.e. by C-redirecting) to e.test, which - // S-redirects to f.test - ASSERT_TRUE(content::NavigateToURLFromRendererWithoutUserGesture( - web_contents, - embedded_test_server()->GetURL("e.test", - "/cross-site/f.test/title1.html"), - embedded_test_server()->GetURL("f.test", "/title1.html"))); - EndRedirectChain(); - - EXPECT_THAT(redirects, - testing::ElementsAre( - // First uncommitted chain (with client redirect): - ("[2/3] a.test/title1.html -> " - "c.test/title1.html (None) -> " - "e.test/nocontent"), - ("[3/3] a.test/title1.html -> " - "d.test/cross-site/e.test/nocontent (None) -> " - "e.test/nocontent"), - // Second uncommitted chain (without client redirect): - ("[1/1] c.test/title1.html -> " - "d.test/cross-site/e.test/nocontent (None) -> " - "e.test/nocontent"), - // Finally the committed chain: - ("[1/3] a.test/title1.html -> " - "b.test/cross-site/c.test/title1.html (None) -> " - "f.test/title1.html"), - ("[2/3] a.test/title1.html -> c.test/title1.html (None) -> " - "f.test/title1.html"), - ("[3/3] a.test/title1.html -> " - "e.test/cross-site/f.test/title1.html (None) -> " - "f.test/title1.html"))); -} - -IN_PROC_BROWSER_TEST_F(DIPSBounceDetectorBrowserTest, DetectStatefulRedirect_ClosingTabEndsChain) { WebContents* web_contents = GetActiveWebContents(); std::vector<std::string> redirects; - bounce_detector()->SetRedirectHandlerForTesting( - base::BindRepeating(&AppendAnyRedirect, &redirects)); + StartAppendingRedirectsTo(&redirects); // Visit initial page on a.test ASSERT_TRUE(content::NavigateToURL( @@ -1383,12 +585,14 @@ "/cross-site/c.test/title1.html"), embedded_test_server()->GetURL("c.test", "/title1.html"))); + EXPECT_THAT(redirects, IsEmpty()); + content::WebContentsDestroyedWatcher destruction_watcher(web_contents); web_contents->Close(); destruction_watcher.Wait(); - EXPECT_THAT(redirects, testing::ElementsAre( - ("[1/1] a.test/title1.html -> " - "b.test/cross-site/c.test/title1.html (None) -> " - "c.test/title1.html"))); + EXPECT_THAT(redirects, + ElementsAre(("[1/1] a.test/title1.html -> " + "b.test/cross-site/c.test/title1.html (None) -> " + "c.test/title1.html"))); }
diff --git a/chrome/browser/dips/dips_bounce_detector_unittest.cc b/chrome/browser/dips/dips_bounce_detector_unittest.cc new file mode 100644 index 0000000..b28bc80 --- /dev/null +++ b/chrome/browser/dips/dips_bounce_detector_unittest.cc
@@ -0,0 +1,440 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/dips/dips_bounce_detector.h" + +#include "base/strings/strcat.h" +#include "base/test/metrics/histogram_tester.h" +#include "base/test/simple_test_tick_clock.h" +#include "base/test/task_environment.h" +#include "base/time/time.h" +#include "base/types/pass_key.h" +#include "chrome/browser/dips/cookie_access_filter.h" +#include "chrome/browser/dips/dips_utils.h" +#include "components/ukm/test_ukm_recorder.h" +#include "services/metrics/public/cpp/ukm_source_id.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom-shared.h" + +using base::Bucket; +using base::PassKey; +using blink::mojom::EngagementLevel; +using testing::ElementsAre; +using testing::Eq; +using testing::Gt; +using testing::Pair; + +enum class UserGestureStatus { kNoUserGesture, kWithUserGesture }; +constexpr auto kNoUserGesture = UserGestureStatus::kNoUserGesture; +constexpr auto kWithUserGesture = UserGestureStatus::kWithUserGesture; + +// Returns a simplified URL representation for ease of comparison in tests. +// Just host+path. +std::string FormatURL(const GURL& url) { + return base::StrCat({url.host_piece(), url.path_piece()}); +} + +void AppendRedirect(std::vector<std::string>* redirects, + const DIPSRedirectInfo& redirect, + const DIPSRedirectChainInfo& chain) { + redirects->push_back(base::StringPrintf( + "[%d/%d] %s -> %s (%s) -> %s", redirect.index + 1, chain.length, + FormatURL(chain.initial_url).c_str(), FormatURL(redirect.url).c_str(), + CookieAccessTypeToString(redirect.access_type).data(), + FormatURL(chain.final_url).c_str())); +} + +std::string URLForRedirectSourceId(ukm::TestUkmRecorder* ukm_recorder, + ukm::SourceId source_id) { + return FormatURL(ukm_recorder->GetSourceForSourceId(source_id)->url()); +} + +class FakeNavigation; + +class TestBounceDetectorDelegate : public DIPSBounceDetectorDelegate { + public: + // DIPSBounceDetectorDelegate overrides: + DIPSCookieMode GetCookieMode() const override { + return DIPSCookieMode::kStandard; + } + const GURL& GetLastCommittedURL() const override { return committed_url_; } + ukm::SourceId GetPageUkmSourceId() const override { return source_id_; } + EngagementLevel GetEngagementLevel(const GURL& url) const override { + auto iter = level_by_site.find(GetSiteForDIPS(url)); + if (iter == level_by_site.end()) { + return EngagementLevel::NONE; + } + return iter->second; + } + + // Get the (committed) URL that the SourceId was generated for. + const std::string& URLForSourceId(ukm::SourceId source_id) { + return url_by_source_id_[source_id]; + } + + // Override the default level (MEDIUM) returned by GetEngagementLevel(). + void SetSiteEngagementLevel(const GURL& url, EngagementLevel level) { + level_by_site[GetSiteForDIPS(url)] = level; + } + + void SetCommittedURL(PassKey<FakeNavigation>, const GURL& url) { + committed_url_ = url; + source_id_ = ukm::AssignNewSourceId(); + url_by_source_id_[source_id_] = FormatURL(url); + } + + private: + GURL committed_url_; + ukm::SourceId source_id_; + std::map<ukm::SourceId, std::string> url_by_source_id_; + std::map<std::string, EngagementLevel> level_by_site; +}; + +// If you wait this long, even a navigation without user gesture is not +// considered to be a bounce. +const base::TimeDelta kTooLongForRedirect = base::Seconds(10); + +class FakeNavigation : public DIPSNavigationHandle { + public: + FakeNavigation(DIPSBounceDetector* detector, + TestBounceDetectorDelegate* parent, + const GURL& url, + bool has_user_gesture) + : detector_(detector), + delegate_(parent), + has_user_gesture_(has_user_gesture) { + chain_.push_back(url); + detector_->DidStartNavigation(this); + } + ~FakeNavigation() override { CHECK(finished_); } + + FakeNavigation& RedirectTo(std::string url) { + chain_.emplace_back(std::move(url)); + return *this; + } + + FakeNavigation& AccessCookie(CookieOperation op) { + detector_->OnServerCookiesAccessed(this, GetURL(), op); + return *this; + } + + void Finish(bool commit) { + CHECK(!finished_); + finished_ = true; + has_committed_ = commit; + if (commit) { + previous_url_ = delegate_->GetLastCommittedURL(); + delegate_->SetCommittedURL(PassKey<FakeNavigation>(), GetURL()); + } + detector_->DidFinishNavigation(this); + } + + private: + // DIPSNavigationHandle overrides: + bool HasUserGesture() const override { return has_user_gesture_; } + ServerBounceDetectionState* GetServerState() override { return &state_; } + bool HasCommitted() const override { return has_committed_; } + const GURL& GetPreviousPrimaryMainFrameURL() const override { + return previous_url_; + } + const std::vector<GURL>& GetRedirectChain() const override { return chain_; } + + raw_ptr<DIPSBounceDetector> detector_; + raw_ptr<TestBounceDetectorDelegate> delegate_; + const bool has_user_gesture_; + bool finished_ = false; + + ServerBounceDetectionState state_; + bool has_committed_ = false; + GURL previous_url_; + std::vector<GURL> chain_; +}; + +class DIPSBounceDetectorTest : public ::testing::Test { + protected: + void StartAppendingRedirectsTo(std::vector<std::string>* redirects) { + detector_.SetRedirectHandlerForTesting( + base::BindRepeating(&AppendRedirect, redirects)); + } + + FakeNavigation StartNavigation(const std::string& url, + UserGestureStatus status) { + return FakeNavigation(&detector_, &delegate_, GURL(url), + status == kWithUserGesture); + } + + void NavigateTo(const std::string& url, UserGestureStatus status) { + StartNavigation(url, status).Finish(true); + } + + void AccessClientCookie(CookieOperation op) { + detector_.OnClientCookiesAccessed(delegate_.GetLastCommittedURL(), op); + } + + void EndRedirectChain() { + // Committing a new navigation that began with a user gesture will terminate + // any previous redirect chain. + NavigateTo("http://endchain", kWithUserGesture); + } + + void AdvanceDIPSTime(base::TimeDelta delta) { test_clock_.Advance(delta); } + + const std::string& URLForNavigationSourceId(ukm::SourceId source_id) { + return delegate_.URLForSourceId(source_id); + } + + void SetSiteEngagementLevel(const std::string& url, EngagementLevel level) { + return delegate_.SetSiteEngagementLevel(GURL(url), level); + } + + private: + TestBounceDetectorDelegate delegate_; + base::SimpleTestTickClock test_clock_; + DIPSBounceDetector detector_{&delegate_, &test_clock_}; +}; + +TEST_F(DIPSBounceDetectorTest, DetectStatefulRedirect_Server) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + + StartNavigation("http://b.test", kWithUserGesture) + .AccessCookie(CookieOperation::kRead) + .RedirectTo("http://c.test") + .AccessCookie(CookieOperation::kChange) + .RedirectTo("http://d.test") + .AccessCookie(CookieOperation::kRead) + .AccessCookie(CookieOperation::kChange) + .RedirectTo("http://e.test") + .Finish(true); + + EndRedirectChain(); + + EXPECT_THAT(redirects, + testing::ElementsAre( + ("[1/3] a.test/ -> b.test/ (Read) -> e.test/"), + ("[2/3] a.test/ -> c.test/ (Write) -> e.test/"), + ("[3/3] a.test/ -> d.test/ (ReadWrite) -> e.test/"))); +} + +TEST_F(DIPSBounceDetectorTest, DetectStatefulRedirect_Client) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + NavigateTo("http://b.test", kWithUserGesture); + AdvanceDIPSTime(base::TimeDelta(base::Seconds(1))); + NavigateTo("http://c.test", kNoUserGesture); + EndRedirectChain(); + + EXPECT_THAT(redirects, testing::ElementsAre( + ("[1/1] a.test/ -> b.test/ (None) -> c.test/"))); +} + +TEST_F(DIPSBounceDetectorTest, DetectStatefulRedirect_Client_MergeCookies) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + // Server cookie read: + StartNavigation("http://b.test", kWithUserGesture) + .AccessCookie(CookieOperation::kRead) + .Finish(true); + // Client cookie write: + AccessClientCookie(CookieOperation::kChange); + NavigateTo("http://c.test", kNoUserGesture); + EndRedirectChain(); + + // Redirect cookie access is reported as ReadWrite. + EXPECT_THAT(redirects, + testing::ElementsAre( + ("[1/1] a.test/ -> b.test/ (ReadWrite) -> c.test/"))); +} + +TEST_F(DIPSBounceDetectorTest, + DetectStatefulRedirect_Client_LongDelayNotRedirect) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + NavigateTo("http://b.test", kWithUserGesture); + AdvanceDIPSTime(kTooLongForRedirect); + NavigateTo("http://c.test", kNoUserGesture); + EndRedirectChain(); + + EXPECT_THAT(redirects, testing::IsEmpty()); +} + +TEST_F(DIPSBounceDetectorTest, DetectStatefulRedirect_ServerClientServer) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + StartNavigation("http://b.test", kWithUserGesture) + .RedirectTo("http://c.test") + .Finish(true); + StartNavigation("http://d.test", kNoUserGesture) + .RedirectTo("http://e.test") + .Finish(true); + EndRedirectChain(); + + EXPECT_THAT(redirects, testing::ElementsAre( + ("[1/3] a.test/ -> b.test/ (None) -> e.test/"), + ("[2/3] a.test/ -> c.test/ (None) -> e.test/"), + ("[3/3] a.test/ -> d.test/ (None) -> e.test/"))); +} + +TEST_F(DIPSBounceDetectorTest, DetectStatefulRedirect_Server_Uncommitted) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + StartNavigation("http://b.test", kWithUserGesture) + .RedirectTo("http://c.test") + .RedirectTo("http://d.test") + .Finish(false); + // Because the previous navigation didn't commit, the following chain still + // starts from http://a.test/. + StartNavigation("http://e.test", kWithUserGesture) + .RedirectTo("http://f.test") + .Finish(true); + EndRedirectChain(); + + EXPECT_THAT(redirects, testing::ElementsAre( + ("[1/2] a.test/ -> b.test/ (None) -> d.test/"), + ("[2/2] a.test/ -> c.test/ (None) -> d.test/"), + ("[1/1] a.test/ -> e.test/ (None) -> f.test/"))); +} + +TEST_F(DIPSBounceDetectorTest, DetectStatefulRedirect_Client_Uncommitted) { + std::vector<std::string> redirects; + StartAppendingRedirectsTo(&redirects); + + NavigateTo("http://a.test", kWithUserGesture); + NavigateTo("http://b.test", kWithUserGesture); + StartNavigation("http://c.test", kNoUserGesture) + .RedirectTo("http://d.test") + .Finish(false); + // Because the previous navigation didn't commit, the following chain still + // starts from http://a.test/. + StartNavigation("http://e.test", kNoUserGesture) + .RedirectTo("http://f.test") + .Finish(true); + EndRedirectChain(); + + EXPECT_THAT(redirects, testing::ElementsAre( + ("[1/2] a.test/ -> b.test/ (None) -> d.test/"), + ("[2/2] a.test/ -> c.test/ (None) -> d.test/"), + ("[1/2] a.test/ -> b.test/ (None) -> f.test/"), + ("[2/2] a.test/ -> e.test/ (None) -> f.test/"))); +} + +const std::vector<std::string>& GetAllRedirectMetrics() { + static const std::vector<std::string> kAllRedirectMetrics = { + "ClientBounceDelay", + "CookieAccessType", + "HasStickyActivation", + "InitialAndFinalSitesSame", + "RedirectAndFinalSiteSame", + "RedirectAndInitialSiteSame", + "RedirectChainIndex", + "RedirectChainLength", + "RedirectType", + "SiteEngagementLevel", + }; + return kAllRedirectMetrics; +} + +TEST_F(DIPSBounceDetectorTest, Histograms_UMA) { + base::HistogramTester histograms; + + SetSiteEngagementLevel("http://b.test", EngagementLevel::LOW); + + NavigateTo("http://a.test", kWithUserGesture); + NavigateTo("http://b.test", kWithUserGesture); + AdvanceDIPSTime(base::Seconds(3)); + AccessClientCookie(CookieOperation::kRead); + StartNavigation("http://c.test", kNoUserGesture) + .AccessCookie(CookieOperation::kChange) + .RedirectTo("http://d.test") + .Finish(true); + EndRedirectChain(); + + base::HistogramTester::CountsMap expected_counts; + expected_counts["Privacy.DIPS.BounceCategoryClient.Standard"] = 1; + expected_counts["Privacy.DIPS.BounceCategoryServer.Standard"] = 1; + EXPECT_THAT(histograms.GetTotalCountsForPrefix("Privacy.DIPS.BounceCategory"), + testing::ContainerEq(expected_counts)); + // Verify the proper values were recorded. b.test has user engagement and read + // cookies, while c.test has no user engagement and wrote cookies. + EXPECT_THAT( + histograms.GetAllSamples("Privacy.DIPS.BounceCategoryClient.Standard"), + testing::ElementsAre( + // b.test + Bucket((int)RedirectCategory::kReadCookies_HasEngagement, 1))); + EXPECT_THAT( + histograms.GetAllSamples("Privacy.DIPS.BounceCategoryServer.Standard"), + testing::ElementsAre( + // c.test + Bucket((int)RedirectCategory::kWriteCookies_NoEngagement, 1))); + + // Verify the time-to-bounce metric was recorded for the client bounce. + histograms.ExpectBucketCount( + "Privacy.DIPS.TimeFromNavigationCommitToClientBounce", + static_cast<base::HistogramBase::Sample>( + base::Seconds(3).InMilliseconds()), + /*expected_count=*/1); +} + +TEST_F(DIPSBounceDetectorTest, Histograms_UKM) { + base::test::SingleThreadTaskEnvironment task_environment; + ukm::TestAutoSetUkmRecorder ukm_recorder; + + SetSiteEngagementLevel("http://b.test", EngagementLevel::MEDIUM); + SetSiteEngagementLevel("http://c.test", EngagementLevel::LOW); + + NavigateTo("http://a.test", kWithUserGesture); + NavigateTo("http://b.test", kWithUserGesture); + AdvanceDIPSTime(base::Seconds(2)); + AccessClientCookie(CookieOperation::kRead); + StartNavigation("http://c.test", kNoUserGesture) + .AccessCookie(CookieOperation::kChange) + .RedirectTo("http://d.test") + .Finish(true); + EndRedirectChain(); + + std::vector<ukm::TestUkmRecorder::HumanReadableUkmEntry> ukm_entries = + ukm_recorder.GetEntries("DIPS.Redirect", GetAllRedirectMetrics()); + ASSERT_EQ(2u, ukm_entries.size()); + + EXPECT_THAT(URLForNavigationSourceId(ukm_entries[0].source_id), + Eq("b.test/")); + EXPECT_THAT( + ukm_entries[0].metrics, + ElementsAre(Pair("ClientBounceDelay", 2), + Pair("CookieAccessType", (int)CookieAccessType::kRead), + Pair("HasStickyActivation", false), + Pair("InitialAndFinalSitesSame", false), + Pair("RedirectAndFinalSiteSame", false), + Pair("RedirectAndInitialSiteSame", false), + Pair("RedirectChainIndex", 0), Pair("RedirectChainLength", 2), + Pair("RedirectType", (int)DIPSRedirectType::kClient), + Pair("SiteEngagementLevel", (int)EngagementLevel::MEDIUM))); + + EXPECT_THAT(URLForRedirectSourceId(&ukm_recorder, ukm_entries[1].source_id), + Eq("c.test/")); + EXPECT_THAT( + ukm_entries[1].metrics, + ElementsAre(Pair("ClientBounceDelay", 0), + Pair("CookieAccessType", (int)CookieAccessType::kWrite), + Pair("HasStickyActivation", false), + Pair("InitialAndFinalSitesSame", false), + Pair("RedirectAndFinalSiteSame", false), + Pair("RedirectAndInitialSiteSame", false), + Pair("RedirectChainIndex", 1), Pair("RedirectChainLength", 2), + Pair("RedirectType", (int)DIPSRedirectType::kServer), + Pair("SiteEngagementLevel", (int)EngagementLevel::LOW))); +}
diff --git a/chrome/browser/dips/dips_utils.h b/chrome/browser/dips/dips_utils.h index b43f4e3..b85c0979 100644 --- a/chrome/browser/dips/dips_utils.h +++ b/chrome/browser/dips/dips_utils.h
@@ -9,6 +9,7 @@ #include "base/strings/string_piece_forward.h" #include "base/time/time.h" +#include "services/network/public/mojom/cookie_access_observer.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" @@ -16,6 +17,11 @@ class TimeDelta; } +// A single cookie-accessing operation (either read or write). Not to be +// confused with CookieAccessType, which can also represent no access or both +// read+write. +using CookieOperation = network::mojom::CookieAccessDetails::Type; + // NOTE: We use this type as a bitfield, and will soon be logging it. Don't // change the values or add additional members. enum class CookieAccessType {
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 08bfe474..7d4dd8b 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -5207,11 +5207,11 @@ task_environment()->RunUntilIdle(); // Check that the localStorage data been removed. - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_infos; + std::vector<storage::mojom::StorageUsageInfoPtr> usage_infos; { base::RunLoop run_loop; local_storage_control->GetUsage(base::BindLambdaForTesting( - [&](std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_infos_in) { + [&](std::vector<storage::mojom::StorageUsageInfoPtr> usage_infos_in) { usage_infos.swap(usage_infos_in); run_loop.Quit(); })); @@ -5415,11 +5415,11 @@ task_environment()->RunUntilIdle(); // Check that the localStorage data been removed. - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_infos; + std::vector<storage::mojom::StorageUsageInfoPtr> usage_infos; { base::RunLoop run_loop; local_storage_control->GetUsage(base::BindLambdaForTesting( - [&](std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_infos_in) { + [&](std::vector<storage::mojom::StorageUsageInfoPtr> usage_infos_in) { usage_infos.swap(usage_infos_in); run_loop.Quit(); }));
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 6251b5d..83a3071 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -5008,6 +5008,11 @@ "expiry_milestone": 107 }, { + "name": "omnibox-on-clobber-focus-type-on-android", + "owners": [ "rongtan", "ender", "chrome-omnibox-team@google.com" ], + "expiry_milestone": 120 + }, + { "name": "omnibox-on-device-head-suggestions", "owners": [ "cechen@google.com", "suggest-2g@google.com" ], "expiry_milestone": 120 @@ -5621,11 +5626,6 @@ "expiry_milestone": 120 }, { - "name": "quick-answers-for-more-locales", - "owners": [ "croissant-eng", "updowndota" ], - "expiry_milestone": 120 - }, - { "name": "quick-commands", "owners": [ "lgrey" ], "expiry_milestone": 110
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index 3a57e05..753ecb6 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -2093,6 +2093,12 @@ "Offer most visited website tiles when the User is on the Search Results " "Page."; +const char kOmniboxOnClobberFocusTypeOnAndroidName[] = + "Omnibox On Clobber Focus Type On Android"; +const char kOmniboxOnClobberFocusTypeOnAndroidDescription[] = + "Send ON_CLOBBER focus type for zero-prefix requests with an empty input " + "on Web/SRP on Android platform."; + const char kOmniboxShortBookmarkSuggestionsName[] = "Omnibox short bookmark suggestions"; const char kOmniboxShortBookmarkSuggestionsDescription[] = @@ -6388,11 +6394,6 @@ const char kDisableQuickAnswersV2TranslationDescription[] = "Disable translation services of the Quick Answers."; -const char kQuickAnswersForMoreLocalesName[] = - "Enable Quick Answers for more locales"; -const char kQuickAnswersForMoreLocalesDescription[] = - "Enable Quick Answers for more locales."; - const char kSyncChromeOSExplicitPassphraseSharingName[] = "Sync passphrase sharing"; const char kSyncChromeOSExplicitPassphraseSharingDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 3e9b340..f5cd01f 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -1156,6 +1156,9 @@ extern const char kOmniboxMostVisitedTilesOnSrpName[]; extern const char kOmniboxMostVisitedTilesOnSrpDescription[]; +extern const char kOmniboxOnClobberFocusTypeOnAndroidName[]; +extern const char kOmniboxOnClobberFocusTypeOnAndroidDescription[]; + extern const char kOmniboxShortBookmarkSuggestionsName[]; extern const char kOmniboxShortBookmarkSuggestionsDescription[]; @@ -3656,9 +3659,6 @@ extern const char kDisableQuickAnswersV2TranslationName[]; extern const char kDisableQuickAnswersV2TranslationDescription[]; -extern const char kQuickAnswersForMoreLocalesName[]; -extern const char kQuickAnswersForMoreLocalesDescription[]; - extern const char kSyncChromeOSExplicitPassphraseSharingName[]; extern const char kSyncChromeOSExplicitPassphraseSharingDescription[]; #endif // BUILDFLAG(IS_CHROMEOS)
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc index 36df4c3..7ef43fe 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -370,6 +370,7 @@ &omnibox::kOmniboxRemoveSuggestionHeaderChevron, &omnibox::kOmniboxMostVisitedTilesFadingOnTablet, &omnibox::kOmniboxMostVisitedTilesOnSrp, + &omnibox::kOmniboxOnClobberFocusTypeOnAndroid, &omnibox::kSuggestionAnswersColorReverse, &omnibox::kUpdatedConnectionSecurityIndicators, &optimization_guide::features::kPushNotifications,
diff --git a/chrome/browser/performance_monitor/system_monitor.h b/chrome/browser/performance_monitor/system_monitor.h index b2ba2a5..a96376dc 100644 --- a/chrome/browser/performance_monitor/system_monitor.h +++ b/chrome/browser/performance_monitor/system_monitor.h
@@ -159,7 +159,7 @@ using ObserverArgType = typename std::conditional<std::is_scalar<T>::value, T, const T&>::type; - MetricEvaluatorImpl<T>( + MetricEvaluatorImpl( Type type, base::OnceCallback<absl::optional<T>()> evaluate_function, void (SystemObserver::*notify_function)(ObserverArgType));
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java index f42bcc3..6a27abb 100644 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -439,7 +439,9 @@ /** * Key used to save homepage location set by enterprise policy */ - public static final String HOMEPAGE_LOCATION_POLICY = "Chrome.Policy.HomepageLocation"; + public static final String DEPRECATED_HOMEPAGE_LOCATION_POLICY = + "Chrome.Policy.HomepageLocation"; + public static final String HOMEPAGE_LOCATION_POLICY_GURL = "Chrome.Policy.HomepageLocationGurl"; /** * Used for get image descriptions feature, track "Just once"/"Don't ask again" choice. @@ -1089,7 +1091,8 @@ FLAGS_LAST_CACHED_MINIMAL_BROWSER_FLAGS_TIME_MILLIS, FLAGS_SAFE_MODE_ENABLED, FLAGS_SAFE_MODE_RUNS_LEFT, - HOMEPAGE_LOCATION_POLICY, + DEPRECATED_HOMEPAGE_LOCATION_POLICY, + HOMEPAGE_LOCATION_POLICY_GURL, HOMEPAGE_USE_CHROME_NTP, HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI, HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL,
diff --git a/chrome/browser/resources/bluetooth_internals/page_manager.js b/chrome/browser/resources/bluetooth_internals/page_manager.js index 0ab1a7ca..62b0baf1 100644 --- a/chrome/browser/resources/bluetooth_internals/page_manager.js +++ b/chrome/browser/resources/bluetooth_internals/page_manager.js
@@ -4,7 +4,7 @@ import {assert} from 'chrome://resources/js/assert.js'; import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {Page} from './page.js';
diff --git a/chrome/browser/resources/bookmarks/actions.ts b/chrome/browser/resources/bookmarks/actions.ts index 90dd864..d7ad4ed 100644 --- a/chrome/browser/resources/bookmarks/actions.ts +++ b/chrome/browser/resources/bookmarks/actions.ts
@@ -3,7 +3,7 @@ // found in the LICENSE file. import {assert} from 'chrome://resources/js/assert_ts.js'; -import {Action} from 'chrome://resources/js/cr/ui/store_ts.js'; +import {Action} from 'chrome://resources/js/store_ts.js'; import {IncognitoAvailability, ROOT_NODE_ID} from './constants.js'; import {BookmarkNode, BookmarksPageState, NodeMap} from './types.js';
diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts index 588014b..2794886 100644 --- a/chrome/browser/resources/bookmarks/api_listener.ts +++ b/chrome/browser/resources/bookmarks/api_listener.ts
@@ -4,7 +4,7 @@ import {assert} from 'chrome://resources/js/assert_ts.js'; import {addWebUIListener, removeWebUIListener} from 'chrome://resources/js/cr.m.js'; -import {Action} from 'chrome://resources/js/cr/ui/store_ts.js'; +import {Action} from 'chrome://resources/js/store_ts.js'; import {createBookmark, editBookmark, moveBookmark, refreshNodes, removeBookmark, reorderChildren, setCanEditBookmarks, setIncognitoAvailability} from './actions.js'; import {BrowserProxyImpl} from './browser_proxy.js';
diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts index 75c1f82..ea8b8fa 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts
@@ -22,7 +22,7 @@ import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; import {isMac} from 'chrome://resources/js/cr.m.js'; -import {KeyboardShortcutList} from 'chrome://resources/js/cr/ui/keyboard_shortcut_list.js'; +import {KeyboardShortcutList} from 'chrome://resources/js/keyboard_shortcut_list.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {PluralStringProxyImpl} from 'chrome://resources/js/plural_string_proxy.js';
diff --git a/chrome/browser/resources/bookmarks/item.ts b/chrome/browser/resources/bookmarks/item.ts index ce62e67f..ce8691f 100644 --- a/chrome/browser/resources/bookmarks/item.ts +++ b/chrome/browser/resources/bookmarks/item.ts
@@ -11,7 +11,7 @@ import {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; import {isMac} from 'chrome://resources/js/cr.m.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {getFaviconForPageURL} from 'chrome://resources/js/icon.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/bookmarks/reducers.ts b/chrome/browser/resources/bookmarks/reducers.ts index 4a20202..b4020001 100644 --- a/chrome/browser/resources/bookmarks/reducers.ts +++ b/chrome/browser/resources/bookmarks/reducers.ts
@@ -10,7 +10,7 @@ */ import {assert} from 'chrome://resources/js/assert_ts.js'; -import {Action} from 'chrome://resources/js/cr/ui/store_ts.js'; +import {Action} from 'chrome://resources/js/store_ts.js'; import {ChangeFolderOpenAction, CreateBookmarkAction, EditBookmarkAction, FinishSearchAction, MoveBookmarkAction, RefreshNodesAction, RemoveBookmarkAction, ReorderChildrenAction, SelectFolderAction, SelectItemsAction, SetPrefAction, StartSearchAction, UpdateAnchorAction} from './actions.js'; import {BookmarkNode, BookmarksPageState, FolderOpenState, NodeMap, PreferencesState, SearchState, SelectionState} from './types.js';
diff --git a/chrome/browser/resources/bookmarks/store.ts b/chrome/browser/resources/bookmarks/store.ts index 52266344..54866a5 100644 --- a/chrome/browser/resources/bookmarks/store.ts +++ b/chrome/browser/resources/bookmarks/store.ts
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {Store as CrUiStore} from 'chrome://resources/js/cr/ui/store_ts.js'; +import {Store as CrUiStore} from 'chrome://resources/js/store_ts.js'; import {reduceAction} from './reducers.js'; import {BookmarksPageState} from './types.js';
diff --git a/chrome/browser/resources/bookmarks/store_client_mixin.ts b/chrome/browser/resources/bookmarks/store_client_mixin.ts index 005abfa4..e6296852 100644 --- a/chrome/browser/resources/bookmarks/store_client_mixin.ts +++ b/chrome/browser/resources/bookmarks/store_client_mixin.ts
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {Action, DeferredAction} from 'chrome://resources/js/cr/ui/store_ts.js'; +import {Action, DeferredAction} from 'chrome://resources/js/store_ts.js'; import {dedupingMixin, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {Store} from './store.js';
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/common/command_store.js b/chrome/browser/resources/chromeos/accessibility/chromevox/common/command_store.js index fa0acbf2..2f6f1c6 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/common/command_store.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/common/command_store.js
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. - /** * @fileoverview This class acts as the persistent store for all static data * about commands. @@ -304,14 +303,11 @@ * @type {Object<!Command, { * announce: boolean, * category: (undefined|!CommandCategory), - * findNext: (undefined|string), * msgId: (undefined|string), * allowEvents: (undefined|boolean), * denySignedOut: (undefined|boolean)}>} * announce: Whether to call finishNavCommand and announce the current * position after the command is done. - * findNext: The id from the map above if this command is used for - * finding next/previous of something. * category: The command's category. * msgId: The message resource describing the command. * denySignedOut: Explicitly denies this command when on chrome://oobe/* or @@ -702,236 +698,192 @@ category: CommandCategory.OVERVIEW, }, - [Command.NEXT_ARTICLE]: {findNext: 'article'}, + [Command.NEXT_ARTICLE]: {}, [Command.NEXT_BUTTON]: { - findNext: 'button', msgId: 'next_button', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_CHECKBOX]: { - findNext: 'checkbox', msgId: 'next_checkbox', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_COMBO_BOX]: { - findNext: 'combobox', msgId: 'next_combo_box', category: CommandCategory.JUMP_COMMANDS, }, - [Command.NEXT_CONTROL]: {findNext: 'control'}, + [Command.NEXT_CONTROL]: {}, [Command.NEXT_EDIT_TEXT]: { - findNext: 'editText', msgId: 'next_edit_text', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_FORM_FIELD]: { - findNext: 'formField', msgId: 'next_form_field', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_GRAPHIC]: { - findNext: 'graphic', msgId: 'next_graphic', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING]: { - findNext: 'heading', msgId: 'next_heading', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING_1]: { - findNext: 'heading1', msgId: 'next_heading1', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING_2]: { - findNext: 'heading2', msgId: 'next_heading2', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING_3]: { - findNext: 'heading3', msgId: 'next_heading3', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING_4]: { - findNext: 'heading4', msgId: 'next_heading4', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING_5]: { - findNext: 'heading5', msgId: 'next_heading5', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_HEADING_6]: { - findNext: 'heading6', msgId: 'next_heading6', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_LANDMARK]: { - findNext: 'landmark', msgId: 'next_landmark', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_LINK]: { - findNext: 'link', msgId: 'next_link', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_LIST]: { - findNext: 'list', msgId: 'next_list', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_LIST_ITEM]: { - findNext: 'listItem', msgId: 'next_list_item', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_MATH]: { - findNext: 'math', msgId: 'next_math', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_MEDIA]: { - findNext: 'media', msgId: 'next_media', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_RADIO]: { - findNext: 'radio', msgId: 'next_radio', category: CommandCategory.JUMP_COMMANDS, }, - [Command.NEXT_SECTION]: {findNext: 'section'}, - [Command.NEXT_SLIDER]: {findNext: 'slider'}, + [Command.NEXT_SECTION]: {}, + [Command.NEXT_SLIDER]: {}, [Command.NEXT_TABLE]: { - findNext: 'table', msgId: 'next_table', category: CommandCategory.JUMP_COMMANDS, }, [Command.NEXT_VISITED_LINK]: { - findNext: 'visitedLink', msgId: 'next_visited_link', category: CommandCategory.JUMP_COMMANDS, }, - [Command.PREVIOUS_ARTICLE]: {findNext: 'article'}, + [Command.PREVIOUS_ARTICLE]: {}, [Command.PREVIOUS_BUTTON]: { - findNext: 'button', msgId: 'previous_button', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_CHECKBOX]: { - findNext: 'checkbox', msgId: 'previous_checkbox', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_COMBO_BOX]: { - findNext: 'combobox', msgId: 'previous_combo_box', category: CommandCategory.JUMP_COMMANDS, }, - [Command.PREVIOUS_CONTROL]: {findNext: 'control'}, + [Command.PREVIOUS_CONTROL]: {}, [Command.PREVIOUS_EDIT_TEXT]: { - findNext: 'editText', msgId: 'previous_edit_text', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_FORM_FIELD]: { - findNext: 'formField', msgId: 'previous_form_field', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_GRAPHIC]: { - findNext: 'graphic', msgId: 'previous_graphic', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING]: { - findNext: 'heading', msgId: 'previous_heading', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING_1]: { - findNext: 'heading1', msgId: 'previous_heading1', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING_2]: { - findNext: 'heading2', msgId: 'previous_heading2', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING_3]: { - findNext: 'heading3', msgId: 'previous_heading3', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING_4]: { - findNext: 'heading4', msgId: 'previous_heading4', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING_5]: { - findNext: 'heading5', msgId: 'previous_heading5', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_HEADING_6]: { - findNext: 'heading6', msgId: 'previous_heading6', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_LANDMARK]: { - findNext: 'landmark', msgId: 'previous_landmark', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_LINK]: { - findNext: 'link', msgId: 'previous_link', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_LIST]: { - findNext: 'list', msgId: 'previous_list', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_LIST_ITEM]: { - findNext: 'listItem', msgId: 'previous_list_item', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_MATH]: { - findNext: 'math', msgId: 'previous_math', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_MEDIA]: { - findNext: 'media', msgId: 'previous_media', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_RADIO]: { - findNext: 'radio', msgId: 'previous_radio', category: CommandCategory.JUMP_COMMANDS, }, - [Command.PREVIOUS_SECTION]: {findNext: 'section'}, - [Command.PREVIOUS_SLIDER]: {findNext: 'slider'}, + [Command.PREVIOUS_SECTION]: {}, + [Command.PREVIOUS_SLIDER]: {}, [Command.PREVIOUS_TABLE]: { - findNext: 'table', msgId: 'previous_table', category: CommandCategory.JUMP_COMMANDS, }, [Command.PREVIOUS_VISITED_LINK]: { - findNext: 'visitedLink', msgId: 'previous_visited_link', category: CommandCategory.JUMP_COMMANDS, },
diff --git a/chrome/browser/resources/chromeos/accessibility/select_to_speak/prefs_manager.js b/chrome/browser/resources/chromeos/accessibility/select_to_speak/prefs_manager.js index eb51715..19596e5 100644 --- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/prefs_manager.js +++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/prefs_manager.js
@@ -253,95 +253,104 @@ } /** + * Loads prefs and policy from chrome.settingsPrivate. + * @private + */ + updateSettingsPrefs_() { + chrome.settingsPrivate.getPref( + PrefsManager.ENHANCED_VOICES_POLICY_KEY, pref => { + if (pref === undefined) { + return; + } + this.enhancedNetworkVoicesAllowed_ = Boolean(pref.value); + }); + } + + /** + * Loads prefs from chrome.storage and sets default values if necessary. + * @private + */ + updateStoragePrefs_() { + chrome.storage.sync.get( + [ + 'voice', + 'rate', + 'pitch', + 'wordHighlight', + 'highlightColor', + 'backgroundShading', + 'navigationControls', + 'enhancedNetworkVoices', + 'enhancedVoicesDialogShown', + 'enhancedVoiceName', + ], + prefs => { + if (prefs['voice']) { + this.voiceNameFromPrefs_ = prefs['voice']; + } + if (prefs['enhancedVoiceName'] !== undefined) { + this.enhancedVoiceName_ = prefs['enhancedVoiceName']; + } else { + chrome.storage.sync.set( + {'enhancedVoiceName': this.enhancedVoiceName_}); + } + if (prefs['wordHighlight'] !== undefined) { + this.wordHighlight_ = prefs['wordHighlight']; + } else { + chrome.storage.sync.set({'wordHighlight': this.wordHighlight_}); + } + if (prefs['highlightColor']) { + this.highlightColor_ = prefs['highlightColor']; + } else { + chrome.storage.sync.set({'highlightColor': this.highlightColor_}); + } + if (prefs['backgroundShading'] !== undefined) { + this.backgroundShadingEnabled_ = prefs['backgroundShading']; + } else { + chrome.storage.sync.set( + {'backgroundShading': this.backgroundShadingEnabled_}); + } + if (prefs['navigationControls'] !== undefined) { + this.navigationControlsEnabled_ = prefs['navigationControls']; + } else { + chrome.storage.sync.set( + {'navigationControls': this.navigationControlsEnabled_}); + } + if (prefs['enhancedNetworkVoices'] !== undefined) { + this.enhancedNetworkVoicesEnabled_ = prefs['enhancedNetworkVoices']; + } else { + chrome.storage.sync.set({ + 'enhancedNetworkVoices': this.enhancedNetworkVoicesEnabled_, + }); + } + if (prefs['enhancedVoicesDialogShown'] !== undefined) { + this.enhancedVoicesDialogShown_ = + prefs['enhancedVoicesDialogShown']; + } else { + chrome.storage.sync.set({ + 'enhancedVoicesDialogShown': this.enhancedVoicesDialogShown_, + }); + } + if (prefs['rate'] && prefs['pitch']) { + // Removes 'rate' and 'pitch' prefs after migrating data to global + // TTS settings if appropriate. + this.migrateToGlobalTtsSettings_(prefs['rate'], prefs['pitch']); + } + }); + } + + /** * Loads prefs and policy from chrome.storage and chrome.settingsPrivate, * sets default values if necessary, and registers a listener to update prefs * and policy when they change. */ initPreferences() { - const updatePolicy = () => { - chrome.settingsPrivate.getPref( - PrefsManager.ENHANCED_VOICES_POLICY_KEY, pref => { - if (pref === undefined) { - return; - } - this.enhancedNetworkVoicesAllowed_ = Boolean(pref.value); - }); - }; - const updatePrefs = () => { - chrome.storage.sync.get( - [ - 'voice', - 'rate', - 'pitch', - 'wordHighlight', - 'highlightColor', - 'backgroundShading', - 'navigationControls', - 'enhancedNetworkVoices', - 'enhancedVoicesDialogShown', - 'enhancedVoiceName', - ], - prefs => { - if (prefs['voice']) { - this.voiceNameFromPrefs_ = prefs['voice']; - } - if (prefs['enhancedVoiceName'] !== undefined) { - this.enhancedVoiceName_ = prefs['enhancedVoiceName']; - } else { - chrome.storage.sync.set( - {'enhancedVoiceName': this.enhancedVoiceName_}); - } - if (prefs['wordHighlight'] !== undefined) { - this.wordHighlight_ = prefs['wordHighlight']; - } else { - chrome.storage.sync.set({'wordHighlight': this.wordHighlight_}); - } - if (prefs['highlightColor']) { - this.highlightColor_ = prefs['highlightColor']; - } else { - chrome.storage.sync.set({'highlightColor': this.highlightColor_}); - } - if (prefs['backgroundShading'] !== undefined) { - this.backgroundShadingEnabled_ = prefs['backgroundShading']; - } else { - chrome.storage.sync.set( - {'backgroundShading': this.backgroundShadingEnabled_}); - } - if (prefs['navigationControls'] !== undefined) { - this.navigationControlsEnabled_ = prefs['navigationControls']; - } else { - chrome.storage.sync.set( - {'navigationControls': this.navigationControlsEnabled_}); - } - if (prefs['enhancedNetworkVoices'] !== undefined) { - this.enhancedNetworkVoicesEnabled_ = - prefs['enhancedNetworkVoices']; - } else { - chrome.storage.sync.set({ - 'enhancedNetworkVoices': this.enhancedNetworkVoicesEnabled_, - }); - } - if (prefs['enhancedVoicesDialogShown'] !== undefined) { - this.enhancedVoicesDialogShown_ = - prefs['enhancedVoicesDialogShown']; - } else { - chrome.storage.sync.set({ - 'enhancedVoicesDialogShown': this.enhancedVoicesDialogShown_, - }); - } - if (prefs['rate'] && prefs['pitch']) { - // Removes 'rate' and 'pitch' prefs after migrating data to global - // TTS settings if appropriate. - this.migrateToGlobalTtsSettings_(prefs['rate'], prefs['pitch']); - } - }); - }; + this.updateSettingsPrefs_(); + this.updateStoragePrefs_(); - updatePolicy(); - updatePrefs(); - - chrome.settingsPrivate.onPrefsChanged.addListener(updatePolicy); - chrome.storage.onChanged.addListener(updatePrefs); + chrome.settingsPrivate.onPrefsChanged.addListener( + () => this.updateSettingsPrefs_()); + chrome.storage.onChanged.addListener(() => this.updateStoragePrefs_()); this.updateDefaultVoice_(); window.speechSynthesis.onvoiceschanged = () => {
diff --git a/chrome/browser/resources/chromeos/add_supervision/DIR_METADATA b/chrome/browser/resources/chromeos/add_supervision/DIR_METADATA index c0ebf85..eff0b992 100644 --- a/chrome/browser/resources/chromeos/add_supervision/DIR_METADATA +++ b/chrome/browser/resources/chromeos/add_supervision/DIR_METADATA
@@ -1,3 +1 @@ -monorail { - component: "FamilyExperiences" -} \ No newline at end of file +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/arc_account_picker/arc_account_picker_browser_proxy.d.ts b/chrome/browser/resources/chromeos/arc_account_picker/arc_account_picker_browser_proxy.d.ts new file mode 100644 index 0000000..c7bb181 --- /dev/null +++ b/chrome/browser/resources/chromeos/arc_account_picker/arc_account_picker_browser_proxy.d.ts
@@ -0,0 +1,10 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +export interface Account { + id: string; + email: string; + fullName: string; + image: string; +}
diff --git a/chrome/browser/resources/chromeos/edu_coexistence/DIR_METADATA b/chrome/browser/resources/chromeos/edu_coexistence/DIR_METADATA index b636a0e..eff0b992 100644 --- a/chrome/browser/resources/chromeos/edu_coexistence/DIR_METADATA +++ b/chrome/browser/resources/chromeos/edu_coexistence/DIR_METADATA
@@ -1 +1 @@ -mixins: "//chrome/browser/ui/webui/chromeos/edu_coexistence/COMMON_METADATA" +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/parent_access/DIR_METADATA b/chrome/browser/resources/chromeos/parent_access/DIR_METADATA index 4f57b75..eff0b992 100644 --- a/chrome/browser/resources/chromeos/parent_access/DIR_METADATA +++ b/chrome/browser/resources/chromeos/parent_access/DIR_METADATA
@@ -1,3 +1 @@ -buganizer { - component_id: 1090157 -} +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/resources/downloads/item.ts b/chrome/browser/resources/downloads/item.ts index a586564..84e337a 100644 --- a/chrome/browser/resources/downloads/item.ts +++ b/chrome/browser/resources/downloads/item.ts
@@ -18,8 +18,8 @@ import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {HTMLEscape} from 'chrome://resources/js/util.js'; import {beforeNextRender, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/extensions/activity_log/activity_log.ts b/chrome/browser/resources/extensions/activity_log/activity_log.ts index fe92b52..338553c 100644 --- a/chrome/browser/resources/extensions/activity_log/activity_log.ts +++ b/chrome/browser/resources/extensions/activity_log/activity_log.ts
@@ -15,7 +15,7 @@ import '../shared_vars.css.js'; import {CrContainerShadowMixin} from 'chrome://resources/cr_elements/cr_container_shadow_mixin.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {afterNextRender, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/extensions/detail_view.ts b/chrome/browser/resources/extensions/detail_view.ts index 386795d..d428b42f 100644 --- a/chrome/browser/resources/extensions/detail_view.ts +++ b/chrome/browser/resources/extensions/detail_view.ts
@@ -28,7 +28,7 @@ import {CrToggleElement} from 'chrome://resources/cr_elements/cr_toggle/cr_toggle.js'; import {CrTooltipIconElement} from 'chrome://resources/cr_elements/policy/cr_tooltip_icon.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {afterNextRender, DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/extensions/drag_and_drop_handler.ts b/chrome/browser/resources/extensions/drag_and_drop_handler.ts index adb72ecf..312188c 100644 --- a/chrome/browser/resources/extensions/drag_and_drop_handler.ts +++ b/chrome/browser/resources/extensions/drag_and_drop_handler.ts
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {DragWrapperDelegate} from 'chrome://resources/js/cr/ui/drag_wrapper.js'; +import {DragWrapperDelegate} from 'chrome://resources/js/drag_wrapper.js'; import {Service} from './service.js';
diff --git a/chrome/browser/resources/extensions/drop_overlay.ts b/chrome/browser/resources/extensions/drop_overlay.ts index b9394f7..fc800e7 100644 --- a/chrome/browser/resources/extensions/drop_overlay.ts +++ b/chrome/browser/resources/extensions/drop_overlay.ts
@@ -7,7 +7,7 @@ import 'chrome://resources/cr_elements/cr_shared_vars.css.js'; import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js'; -import {DragWrapper} from 'chrome://resources/js/cr/ui/drag_wrapper.js'; +import {DragWrapper} from 'chrome://resources/js/drag_wrapper.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {DragAndDropHandler} from './drag_and_drop_handler.js';
diff --git a/chrome/browser/resources/extensions/error_page.ts b/chrome/browser/resources/extensions/error_page.ts index f0a0028..b2be3476 100644 --- a/chrome/browser/resources/extensions/error_page.ts +++ b/chrome/browser/resources/extensions/error_page.ts
@@ -16,8 +16,8 @@ import {CrContainerShadowMixin} from 'chrome://resources/cr_elements/cr_container_shadow_mixin.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {afterNextRender, DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/extensions/runtime_host_permissions.ts b/chrome/browser/resources/extensions/runtime_host_permissions.ts index 604e0c2..0d0fa2d 100644 --- a/chrome/browser/resources/extensions/runtime_host_permissions.ts +++ b/chrome/browser/resources/extensions/runtime_host_permissions.ts
@@ -22,7 +22,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {ItemDelegate} from './item.js';
diff --git a/chrome/browser/resources/extensions/site_permissions_list.ts b/chrome/browser/resources/extensions/site_permissions_list.ts index 8d966b5..c44c9612 100644 --- a/chrome/browser/resources/extensions/site_permissions_list.ts +++ b/chrome/browser/resources/extensions/site_permissions_list.ts
@@ -16,7 +16,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {getTemplate} from './site_permissions_list.html.js';
diff --git a/chrome/browser/resources/history/history_item.ts b/chrome/browser/resources/history/history_item.ts index eb219891..f27d8a6a 100644 --- a/chrome/browser/resources/history/history_item.ts +++ b/chrome/browser/resources/history/history_item.ts
@@ -12,8 +12,8 @@ import {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.js'; import {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {getFaviconForPageURL} from 'chrome://resources/js/icon.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
diff --git a/chrome/browser/resources/history/synced_device_card.ts b/chrome/browser/resources/history/synced_device_card.ts index e9f7141c..323d5cf 100644 --- a/chrome/browser/resources/history/synced_device_card.ts +++ b/chrome/browser/resources/history/synced_device_card.ts
@@ -11,7 +11,7 @@ import './shared_style.css.js'; import './strings.m.js'; -import {FocusRow} from 'chrome://resources/js/cr/ui/focus_row.js'; +import {FocusRow} from 'chrome://resources/js/focus_row.js'; import {getFaviconForPageURL} from 'chrome://resources/js/icon.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {IronCollapseElement} from 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
diff --git a/chrome/browser/resources/history/synced_device_manager.ts b/chrome/browser/resources/history/synced_device_manager.ts index c316de99..294e1021 100644 --- a/chrome/browser/resources/history/synced_device_manager.ts +++ b/chrome/browser/resources/history/synced_device_manager.ts
@@ -15,8 +15,8 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusGrid} from 'chrome://resources/js/cr/ui/focus_grid.js'; -import {FocusRow} from 'chrome://resources/js/cr/ui/focus_row.js'; +import {FocusGrid} from 'chrome://resources/js/focus_grid.js'; +import {FocusRow} from 'chrome://resources/js/focus_row.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {Debouncer, microTask, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/inline_login/BUILD.gn b/chrome/browser/resources/inline_login/BUILD.gn index 2db4aa7..013a975 100644 --- a/chrome/browser/resources/inline_login/BUILD.gn +++ b/chrome/browser/resources/inline_login/BUILD.gn
@@ -24,6 +24,7 @@ non_web_component_files = [ "inline_login_browser_proxy.ts" ] + ts_composite = true ts_definitions = [ "//tools/typescript/definitions/chrome_send.d.ts" ] ts_deps = [ "//third_party/polymer/v3_0:library",
diff --git a/chrome/browser/resources/inline_login/inline_login_app.html b/chrome/browser/resources/inline_login/inline_login_app.html index 8fd1098..530ea728 100644 --- a/chrome/browser/resources/inline_login/inline_login_app.html +++ b/chrome/browser/resources/inline_login/inline_login_app.html
@@ -91,8 +91,8 @@ </if> <div id="[[viewEnum_.ADD_ACCOUNT]]" slot="view"> - <paper-spinner-lite - active="[[isSpinnerActive_(loading_, verifyingAccount_)]]"> + <paper-spinner-lite id="spinner" + active="[[isSpinnerActive_(loading_, verifyingAccount_)]]"> </paper-spinner-lite> <if expr="chromeos_ash"> <p hidden$="[[!verifyingAccount_]]"> @@ -110,7 +110,7 @@ <if expr="chromeos_ash"> <div class="buttons" - hidden$="[[isSpinnerActive_(loading_, verifyingAccount_)]]"> + hidden$="[[isSpinnerActive_(loading_, verifyingAccount_)]]"> <cr-button class="back-button" aria-label="$i18n{accessibleBackButtonLabel}" on-click="handleGoBack_"
diff --git a/chrome/browser/resources/inline_login/inline_login_app.ts b/chrome/browser/resources/inline_login/inline_login_app.ts index 070b44fc..17e3510 100644 --- a/chrome/browser/resources/inline_login/inline_login_app.ts +++ b/chrome/browser/resources/inline_login/inline_login_app.ts
@@ -21,6 +21,7 @@ import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {isRTL} from 'chrome://resources/js/util.js'; +import {PaperSpinnerLiteElement} from 'chrome://resources/polymer/v3_0/paper-spinner/paper-spinner-lite.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; @@ -72,6 +73,7 @@ export interface InlineLoginAppElement { $: { signinFrame: WebViewElement, + spinner: PaperSpinnerLiteElement, viewManager: CrViewManagerElement, }; } @@ -541,7 +543,7 @@ } // </if> - private setAuthExtHostForTest(authExtHost: Authenticator) { + setAuthExtHostForTest(authExtHost: Authenticator) { this.authExtHost_ = authExtHost; this.addAuthExtHostListeners_(); }
diff --git a/chrome/browser/resources/inline_login/welcome_page_app.html b/chrome/browser/resources/inline_login/welcome_page_app.html index 23ea98ea6..51cfb3dc9 100644 --- a/chrome/browser/resources/inline_login/welcome_page_app.html +++ b/chrome/browser/resources/inline_login/welcome_page_app.html
@@ -35,8 +35,7 @@ isArcAccountRestrictionsEnabled_, isArcFlow_)]]"> <span class="secondary" id="arcToggleLabel" aria-hidden="true">$i18nRaw{accountManagerDialogArcToggleLabel}</span> - <cr-toggle checked="{{isAvailableInArc}}" - aria-labelledby="arcToggleLabel"> + <cr-toggle checked="{{isAvailableInArc}}" aria-labelledby="arcToggleLabel"> </cr-toggle> </div>
diff --git a/chrome/browser/resources/new_tab_page/app.ts b/chrome/browser/resources/new_tab_page/app.ts index 5dd0ceb..f350d7c 100644 --- a/chrome/browser/resources/new_tab_page/app.ts +++ b/chrome/browser/resources/new_tab_page/app.ts
@@ -12,7 +12,7 @@ import {ClickInfo, Command} from 'chrome://resources/js/browser_command/browser_command.mojom-webui.js'; import {BrowserCommandProxy} from 'chrome://resources/js/browser_command/browser_command_proxy.js'; import {hexColorToSkColor, skColorToRgba} from 'chrome://resources/js/color_utils.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {SkColor} from 'chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js'; import {DomIf, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/new_tab_page/customize_shortcuts.ts b/chrome/browser/resources/new_tab_page/customize_shortcuts.ts index f73a661f..776f699 100644 --- a/chrome/browser/resources/new_tab_page/customize_shortcuts.ts +++ b/chrome/browser/resources/new_tab_page/customize_shortcuts.ts
@@ -8,7 +8,7 @@ import 'chrome://resources/cr_elements/cr_button/cr_button.js'; import {CrToggleElement} from 'chrome://resources/cr_elements/cr_toggle/cr_toggle.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {getTemplate} from './customize_shortcuts.html.js';
diff --git a/chrome/browser/resources/ntp4/command.js b/chrome/browser/resources/ntp4/command.js index 4542623c..198f8e6e 100644 --- a/chrome/browser/resources/ntp4/command.js +++ b/chrome/browser/resources/ntp4/command.js
@@ -23,7 +23,7 @@ // clang-format off import {assert} from 'chrome://resources/js/assert.js'; import {define as crUiDefine} from 'chrome://resources/js/cr/ui.js'; -import {KeyboardShortcutList} from 'chrome://resources/js/cr/ui/keyboard_shortcut_list.js'; +import {KeyboardShortcutList} from 'chrome://resources/js/keyboard_shortcut_list.js'; import {dispatchPropertyChange, getPropertyDescriptor, PropertyKind} from 'chrome://resources/js/cr.m.js'; import {MenuItem} from './menu_item.js';
diff --git a/chrome/browser/resources/ntp4/nav_dot.js b/chrome/browser/resources/ntp4/nav_dot.js index 48b88fe..ff760703 100644 --- a/chrome/browser/resources/ntp4/nav_dot.js +++ b/chrome/browser/resources/ntp4/nav_dot.js
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {DragWrapper, DragWrapperDelegate} from 'chrome://resources/js/cr/ui/drag_wrapper.js'; +import {DragWrapper, DragWrapperDelegate} from 'chrome://resources/js/drag_wrapper.js'; import {getCardSlider, saveAppPageName} from './new_tab.js'; import {getCurrentlyDraggingTile, setCurrentDropEffect, TilePage} from './tile_page.js';
diff --git a/chrome/browser/resources/ntp4/page_switcher.js b/chrome/browser/resources/ntp4/page_switcher.js index c20a9a9b..b9dd5f9 100644 --- a/chrome/browser/resources/ntp4/page_switcher.js +++ b/chrome/browser/resources/ntp4/page_switcher.js
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {DragWrapper} from 'chrome://resources/js/cr/ui/drag_wrapper.js'; +import {DragWrapper} from 'chrome://resources/js/drag_wrapper.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {getCardSlider} from './new_tab.js';
diff --git a/chrome/browser/resources/ntp4/tile_page.js b/chrome/browser/resources/ntp4/tile_page.js index 145620260..af2b6f4 100644 --- a/chrome/browser/resources/ntp4/tile_page.js +++ b/chrome/browser/resources/ntp4/tile_page.js
@@ -5,7 +5,7 @@ import {assert, assertNotReached} from 'chrome://resources/js/assert.js'; import {dispatchSimpleEvent, isMac} from 'chrome://resources/js/cr.m.js'; import {toCssPx} from 'chrome://resources/js/cr/ui.js'; -import {DragWrapper, DragWrapperDelegate} from 'chrome://resources/js/cr/ui/drag_wrapper.js'; +import {DragWrapper, DragWrapperDelegate} from 'chrome://resources/js/drag_wrapper.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {$, isRTL} from 'chrome://resources/js/util.js';
diff --git a/chrome/browser/resources/ntp4/trash.js b/chrome/browser/resources/ntp4/trash.js index 85810151..0d0fd4d 100644 --- a/chrome/browser/resources/ntp4/trash.js +++ b/chrome/browser/resources/ntp4/trash.js
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {DragWrapper, DragWrapperDelegate} from 'chrome://resources/js/cr/ui/drag_wrapper.js'; +import {DragWrapper, DragWrapperDelegate} from 'chrome://resources/js/drag_wrapper.js'; import {getCurrentlyDraggingTile, setCurrentDropEffect} from './tile_page.js'; /**
diff --git a/chrome/browser/resources/pdf/elements/viewer-thumbnail-bar.ts b/chrome/browser/resources/pdf/elements/viewer-thumbnail-bar.ts index 83fffa84..027c119a 100644 --- a/chrome/browser/resources/pdf/elements/viewer-thumbnail-bar.ts +++ b/chrome/browser/resources/pdf/elements/viewer-thumbnail-bar.ts
@@ -5,7 +5,7 @@ import './viewer-thumbnail.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/print_preview/ui/app.ts b/chrome/browser/resources/print_preview/ui/app.ts index 6595561..005933f 100644 --- a/chrome/browser/resources/print_preview/ui/app.ts +++ b/chrome/browser/resources/print_preview/ui/app.ts
@@ -10,7 +10,7 @@ import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js'; import {isMac, isWindows} from 'chrome://resources/js/cr.m.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {hasKeyModifiers} from 'chrome://resources/js/util.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
diff --git a/chrome/browser/resources/settings/autofill_page/autofill_section.ts b/chrome/browser/resources/settings/autofill_page/autofill_section.ts index 6c270bd..fd25263 100644 --- a/chrome/browser/resources/settings/autofill_page/autofill_section.ts +++ b/chrome/browser/resources/settings/autofill_page/autofill_section.ts
@@ -25,7 +25,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {SettingsToggleButtonElement} from '../controls/settings_toggle_button.js';
diff --git a/chrome/browser/resources/settings/autofill_page/password_view.ts b/chrome/browser/resources/settings/autofill_page/password_view.ts index 779aeb1..0aa644c 100644 --- a/chrome/browser/resources/settings/autofill_page/password_view.ts +++ b/chrome/browser/resources/settings/autofill_page/password_view.ts
@@ -22,7 +22,7 @@ import {CrToastElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {loadTimeData} from '../i18n_setup.js';
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts index cee05d8..5fce733 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts +++ b/chrome/browser/resources/settings/autofill_page/passwords_list_handler.ts
@@ -26,7 +26,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrToastElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.ts b/chrome/browser/resources/settings/autofill_page/passwords_section.ts index cd9d8b8..a234823 100644 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.ts +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.ts
@@ -39,7 +39,7 @@ import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.js'; import {DomRepeat, DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/autofill_page/payments_section.ts b/chrome/browser/resources/settings/autofill_page/payments_section.ts index f80a0d0..304b135 100644 --- a/chrome/browser/resources/settings/autofill_page/payments_section.ts +++ b/chrome/browser/resources/settings/autofill_page/payments_section.ts
@@ -24,7 +24,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts b/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts index 7e2060b..6297a7b 100644 --- a/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts +++ b/chrome/browser/resources/settings/chromeos/os_about_page/detailed_build_info.ts
@@ -20,7 +20,7 @@ import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {CrPolicyIndicatorType} from 'chrome://resources/cr_elements/policy/cr_policy_indicator_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {loadTimeData} from '../../i18n_setup.js';
diff --git a/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.ts b/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.ts index 5daab7b..d6248cf 100644 --- a/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.ts +++ b/chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_page.ts
@@ -11,7 +11,7 @@ import {getEuicc, getNonPendingESimProfiles} from 'chrome://resources/ash/common/cellular_setup/esim_manager_utils.js'; import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {ESimProfileRemote} from 'chrome://resources/mojo/chromeos/ash/services/cellular_setup/public/mojom/esim_manager.mojom-webui.js'; import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_search_result_row.ts b/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_search_result_row.ts index 5d7d848..5133f70 100644 --- a/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_search_result_row.ts +++ b/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_search_result_row.ts
@@ -11,7 +11,7 @@ import {getInstance as getAnnouncerInstance} from 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_settings_search_box.ts b/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_settings_search_box.ts index 0426214..9a1e702 100644 --- a/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_settings_search_box.ts +++ b/chrome/browser/resources/settings/chromeos/os_settings_search_box/os_settings_search_box.ts
@@ -7,7 +7,7 @@ * and settings search results. */ import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; -import 'chrome://resources/js/cr/ui/focus_row.js'; +import 'chrome://resources/js/focus_row.js'; import 'chrome://resources/polymer/v3_0/iron-dropdown/iron-dropdown.js'; import 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; import '../../settings_shared.css.js';
diff --git a/chrome/browser/resources/settings/downloads_page/downloads_page.ts b/chrome/browser/resources/settings/downloads_page/downloads_page.ts index 2f9d816c..ef1f229 100644 --- a/chrome/browser/resources/settings/downloads_page/downloads_page.ts +++ b/chrome/browser/resources/settings/downloads_page/downloads_page.ts
@@ -14,7 +14,7 @@ import '../controls/settings_toggle_button.js'; import '../settings_shared.css.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {listenOnce} from 'chrome://resources/js/util.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {afterNextRender, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/languages_page/languages_page.ts b/chrome/browser/resources/settings/languages_page/languages_page.ts index 0afa05b7..ab18cf3f 100644 --- a/chrome/browser/resources/settings/languages_page/languages_page.ts +++ b/chrome/browser/resources/settings/languages_page/languages_page.ts
@@ -33,7 +33,7 @@ import {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; import {isWindows} from 'chrome://resources/js/cr.m.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; // <if expr="is_win">
diff --git a/chrome/browser/resources/settings/languages_page/spell_check_page.ts b/chrome/browser/resources/settings/languages_page/spell_check_page.ts index 27171a0..1efb800 100644 --- a/chrome/browser/resources/settings/languages_page/spell_check_page.ts +++ b/chrome/browser/resources/settings/languages_page/spell_check_page.ts
@@ -35,7 +35,7 @@ // </if> import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/languages_page/translate_page.ts b/chrome/browser/resources/settings/languages_page/translate_page.ts index a71bac9..864e104 100644 --- a/chrome/browser/resources/settings/languages_page/translate_page.ts +++ b/chrome/browser/resources/settings/languages_page/translate_page.ts
@@ -21,7 +21,7 @@ import '../settings_shared.css.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {SettingsToggleButtonElement} from '../controls/settings_toggle_button.js';
diff --git a/chrome/browser/resources/settings/on_startup_page/startup_url_entry.ts b/chrome/browser/resources/settings/on_startup_page/startup_url_entry.ts index 074e9672..f2df17d 100644 --- a/chrome/browser/resources/settings/on_startup_page/startup_url_entry.ts +++ b/chrome/browser/resources/settings/on_startup_page/startup_url_entry.ts
@@ -18,7 +18,7 @@ import {CrActionMenuElement} from '//resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {getTemplate} from './startup_url_entry.html.js';
diff --git a/chrome/browser/resources/settings/on_startup_page/startup_urls_page.ts b/chrome/browser/resources/settings/on_startup_page/startup_urls_page.ts index 233df23..45e8dadb 100644 --- a/chrome/browser/resources/settings/on_startup_page/startup_urls_page.ts +++ b/chrome/browser/resources/settings/on_startup_page/startup_urls_page.ts
@@ -16,7 +16,7 @@ import './startup_url_dialog.js'; import {CrScrollableMixin} from 'chrome://resources/cr_elements/cr_scrollable_mixin.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/people_page/people_page.ts b/chrome/browser/resources/settings/people_page/people_page.ts index 4f8c9ee..2934033a 100644 --- a/chrome/browser/resources/settings/people_page/people_page.ts +++ b/chrome/browser/resources/settings/people_page/people_page.ts
@@ -27,7 +27,7 @@ // </if> import {CrToastElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast.js'; import {isChromeOS} from 'chrome://resources/js/cr.m.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {getImage} from 'chrome://resources/js/icon.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/people_page/sync_page.ts b/chrome/browser/resources/settings/people_page/sync_page.ts index a68955e..a3021c6 100644 --- a/chrome/browser/resources/settings/people_page/sync_page.ts +++ b/chrome/browser/resources/settings/people_page/sync_page.ts
@@ -27,7 +27,7 @@ import {CrDialogElement} from '//resources/cr_elements/cr_dialog/cr_dialog.js'; import {CrInputElement} from '//resources/cr_elements/cr_input/cr_input.js'; import {assert, assertNotReached} from '//resources/js/assert_ts.js'; -import {focusWithoutInk} from '//resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from '//resources/js/focus_without_ink.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from '//resources/cr_elements/web_ui_listener_mixin.js'; import {IronCollapseElement} from '//resources/polymer/v3_0/iron-collapse/iron-collapse.js'; import {flush, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/performance_page/tab_discard_exception_entry.ts b/chrome/browser/resources/settings/performance_page/tab_discard_exception_entry.ts index 77bc573..89ecaf9 100644 --- a/chrome/browser/resources/settings/performance_page/tab_discard_exception_entry.ts +++ b/chrome/browser/resources/settings/performance_page/tab_discard_exception_entry.ts
@@ -7,7 +7,7 @@ import '../settings_shared.css.js'; import {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {BaseMixin} from '../base_mixin.js';
diff --git a/chrome/browser/resources/settings/privacy_page/cookies_page.ts b/chrome/browser/resources/settings/privacy_page/cookies_page.ts index b646bcf9..641ead6 100644 --- a/chrome/browser/resources/settings/privacy_page/cookies_page.ts +++ b/chrome/browser/resources/settings/privacy_page/cookies_page.ts
@@ -22,7 +22,7 @@ import {CrToastElement} from 'chrome://resources/cr_elements/cr_toast/cr_toast.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.ts b/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.ts index ec14e3c..fba626e 100644 --- a/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.ts +++ b/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.ts
@@ -7,7 +7,7 @@ import '../settings_shared.css.js'; import '../controls/settings_toggle_button.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {SettingsToggleButtonElement} from '../controls/settings_toggle_button.js';
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts index 93e9aae8..fb88f25 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -23,7 +23,7 @@ import {CrLinkRowElement} from 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/privacy_page/security_keys_subpage.ts b/chrome/browser/resources/settings/privacy_page/security_keys_subpage.ts index e761834..9b52afbe 100644 --- a/chrome/browser/resources/settings/privacy_page/security_keys_subpage.ts +++ b/chrome/browser/resources/settings/privacy_page/security_keys_subpage.ts
@@ -14,7 +14,7 @@ import './security_keys_reset_dialog.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {loadTimeData} from '../i18n_setup.js';
diff --git a/chrome/browser/resources/settings/privacy_page/security_page.ts b/chrome/browser/resources/settings/privacy_page/security_page.ts index 32e28883..df8dbc1 100644 --- a/chrome/browser/resources/settings/privacy_page/security_page.ts +++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
@@ -17,7 +17,7 @@ import {HelpBubbleMixin, HelpBubbleMixinInterface} from 'chrome://resources/cr_components/help_bubble/help_bubble_mixin.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {SettingsRadioGroupElement} from '../controls/settings_radio_group.js';
diff --git a/chrome/browser/resources/settings/reset_page/reset_page.ts b/chrome/browser/resources/settings/reset_page/reset_page.ts index d21f6ff..b73be133 100644 --- a/chrome/browser/resources/settings/reset_page/reset_page.ts +++ b/chrome/browser/resources/settings/reset_page/reset_page.ts
@@ -18,7 +18,7 @@ // </if> import {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {BaseMixin} from '../base_mixin.js';
diff --git a/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.ts b/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.ts index b6fd937..0552d88 100644 --- a/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.ts +++ b/chrome/browser/resources/settings/search_engines_page/omnibox_extension_entry.ts
@@ -14,7 +14,7 @@ import {AnchorAlignment} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {ExtensionControlBrowserProxy, ExtensionControlBrowserProxyImpl} from '../extension_control_browser_proxy.js';
diff --git a/chrome/browser/resources/settings/search_engines_page/search_engines_page.ts b/chrome/browser/resources/settings/search_engines_page/search_engines_page.ts index c33f409..e4e42bd 100644 --- a/chrome/browser/resources/settings/search_engines_page/search_engines_page.ts +++ b/chrome/browser/resources/settings/search_engines_page/search_engines_page.ts
@@ -20,7 +20,7 @@ import '../settings_shared.css.js'; import '../settings_vars.css.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {IronListElement} from 'chrome://resources/polymer/v3_0/iron-list/iron-list.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/settings_page/settings_animated_pages.ts b/chrome/browser/resources/settings/settings_page/settings_animated_pages.ts index 3557803..29dbf67 100644 --- a/chrome/browser/resources/settings/settings_page/settings_animated_pages.ts +++ b/chrome/browser/resources/settings/settings_page/settings_animated_pages.ts
@@ -17,7 +17,7 @@ import '//resources/polymer/v3_0/iron-pages/iron-pages.js'; import {assert} from '//resources/js/assert_ts.js'; -import {focusWithoutInk} from '//resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from '//resources/js/focus_without_ink.js'; // <if expr="chromeos_ash"> import {loadTimeData} from '//resources/js/load_time_data.m.js'; // </if>
diff --git a/chrome/browser/resources/settings/settings_page/settings_subpage.ts b/chrome/browser/resources/settings/settings_page/settings_subpage.ts index a24af5d..f9cd7805 100644 --- a/chrome/browser/resources/settings/settings_page/settings_subpage.ts +++ b/chrome/browser/resources/settings/settings_page/settings_subpage.ts
@@ -19,7 +19,7 @@ import {CrSearchFieldElement} from '//resources/cr_elements/cr_search_field/cr_search_field.js'; import {FindShortcutMixin, FindShortcutMixinInterface} from '//resources/cr_elements/find_shortcut_mixin.js'; import {assert} from '//resources/js/assert_ts.js'; -import {focusWithoutInk} from '//resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from '//resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from '//resources/cr_elements/i18n_mixin.js'; import {listenOnce} from '//resources/js/util.js'; import {IronResizableBehavior} from '//resources/polymer/v3_0/iron-resizable-behavior/iron-resizable-behavior.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_data.ts b/chrome/browser/resources/settings/site_settings/site_data.ts index 3680fdfc..d5ac0e4 100644 --- a/chrome/browser/resources/settings/site_settings/site_data.ts +++ b/chrome/browser/resources/settings/site_settings/site_data.ts
@@ -20,7 +20,7 @@ import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {ListPropertyUpdateMixin} from 'chrome://resources/cr_elements/list_property_update_mixin.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {IronListElement} from 'chrome://resources/polymer/v3_0/iron-list/iron-list.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_data_entry.ts b/chrome/browser/resources/settings/site_settings/site_data_entry.ts index b1d457f..8b80d9f0 100644 --- a/chrome/browser/resources/settings/site_settings/site_data_entry.ts +++ b/chrome/browser/resources/settings/site_settings/site_data_entry.ts
@@ -15,7 +15,7 @@ import '../settings_shared.css.js'; import '../site_favicon.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts index ac99bc1a..c1e2bcaa 100644 --- a/chrome/browser/resources/settings/site_settings/site_details.ts +++ b/chrome/browser/resources/settings/site_settings/site_details.ts
@@ -25,7 +25,7 @@ import {CrDialogElement} from 'chrome://resources/cr_elements/cr_dialog/cr_dialog.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_entry.ts b/chrome/browser/resources/settings/site_settings/site_entry.ts index 64a14baf..35af9a5 100644 --- a/chrome/browser/resources/settings/site_settings/site_entry.ts +++ b/chrome/browser/resources/settings/site_settings/site_entry.ts
@@ -17,7 +17,7 @@ import {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; import {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {IronCollapseElement} from 'chrome://resources/polymer/v3_0/iron-collapse/iron-collapse.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_list.ts b/chrome/browser/resources/settings/site_settings/site_list.ts index 36d03da..730187b3 100644 --- a/chrome/browser/resources/settings/site_settings/site_list.ts +++ b/chrome/browser/resources/settings/site_settings/site_list.ts
@@ -21,7 +21,7 @@ import './site_list_entry.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {ListPropertyUpdateMixin} from 'chrome://resources/cr_elements/list_property_update_mixin.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PaperTooltipElement} from 'chrome://resources/polymer/v3_0/paper-tooltip/paper-tooltip.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_list_entry.ts b/chrome/browser/resources/settings/site_settings/site_list_entry.ts index f215b08..63b1fdd 100644 --- a/chrome/browser/resources/settings/site_settings/site_list_entry.ts +++ b/chrome/browser/resources/settings/site_settings/site_list_entry.ts
@@ -16,7 +16,7 @@ import '../site_favicon.js'; import {assert, assertNotReached} from 'chrome://resources/js/assert_ts.js'; -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {BaseMixin} from '../base_mixin.js';
diff --git a/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.ts b/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.ts index ab4bc8c2..575700ef 100644 --- a/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.ts +++ b/chrome/browser/resources/settings/site_settings_page/recent_site_permissions.ts
@@ -10,7 +10,7 @@ import {CrTooltipIconElement} from 'chrome://resources/cr_elements/policy/cr_tooltip_icon.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin, WebUIListenerMixinInterface} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {PaperTooltipElement} from 'chrome://resources/polymer/v3_0/paper-tooltip/paper-tooltip.js';
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_list.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_list.ts index e162406..2be1162e 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_list.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_list.ts
@@ -9,7 +9,7 @@ import '../i18n_setup.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {DomRepeatEvent, microTask, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts index fa983c96..7e998696 100644 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -16,7 +16,7 @@ import './recent_site_permissions.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {FocusConfig} from '../focus_config.js';
diff --git a/chrome/browser/resources/side_panel/bookmarks/bookmarks_list.ts b/chrome/browser/resources/side_panel/bookmarks/bookmarks_list.ts index 2aa7679..702d056 100644 --- a/chrome/browser/resources/side_panel/bookmarks/bookmarks_list.ts +++ b/chrome/browser/resources/side_panel/bookmarks/bookmarks_list.ts
@@ -6,7 +6,7 @@ import './power_bookmark_row.js'; import {getInstance as getAnnouncerInstance} from 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {listenOnce} from 'chrome://resources/js/util.js'; import {afterNextRender, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/account_selection_lacros.ts b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/account_selection_lacros.ts index b9ed407..b936144 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/account_selection_lacros.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/account_selection_lacros.ts
@@ -7,7 +7,7 @@ import './profile_creation_shared.css.js'; import {assert} from 'chrome://resources/js/assert.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js'; import {afterNextRender, DomRepeatEvent, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.ts b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.ts index f44a09c..22d1bb8 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_creation_flow/profile_type_choice.ts
@@ -9,7 +9,7 @@ import {CrButtonElement} from 'chrome://resources/cr_elements/cr_button/cr_button.js'; import {assert} from 'chrome://resources/js/assert.js'; -import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.js'; +import {focusWithoutInk} from 'chrome://resources/js/focus_without_ink.js'; import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {WebUIListenerMixin} from 'chrome://resources/cr_elements/web_ui_listener_mixin.js';
diff --git a/chrome/browser/resources/tab_strip/tab_list.ts b/chrome/browser/resources/tab_strip/tab_list.ts index f7d15b4..e8cd181 100644 --- a/chrome/browser/resources/tab_strip/tab_list.ts +++ b/chrome/browser/resources/tab_strip/tab_list.ts
@@ -9,7 +9,7 @@ import {startColorChangeUpdater} from 'chrome://resources/cr_components/color_change_listener/colors_css_updater.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; import {addWebUIListener, removeWebUIListener, WebUIListener} from 'chrome://resources/js/cr.m.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {CustomElement} from 'chrome://resources/js/custom_element.js'; import {EventTracker} from 'chrome://resources/js/event_tracker.js'; import {isRTL} from 'chrome://resources/js/util.js';
diff --git a/chrome/browser/resources/welcome/welcome_app.ts b/chrome/browser/resources/welcome/welcome_app.ts index b0aad71e..ae5ef5b6 100644 --- a/chrome/browser/resources/welcome/welcome_app.ts +++ b/chrome/browser/resources/welcome/welcome_app.ts
@@ -14,7 +14,7 @@ import {CrViewManagerElement} from 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.js'; import {assert} from 'chrome://resources/js/assert_ts.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/browser/speech/cros_speech_recognition_service.cc b/chrome/browser/speech/cros_speech_recognition_service.cc index a6e4fb25..93d0886 100644 --- a/chrome/browser/speech/cros_speech_recognition_service.cc +++ b/chrome/browser/speech/cros_speech_recognition_service.cc
@@ -20,6 +20,9 @@ namespace { +constexpr char kInvalidSpeechRecogntionOptions[] = + "Invalid SpeechRecognitionOptions provided"; + void PopulateFilePaths(const std::string* language, base::FilePath& binary_path, base::FilePath& languagepack_path) { @@ -66,6 +69,15 @@ mojo::PendingRemote<media::mojom::SpeechRecognitionRecognizerClient> client, media::mojom::SpeechRecognitionOptionsPtr options, BindRecognizerCallback callback) { + // This binding is used by LiveCaption and it can't be server based + // recognition. + if (options->is_server_based || + options->recognizer_client_type != + media::mojom::RecognizerClientType::kLiveCaption) { + mojo::ReportBadMessage(kInvalidSpeechRecogntionOptions); + return; + } + base::FilePath binary_path, languagepack_path; PopulateFilePaths(base::OptionalToPtr(options->language), binary_path, languagepack_path); @@ -83,6 +95,14 @@ mojo::PendingRemote<media::mojom::SpeechRecognitionRecognizerClient> client, media::mojom::SpeechRecognitionOptionsPtr options, BindRecognizerCallback callback) { + if (options->is_server_based) { + // TODO(b/245614967): when kInternalServerSideSpeechRecognition + // feature flag is enabled, create the appropriate recognition recognizer + // here. + mojo::ReportBadMessage(kInvalidSpeechRecogntionOptions); + return; + } + base::FilePath binary_path, languagepack_path; PopulateFilePaths(base::OptionalToPtr(options->language), binary_path, languagepack_path);
diff --git a/chrome/browser/speech/on_device_speech_recognizer.cc b/chrome/browser/speech/speech_recognition_recognizer_client_impl.cc similarity index 79% rename from chrome/browser/speech/on_device_speech_recognizer.cc rename to chrome/browser/speech/speech_recognition_recognizer_client_impl.cc index 1d7e1f1..5e81f999 100644 --- a/chrome/browser/speech/on_device_speech_recognizer.cc +++ b/chrome/browser/speech/speech_recognition_recognizer_client_impl.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/speech/on_device_speech_recognizer.h" +#include "chrome/browser/speech/speech_recognition_recognizer_client_impl.h" #include <algorithm> #include <utility> @@ -58,7 +58,7 @@ } // namespace -bool OnDeviceSpeechRecognizer::IsOnDeviceSpeechRecognizerAvailable( +bool SpeechRecognitionRecognizerClientImpl::IsOnDeviceSpeechRecognizerAvailable( const std::string& language) { if (!base::FeatureList::IsEnabled(ash::features::kOnDeviceSpeechRecognition)) return false; @@ -66,18 +66,17 @@ return soda_installer->IsSodaInstalled(speech::GetLanguageCode(language)); } -OnDeviceSpeechRecognizer::OnDeviceSpeechRecognizer( +SpeechRecognitionRecognizerClientImpl::SpeechRecognitionRecognizerClientImpl( const base::WeakPtr<SpeechRecognizerDelegate>& delegate, Profile* profile, - const std::string& language, - bool recognition_mode_ime, - bool enable_formatting) + media::mojom::SpeechRecognitionOptionsPtr options) : SpeechRecognizer(delegate), state_(SpeechRecognizerStatus::SPEECH_RECOGNIZER_OFF), is_multichannel_supported_(false), - language_(language), waiting_for_params_(false) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + DCHECK(options->language.has_value()); + language_ = options->language.value(); // Connect the AudioSourceSpeechRecognitionContext & bind an // AudioSourceFetcher recognizer. @@ -88,28 +87,26 @@ audio_source_speech_recognition_context_->BindAudioSourceFetcher( audio_source_fetcher_.BindNewPipeAndPassReceiver(), speech_recognition_client_receiver_.BindNewPipeAndPassRemote(), - media::mojom::SpeechRecognitionOptions::New( - recognition_mode_ime ? media::mojom::SpeechRecognitionMode::kIme - : media::mojom::SpeechRecognitionMode::kCaption, - enable_formatting, language), - media::BindToCurrentLoop( - base::BindOnce(&OnDeviceSpeechRecognizer::OnRecognizerBound, - weak_factory_.GetWeakPtr()))); + std::move(options), + media::BindToCurrentLoop(base::BindOnce( + &SpeechRecognitionRecognizerClientImpl::OnRecognizerBound, + weak_factory_.GetWeakPtr()))); audio_source_speech_recognition_context_.set_disconnect_handler( - media::BindToCurrentLoop( - base::BindOnce(&OnDeviceSpeechRecognizer::OnRecognizerDisconnected, - weak_factory_.GetWeakPtr()))); + media::BindToCurrentLoop(base::BindOnce( + &SpeechRecognitionRecognizerClientImpl::OnRecognizerDisconnected, + weak_factory_.GetWeakPtr()))); } -OnDeviceSpeechRecognizer::~OnDeviceSpeechRecognizer() { +SpeechRecognitionRecognizerClientImpl:: + ~SpeechRecognitionRecognizerClientImpl() { audio_source_fetcher_->Stop(); audio_source_fetcher_.reset(); speech_recognition_client_receiver_.reset(); audio_source_speech_recognition_context_.reset(); } -void OnDeviceSpeechRecognizer::Start() { +void SpeechRecognitionRecognizerClientImpl::Start() { // Get audio parameters from the AudioSystem, and use these to start // recognition from the callback. if (!audio_system_) @@ -117,16 +114,17 @@ waiting_for_params_ = true; audio_system_->GetInputStreamParameters( media::AudioDeviceDescription::kDefaultDeviceId, - base::BindOnce(&OnDeviceSpeechRecognizer::StartFetchingOnInputDeviceInfo, + base::BindOnce(&SpeechRecognitionRecognizerClientImpl:: + StartFetchingOnInputDeviceInfo, weak_factory_.GetWeakPtr())); } -void OnDeviceSpeechRecognizer::Stop() { +void SpeechRecognitionRecognizerClientImpl::Stop() { audio_source_fetcher_->Stop(); UpdateStatus(SpeechRecognizerStatus::SPEECH_RECOGNITION_STOPPING); } -void OnDeviceSpeechRecognizer::OnSpeechRecognitionRecognitionEvent( +void SpeechRecognitionRecognizerClientImpl::OnSpeechRecognitionRecognitionEvent( const media::SpeechRecognitionResult& result, OnSpeechRecognitionRecognitionEventCallback reply) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -141,31 +139,31 @@ result.is_final, result); } -void OnDeviceSpeechRecognizer::OnSpeechRecognitionError() { +void SpeechRecognitionRecognizerClientImpl::OnSpeechRecognitionError() { UpdateStatus(SpeechRecognizerStatus::SPEECH_RECOGNIZER_ERROR); } -void OnDeviceSpeechRecognizer::OnLanguageIdentificationEvent( +void SpeechRecognitionRecognizerClientImpl::OnLanguageIdentificationEvent( media::mojom::LanguageIdentificationEventPtr event) { // Do nothing. } -void OnDeviceSpeechRecognizer::OnSpeechRecognitionStopped() { +void SpeechRecognitionRecognizerClientImpl::OnSpeechRecognitionStopped() { UpdateStatus(SpeechRecognizerStatus::SPEECH_RECOGNIZER_READY); delegate()->OnSpeechRecognitionStopped(); } -void OnDeviceSpeechRecognizer::OnRecognizerBound( +void SpeechRecognitionRecognizerClientImpl::OnRecognizerBound( bool is_multichannel_supported) { is_multichannel_supported_ = is_multichannel_supported; UpdateStatus(SpeechRecognizerStatus::SPEECH_RECOGNIZER_READY); } -void OnDeviceSpeechRecognizer::OnRecognizerDisconnected() { +void SpeechRecognitionRecognizerClientImpl::OnRecognizerDisconnected() { UpdateStatus(SpeechRecognizerStatus::SPEECH_RECOGNIZER_ERROR); } -void OnDeviceSpeechRecognizer::StartFetchingOnInputDeviceInfo( +void SpeechRecognitionRecognizerClientImpl::StartFetchingOnInputDeviceInfo( const absl::optional<media::AudioParameters>& params) { // waiting_for_params_ was set before requesting audio params from the // AudioSystem, which returns here asynchronously. If this has changed, then @@ -186,7 +184,8 @@ UpdateStatus(SpeechRecognizerStatus::SPEECH_RECOGNIZER_RECOGNIZING); } -void OnDeviceSpeechRecognizer::UpdateStatus(SpeechRecognizerStatus state) { +void SpeechRecognitionRecognizerClientImpl::UpdateStatus( + SpeechRecognizerStatus state) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); waiting_for_params_ = false; if (state_ == state)
diff --git a/chrome/browser/speech/on_device_speech_recognizer.h b/chrome/browser/speech/speech_recognition_recognizer_client_impl.h similarity index 67% rename from chrome/browser/speech/on_device_speech_recognizer.h rename to chrome/browser/speech/speech_recognition_recognizer_client_impl.h index 3455a8de..9fe9452 100644 --- a/chrome/browser/speech/on_device_speech_recognizer.h +++ b/chrome/browser/speech/speech_recognition_recognizer_client_impl.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_SPEECH_ON_DEVICE_SPEECH_RECOGNIZER_H_ -#define CHROME_BROWSER_SPEECH_ON_DEVICE_SPEECH_RECOGNIZER_H_ +#ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_RECOGNIZER_CLIENT_IMPL_H_ +#define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_RECOGNIZER_CLIENT_IMPL_H_ #include <memory> #include <string> @@ -22,9 +22,10 @@ class AudioSystem; } // namespace media -// OnDeviceSpeechRecognizer is a wrapper around the on-device speech recognition -// engine that simplifies its use from the browser process. -class OnDeviceSpeechRecognizer +// SpeechRecognitionRecognizerClientImpl is a wrapper around the on-device +// speech recognition engine that simplifies its use from the browser process. +// This client class is only used on ash chrome browser. +class SpeechRecognitionRecognizerClientImpl : public SpeechRecognizer, public media::mojom::SpeechRecognitionRecognizerClient { public: @@ -32,21 +33,15 @@ // on-device for the given language (BCP-47 format, e.g. "en-US"). static bool IsOnDeviceSpeechRecognizerAvailable(const std::string& language); - // |language| specificies the recognition language in BCP-47 format. - // |recognition_mode_ime| is whether to use speech recognition configured for - // IME or Captions. - // |enable_formatting| is whether to include extra, assumed formatting and - // punctuation. - // TODO(katie): Combine bools into an int of bits. - OnDeviceSpeechRecognizer( + SpeechRecognitionRecognizerClientImpl( const base::WeakPtr<SpeechRecognizerDelegate>& delegate, Profile* profile, - const std::string& language, - bool recognition_mode_ime, - bool enable_formatting); - ~OnDeviceSpeechRecognizer() override; - OnDeviceSpeechRecognizer(const OnDeviceSpeechRecognizer&) = delete; - OnDeviceSpeechRecognizer& operator=(const OnDeviceSpeechRecognizer&) = delete; + media::mojom::SpeechRecognitionOptionsPtr options); + ~SpeechRecognitionRecognizerClientImpl() override; + SpeechRecognitionRecognizerClientImpl( + const SpeechRecognitionRecognizerClientImpl&) = delete; + SpeechRecognitionRecognizerClientImpl& operator=( + const SpeechRecognitionRecognizerClientImpl&) = delete; // SpeechRecognizer: // Start and Stop must be called on the UI thread. @@ -63,7 +58,7 @@ void OnSpeechRecognitionStopped() override; private: - friend class OnDeviceSpeechRecognizerTest; + friend class SpeechRecognitionRecognizerClientImplTest; void OnRecognizerBound(bool success); void OnRecognizerDisconnected(); @@ -83,8 +78,8 @@ // in between requesting the callback and it running. bool waiting_for_params_; - // Tests may set audio_system_ after constructing an OnDeviceSpeechRecognizer - // to override default behavior. + // Tests may set audio_system_ after constructing an + // SpeechRecognitionRecognizerClientImpl to override default behavior. std::unique_ptr<media::AudioSystem> audio_system_; mojo::Remote<media::mojom::AudioSourceSpeechRecognitionContext> @@ -93,7 +88,8 @@ mojo::Receiver<media::mojom::SpeechRecognitionRecognizerClient> speech_recognition_client_receiver_{this}; - base::WeakPtrFactory<OnDeviceSpeechRecognizer> weak_factory_{this}; + base::WeakPtrFactory<SpeechRecognitionRecognizerClientImpl> weak_factory_{ + this}; }; -#endif // CHROME_BROWSER_SPEECH_ON_DEVICE_SPEECH_RECOGNIZER_H_ +#endif // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_RECOGNIZER_CLIENT_IMPL_H_
diff --git a/chrome/browser/speech/on_device_speech_recognizer_browsertest.cc b/chrome/browser/speech/speech_recognition_recognizer_client_impl_browsertest.cc similarity index 85% rename from chrome/browser/speech/on_device_speech_recognizer_browsertest.cc rename to chrome/browser/speech/speech_recognition_recognizer_client_impl_browsertest.cc index eae4c7b..8682eebc 100644 --- a/chrome/browser/speech/on_device_speech_recognizer_browsertest.cc +++ b/chrome/browser/speech/speech_recognition_recognizer_client_impl_browsertest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/speech/on_device_speech_recognizer.h" +#include "chrome/browser/speech/speech_recognition_recognizer_client_impl.h" #include <map> #include <memory> @@ -89,15 +89,17 @@ std::map<std::string, absl::optional<media::AudioParameters>> params_; }; -// Tests OnDeviceSpeechRecognizer plumbing with a fake SpeechRecognitionService. -// Does not do end-to-end audio fetching or test SODA on device. -class OnDeviceSpeechRecognizerTest : public InProcessBrowserTest { +// Tests SpeechRecognitionRecognizerClientImpl plumbing with a fake +// SpeechRecognitionService. Does not do end-to-end audio fetching or test SODA +// on device. +class SpeechRecognitionRecognizerClientImplTest : public InProcessBrowserTest { public: - OnDeviceSpeechRecognizerTest() = default; - ~OnDeviceSpeechRecognizerTest() override = default; - OnDeviceSpeechRecognizerTest(const OnDeviceSpeechRecognizerTest&) = delete; - OnDeviceSpeechRecognizerTest& operator=(const OnDeviceSpeechRecognizerTest&) = - delete; + SpeechRecognitionRecognizerClientImplTest() = default; + ~SpeechRecognitionRecognizerClientImplTest() override = default; + SpeechRecognitionRecognizerClientImplTest( + const SpeechRecognitionRecognizerClientImplTest&) = delete; + SpeechRecognitionRecognizerClientImplTest& operator=( + const SpeechRecognitionRecognizerClientImplTest&) = delete; void SetUpCommandLine(base::CommandLine* command_line) override { scoped_feature_list_.InitAndEnableFeature( @@ -110,7 +112,7 @@ CrosSpeechRecognitionServiceFactory::GetInstanceForTest() ->SetTestingFactoryAndUse( browser()->profile(), - base::BindRepeating(&OnDeviceSpeechRecognizerTest:: + base::BindRepeating(&SpeechRecognitionRecognizerClientImplTest:: CreateTestSpeechRecognitionService, base::Unretained(this))); mock_speech_delegate_ = @@ -139,9 +141,14 @@ OnSpeechRecognitionStateChanged(SPEECH_RECOGNIZER_READY)) .WillOnce(InvokeWithoutArgs(&loop, &base::RunLoop::Quit)) .RetiresOnSaturation(); - recognizer_ = std::make_unique<OnDeviceSpeechRecognizer>( - mock_speech_delegate_->GetWeakPtr(), browser()->profile(), "en-US", - /*recognition_mode_ime=*/true, /*enable_formatting=*/false); + recognizer_ = std::make_unique<SpeechRecognitionRecognizerClientImpl>( + mock_speech_delegate_->GetWeakPtr(), browser()->profile(), + media::mojom::SpeechRecognitionOptions::New( + media::mojom::SpeechRecognitionMode::kIme, + /*enable_formatting=*/false, + /*language=*/"en-US", + /*is_server_based=*/false, + media::mojom::RecognizerClientType::kDictation)); loop.Run(); } @@ -167,7 +174,7 @@ std::unique_ptr<testing::StrictMock<MockSpeechRecognizerDelegate>> mock_speech_delegate_; - std::unique_ptr<OnDeviceSpeechRecognizer> recognizer_; + std::unique_ptr<SpeechRecognitionRecognizerClientImpl> recognizer_; // Unowned. speech::FakeSpeechRecognitionService* fake_service_; @@ -175,11 +182,13 @@ base::test::ScopedFeatureList scoped_feature_list_; }; -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, SetsUpServiceConnection) { +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, + SetsUpServiceConnection) { ConstructRecognizerAndWaitForReady(); } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, StartsCapturingAudio) { +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, + StartsCapturingAudio) { testing::InSequence seq; ConstructRecognizerAndWaitForReady(); EXPECT_FALSE(fake_service_->is_capturing_audio()); @@ -209,7 +218,7 @@ } } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, ReceivesRecognitionEvents) { testing::InSequence seq; ConstructRecognizerAndWaitForReady(); @@ -240,7 +249,8 @@ base::RunLoop().RunUntilIdle(); } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, ReceivesErrors) { +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, + ReceivesErrors) { testing::InSequence seq; ConstructRecognizerAndWaitForReady(); @@ -252,7 +262,7 @@ base::RunLoop().RunUntilIdle(); } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, UsesReturnedParametersIfFramesPerBufferIsSlowEnough) { fake_service_->set_multichannel_supported(true); int sample_rate = 10000; @@ -269,7 +279,7 @@ EXPECT_TRUE(fake_service_->audio_parameters()->Equals(params)); } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, SlowerPollingIfFramesPerBufferIsTooShort) { fake_service_->set_multichannel_supported(true); int sample_rate = 20000; @@ -291,7 +301,7 @@ fake_service_->audio_parameters()->frames_per_buffer()); } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, SetsToSingleChannelIfMultichannelNotSupported) { fake_service_->set_multichannel_supported(false); int sample_rate = 20000; @@ -310,7 +320,8 @@ fake_service_->audio_parameters()->channel_layout()); } -IN_PROC_BROWSER_TEST_F(OnDeviceSpeechRecognizerTest, DefaultParameters) { +IN_PROC_BROWSER_TEST_F(SpeechRecognitionRecognizerClientImplTest, + DefaultParameters) { fake_service_->set_multichannel_supported(true); ConstructRecognizerAndWaitForReady(); StartListeningWithAudioParams(absl::nullopt);
diff --git a/chrome/browser/speech/speech_recognition_service_browsertest.cc b/chrome/browser/speech/speech_recognition_service_browsertest.cc index 1a99c69..bba88cb3 100644 --- a/chrome/browser/speech/speech_recognition_service_browsertest.cc +++ b/chrome/browser/speech/speech_recognition_service_browsertest.cc
@@ -269,7 +269,8 @@ speech_recognition_client_receiver_.BindNewPipeAndPassRemote(), media::mojom::SpeechRecognitionOptions::New( media::mojom::SpeechRecognitionMode::kCaption, - /*enable_formatting=*/true, "en-US"), + /*enable_formatting=*/true, "en-US", /* is_server_based=*/false, + media::mojom::RecognizerClientType::kLiveCaption), base::BindOnce( [](bool* p_is_multichannel_supported, base::RunLoop* run_loop, bool is_multichannel_supported) {
diff --git a/chrome/browser/storage_access_api/api_browsertest.cc b/chrome/browser/storage_access_api/api_browsertest.cc index e98df85..2e895de 100644 --- a/chrome/browser/storage_access_api/api_browsertest.cc +++ b/chrome/browser/storage_access_api/api_browsertest.cc
@@ -738,7 +738,8 @@ // Validate that if an iframe requests access that cookies become unblocked for // just that top-level/third-party combination. IN_PROC_BROWSER_TEST_P(StorageAccessAPIForOriginBrowserTest, - GrantGivesCrossSiteCookieAccess) { + // TODO(crbug.com/1370096): Re-enable this test + DISABLED_GrantGivesCrossSiteCookieAccess) { SetBlockThirdPartyCookies(true); base::HistogramTester histogram_tester;
diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html index fe3a1df..ab3fc23 100644 --- a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html +++ b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html
@@ -8,7 +8,6 @@ <link href="https://fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet"> <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css"> <link rel="stylesheet" href="supervised_user_block_interstitial.css"> -<script src="../../../../../ui/webui/resources/js/util_deprecated.js"></script> <script src="supervised_user_block_interstitial.js"></script> </head> <body class="supervised-user-block">
diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.js b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.js index 31ed0c08..6deb6d1 100644 --- a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.js +++ b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.js
@@ -7,6 +7,10 @@ let localWebApprovalsEnabled = false; let interstitialRefreshEnabled = false; +function $(id) { + return document.body.querySelector(`#${id}`); +} + function updateDetails() { $('details').hidden = !showDetails; }
diff --git a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html index d5e6b51c..b4ab22a 100644 --- a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html +++ b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial_v2.html
@@ -8,7 +8,6 @@ <link href="https://fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet"> <link rel="stylesheet" href="../../../../../components/security_interstitials/core/common/resources/interstitial_core.css"> <link rel="stylesheet" href="supervised_user_block_interstitial_v2.css"> -<script src="../../../../../ui/webui/resources/js/util_deprecated.js"></script> <script src="supervised_user_block_interstitial.js"></script> </head> <body class="supervised-user-block">
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java index c51a8082..83d608a 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java
@@ -5,6 +5,7 @@ package org.chromium.chrome.browser.omnibox.suggestions; import android.content.Context; +import android.text.TextUtils; import android.util.Pair; import androidx.annotation.NonNull; @@ -281,6 +282,8 @@ final AutocompleteMatch suggestion = suggestionAndProcessorPair.first; final SuggestionProcessor processor = suggestionAndProcessorPair.second; + // Note: with suggestion grouping in place, the condition below also + // determines rounding boundaries of suggestion group. if (currentGroup != suggestion.getGroupId()) { currentGroup = suggestion.getGroupId(); final GroupDetails details = @@ -288,8 +291,9 @@ // Only add the Header Group when both ID and details are specified. // Note that despite GroupsDetails map not holding <null> values, - // a group definition for specific ID may be unavailable. - if (details != null) { + // a group definition for specific ID may be unavailable, or the group + // header text may be empty. + if (details != null && !TextUtils.isEmpty(details.title)) { final PropertyModel model = mHeaderProcessor.createModel(); mHeaderProcessor.populateModel(model, currentGroup, details.title); viewInfoList.add(
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilderUnitTest.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilderUnitTest.java index 4f13eb3e..6999dad9 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilderUnitTest.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilderUnitTest.java
@@ -197,6 +197,70 @@ @Test @SmallTest + public void headers_ignoreGroupHeadersWithNoTitle() { + final List<AutocompleteMatch> actualList = new ArrayList<>(); + final SparseArray<GroupDetails> groupsDetails = new SparseArray<>(); + groupsDetails.put(1, new GroupDetails(null, false)); + groupsDetails.put(2, new GroupDetails("Header 2", false)); + + when(mMockSuggestionProcessor.doesProcessSuggestion(any(), anyInt())).thenReturn(true); + AutocompleteMatch suggestionWithNoGroup = + AutocompleteMatchBuilder.searchWithType(OmniboxSuggestionType.SEARCH_SUGGEST) + .build(); + AutocompleteMatch suggestionForGroup1 = + AutocompleteMatchBuilder.searchWithType(OmniboxSuggestionType.SEARCH_SUGGEST) + .setGroupId(1) + .build(); + AutocompleteMatch suggestionForGroup2 = + AutocompleteMatchBuilder.searchWithType(OmniboxSuggestionType.SEARCH_SUGGEST) + .setGroupId(2) + .build(); + + actualList.add(suggestionWithNoGroup); + actualList.add(suggestionForGroup1); + actualList.add(suggestionForGroup1); + actualList.add(suggestionForGroup2); + actualList.add(suggestionForGroup2); + + final InOrder verifier = inOrder(mMockSuggestionProcessor, mMockHeaderProcessor); + final List<DropdownItemViewInfo> model = mBuilder.buildDropdownViewInfoList( + AutocompleteResult.fromCache(actualList, groupsDetails)); + + verifier.verify(mMockSuggestionProcessor, times(1)) + .populateModel(eq(suggestionWithNoGroup), any(), eq(0)); + verifier.verify(mMockSuggestionProcessor, times(1)) + .populateModel(eq(suggestionForGroup1), any(), eq(1)); + verifier.verify(mMockSuggestionProcessor, times(1)) + .populateModel(eq(suggestionForGroup1), any(), eq(2)); + verifier.verify(mMockHeaderProcessor, times(1)).populateModel(any(), eq(2), eq("Header 2")); + verifier.verify(mMockSuggestionProcessor, times(1)) + .populateModel(eq(suggestionForGroup2), any(), eq(3)); + verifier.verify(mMockSuggestionProcessor, times(1)) + .populateModel(eq(suggestionForGroup2), any(), eq(4)); + + // Make sure no other headers were ever constructed. + verify(mMockHeaderProcessor, times(1)).populateModel(any(), anyInt(), any()); + + Assert.assertEquals(6, model.size()); // 1 header + 5 suggestions. + + Assert.assertEquals(model.get(0).type, OmniboxSuggestionUiType.DEFAULT); + Assert.assertEquals(model.get(0).groupId, -1); + + Assert.assertEquals(model.get(1).type, OmniboxSuggestionUiType.DEFAULT); + Assert.assertEquals(model.get(1).groupId, 1); + Assert.assertEquals(model.get(2).type, OmniboxSuggestionUiType.DEFAULT); + Assert.assertEquals(model.get(2).groupId, 1); + + Assert.assertEquals(model.get(3).type, OmniboxSuggestionUiType.HEADER); + Assert.assertEquals(model.get(3).groupId, 2); + Assert.assertEquals(model.get(4).type, OmniboxSuggestionUiType.DEFAULT); + Assert.assertEquals(model.get(4).groupId, 2); + Assert.assertEquals(model.get(5).type, OmniboxSuggestionUiType.DEFAULT); + Assert.assertEquals(model.get(5).groupId, 2); + } + + @Test + @SmallTest public void builder_propagatesFocusChangeEvents() { mBuilder.onUrlFocusChange(true); verify(mMockHeaderProcessor, times(1)).onUrlFocusChange(eq(true));
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java index 63f8fe5..f18027521 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
@@ -131,7 +131,7 @@ /** * Returns whether the WebContents is showing trusted offline page. */ - default boolean isShowingTrustedOfflinePage(WebContents webContents) { + default boolean isShowingTrustedOfflinePage(Tab tab) { return false; } @@ -347,7 +347,7 @@ formattedUrl = UrlUtilities.stripScheme(mUrlFormatter.format(originalUrl)); // Clear the editing text for untrusted offline pages. - if (!mOfflineStatus.isShowingTrustedOfflinePage(mTab.getWebContents())) { + if (!mOfflineStatus.isShowingTrustedOfflinePage(mTab)) { return buildUrlBarData(url, formattedUrl, ""); }
diff --git a/chrome/browser/ui/app_list/search/files/file_suggest_keyed_service_unittest.cc b/chrome/browser/ui/app_list/search/files/file_suggest_keyed_service_unittest.cc index 496558a..cce6f615 100644 --- a/chrome/browser/ui/app_list/search/files/file_suggest_keyed_service_unittest.cc +++ b/chrome/browser/ui/app_list/search/files/file_suggest_keyed_service_unittest.cc
@@ -104,12 +104,13 @@ const base::FilePath path2("file2"); file_suggest_service_->SetSuggestionsForType( /*type=*/FileSuggestionType::kDriveFile, - /*suggestions=*/{{FileSuggestionType::kDriveFile, path1, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}, - {FileSuggestionType::kDriveFile, path2, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}}); + /*suggestions=*/std::vector<FileSuggestData>{ + {FileSuggestionType::kDriveFile, path1, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}, + {FileSuggestionType::kDriveFile, path2, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); absl::optional<std::vector<FileSuggestData>> suggestions = GetSuggestionsForType(FileSuggestionType::kDriveFile); @@ -132,12 +133,13 @@ const base::FilePath path4("file4"); file_suggest_service_->SetSuggestionsForType( /*type=*/FileSuggestionType::kLocalFile, - /*suggestions=*/{{FileSuggestionType::kLocalFile, path3, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}, - {FileSuggestionType::kLocalFile, path4, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}}); + /*suggestions=*/std::vector<FileSuggestData>{ + {FileSuggestionType::kLocalFile, path3, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}, + {FileSuggestionType::kLocalFile, path4, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); suggestions = GetSuggestionsForType(FileSuggestionType::kLocalFile); EXPECT_EQ(2u, suggestions->size()); EXPECT_EQ("file3", suggestions->at(0).file_path.value());
diff --git a/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.cc b/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.cc index c0317831..f782e64 100644 --- a/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.cc +++ b/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.cc
@@ -41,7 +41,7 @@ void MockFileSuggestKeyedService::SetSuggestionsForType( app_list::FileSuggestionType type, - const std::vector<app_list::FileSuggestData>& suggestions) { + const absl::optional<std::vector<app_list::FileSuggestData>>& suggestions) { type_suggestion_mappings_[type] = suggestions; OnSuggestionProviderUpdated(type); }
diff --git a/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.h b/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.h index 5047e26..674ec82 100644 --- a/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.h +++ b/chrome/browser/ui/app_list/search/files/mock_file_suggest_keyed_service.h
@@ -41,14 +41,16 @@ void SetSuggestionsForType( app_list::FileSuggestionType type, - const std::vector<app_list::FileSuggestData>& suggestions); + const absl::optional<std::vector<app_list::FileSuggestData>>& + suggestions); private: void RunGetSuggestFileDataCallback(app_list::FileSuggestionType type, GetSuggestFileDataCallback callback); // Caches file suggestions. - std::map<app_list::FileSuggestionType, std::vector<app_list::FileSuggestData>> + std::map<app_list::FileSuggestionType, + absl::optional<std::vector<app_list::FileSuggestData>>> type_suggestion_mappings_; base::WeakPtrFactory<MockFileSuggestKeyedService> weak_factory_{this};
diff --git a/chrome/browser/ui/ash/desks/desks_client.cc b/chrome/browser/ui/ash/desks/desks_client.cc index a289bcf3..dcfe0539 100644 --- a/chrome/browser/ui/ash/desks/desks_client.cc +++ b/chrome/browser/ui/ash/desks/desks_client.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/ash/desks/desks_client.h" #include <memory> +#include <string> #include "ash/constants/ash_features.h" #include "ash/public/cpp/desk_template.h" @@ -13,6 +14,7 @@ #include "ash/wm/desks/desk.h" #include "ash/wm/desks/desks_bar_view.h" #include "ash/wm/desks/desks_controller.h" +#include "ash/wm/desks/desks_histogram_enums.h" #include "ash/wm/desks/templates/saved_desk_util.h" #include "ash/wm/overview/overview_controller.h" #include "ash/wm/overview/overview_grid.h" @@ -525,6 +527,19 @@ std::move(callback).Run(""); } +base::GUID DesksClient::GetActiveDesk() { + return desks_controller_->GetTargetActiveDesk()->uuid(); +} + +std::string DesksClient::SwitchDesk(const base::GUID& desk_uuid) { + ash::Desk* desk = desks_controller_->GetDeskByUuid(desk_uuid); + if (!desk) { + return kNoSuchDeskError; + } + desks_controller_->ActivateDesk(desk, ash::DesksSwitchSource::kApi); + return {}; +} + void DesksClient::OnGetTemplateForDeskLaunch( LaunchDeskCallback callback, std::u16string customized_desk_name,
diff --git a/chrome/browser/ui/ash/desks/desks_client.h b/chrome/browser/ui/ash/desks/desks_client.h index 6839dbb..5f10833 100644 --- a/chrome/browser/ui/ash/desks/desks_client.h +++ b/chrome/browser/ui/ash/desks/desks_client.h
@@ -165,6 +165,12 @@ bool all_desk, ErrorHandlingCallBack); + // Returns the UUID of active desk. + base::GUID GetActiveDesk(); + + // Switches to the target desk, returns error string if operation fails. + std::string SwitchDesk(const base::GUID& desk_uuid); + private: class LaunchPerformanceTracker; friend class DesksTemplatesClientTest;
diff --git a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc index d075e552..6727b16 100644 --- a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc +++ b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
@@ -2550,6 +2550,45 @@ loop.Run(); } +// Tests switch to current desk should be no ops. +IN_PROC_BROWSER_TEST_F(DesksTemplatesClientTest, SwitchToCurrentDesk) { + base::GUID current_desk_uuid; + current_desk_uuid = DesksClient::Get()->GetActiveDesk(); + + std::string error = DesksClient::Get()->SwitchDesk(current_desk_uuid); + EXPECT_TRUE(error.empty()); + + base::GUID desk_uuid = DesksClient::Get()->GetActiveDesk(); + EXPECT_EQ(current_desk_uuid, desk_uuid); +} + +// Tests switch to invalid desk should return error. +IN_PROC_BROWSER_TEST_F(DesksTemplatesClientTest, SwitchToInvalidDesk) { + std::string error = DesksClient::Get()->SwitchDesk({}); + EXPECT_EQ("The desk cannot be found.", error); +} + +// Tests switch to different desk should be trigger desk animation. +IN_PROC_BROWSER_TEST_F(DesksTemplatesClientTest, SwitchToDifferentDesk) { + base::GUID desk_uuid = DesksClient::Get()->GetActiveDesk(); + + // Launches a new desk. + DesksClient::Get()->LaunchEmptyDesk(base::BindLambdaForTesting( + [&](std::string error, const base::GUID& desk_uuid) { + EXPECT_TRUE(error.empty()); + })); + + // Switches to previous desk. + std::string error = DesksClient::Get()->SwitchDesk(desk_uuid); + EXPECT_TRUE(error.empty()); + + // Wait for desk switch animation. + ash::DeskSwitchAnimationWaiter waiter; + waiter.Wait(); + base::GUID desk_uuid_ = DesksClient::Get()->GetActiveDesk(); + EXPECT_EQ(desk_uuid_, desk_uuid); +} + class DesksTemplatesClientLacrosTest : public InProcessBrowserTest { public: DesksTemplatesClientLacrosTest() {
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc index 4215273..b5a7616 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc
@@ -95,10 +95,10 @@ } std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>> -GetSuggestionsInModel(const HoldingSpaceModel& model) { +GetSuggestionsInModel(const HoldingSpaceModel* model) { std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>> model_suggestions; - for (const auto& item : model.items()) { + for (const auto& item : model->items()) { if (HoldingSpaceItem::IsSuggestion(item->type())) model_suggestions.emplace_back(item->type(), item->file_path()); } @@ -124,6 +124,24 @@ file_manager::VolumeManager::GetMtpStorageInfoCallback()); } +HoldingSpaceItem* AddUninitializedItem(HoldingSpaceModel* model, + HoldingSpaceItem::Type type, + const base::FilePath& path) { + // Create a holding space item and use it to create a serialized item + // dictionary. + auto item = HoldingSpaceItem::CreateFileBackedItem( + type, path, GURL("filesystem:ignored"), + base::BindOnce(&CreateTestHoldingSpaceImage)); + const auto serialized_holding_space_item = item->Serialize(); + auto deserialized_item = HoldingSpaceItem::Deserialize( + serialized_holding_space_item, + /*image_resolver=*/base::BindOnce(&CreateTestHoldingSpaceImage)); + + auto* deserialized_item_ptr = deserialized_item.get(); + model->AddItem(std::move(deserialized_item)); + return deserialized_item_ptr; +} + // Utility class which can wait until a `HoldingSpaceModel` for a given profile // is attached to the `HoldingSpaceController`. class HoldingSpaceModelAttachedWaiter : public HoldingSpaceControllerObserver { @@ -349,7 +367,15 @@ // Needed by `file_manager::VolumeManager`. ash::disks::DiskMountManager::InitializeForTesting( new file_manager::FakeDiskMountManager); + + // Needed for `app_list::MockFileSuggestKeyedService`. + ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); + BrowserWithTestWindowTest::SetUp(); + + app_list::WaitUntilFileSuggestServiceReady( + app_list::FileSuggestKeyedServiceFactory::GetInstance()->GetService( + GetProfile())); } void TearDown() override { @@ -361,7 +387,11 @@ return {{arc::ArcFileSystemBridge::GetFactory(), base::BindRepeating(&BuildArcFileSystemBridge)}, {file_manager::VolumeManagerFactory::GetInstance(), - base::BindRepeating(&BuildVolumeManager)}}; + base::BindRepeating(&BuildVolumeManager)}, + {app_list::FileSuggestKeyedServiceFactory::GetInstance(), + base::BindRepeating(&app_list::MockFileSuggestKeyedService:: + BuildMockFileSuggestKeyedService, + temp_dir_.GetPath())}}; } TestingProfile* CreateProfile() override { @@ -509,6 +539,7 @@ std::map<Profile*, testing::NiceMock<MockDownloadManager>*> download_managers_; arc::ArcServiceManager arc_service_manager_; + base::ScopedTempDir temp_dir_; }; class HoldingSpaceKeyedServiceWithExperimentalFeatureTest @@ -2931,20 +2962,7 @@ ash::features::kHoldingSpaceSuggestions, GetParam()); } - // HoldingSpaceKeyedServiceTest: - TestingProfile::TestingFactories GetTestingFactories() override { - auto testing_factories = - HoldingSpaceKeyedServiceTest::GetTestingFactories(); - testing_factories.emplace_back( - app_list::FileSuggestKeyedServiceFactory::GetInstance(), - base::BindRepeating(&app_list::MockFileSuggestKeyedService:: - BuildMockFileSuggestKeyedService, - temp_dir_.GetPath())); - return testing_factories; - } - void SetUp() override { - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); HoldingSpaceKeyedServiceTest::SetUp(); // Create a mount point to host test files. @@ -2955,7 +2973,6 @@ mount_point_->Mount(GetProfile()); HoldingSpaceModelAttachedWaiter(profile).Wait(); - app_list::WaitUntilFileSuggestServiceReady(GetFileSuggestKeyedService()); } void TearDown() override { @@ -2974,7 +2991,6 @@ private: base::test::ScopedFeatureList scoped_feature_list_; std::unique_ptr<ScopedTestMountPoint> mount_point_; - base::ScopedTempDir temp_dir_; }; INSTANTIATE_TEST_SUITE_P(All, @@ -2984,13 +3000,14 @@ TEST_P(HoldingSpaceSuggestionsDelegateTest, VerifySuggestionsInModel) { const base::FilePath file_path_1 = mount_point()->CreateArbitraryFile(); - // Update drive file suggestions. Fast-forward to ensure the suggestion fetch + // Update Drive file suggestions. Fast-forward to ensure the suggestion fetch // completes. GetFileSuggestKeyedService()->SetSuggestionsForType( app_list::FileSuggestionType::kDriveFile, - /*suggestions=*/{{app_list::FileSuggestionType::kDriveFile, file_path_1, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}}); + /*suggestions=*/std::vector<app_list::FileSuggestData>{ + {app_list::FileSuggestionType::kDriveFile, file_path_1, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); task_environment()->FastForwardBy(base::Seconds(1)); const bool suggestion_feature_enabled = @@ -3000,52 +3017,173 @@ // feature is enabled. There should be no suggestions in the model when the // feature is disabled. std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>> expected; - if (suggestion_feature_enabled) { - expected = std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>>( - {{HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}); - } + if (suggestion_feature_enabled) + expected = {{HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; - // Check the model after drive file suggestions update. - EXPECT_EQ(expected, - GetSuggestionsInModel(*HoldingSpaceController::Get()->model())); - - // TODO(https://crbug.com/1369418): Add local file suggestions to this - // test. + // Check the model after Drive file suggestions update. + HoldingSpaceModel* const model = HoldingSpaceController::Get()->model(); + EXPECT_EQ(expected, GetSuggestionsInModel(model)); const base::FilePath file_path_2 = mount_point()->CreateArbitraryFile(); - // Update drive file suggestions again then check the model. + // Update local file suggestions and check the model. + GetFileSuggestKeyedService()->SetSuggestionsForType( + app_list::FileSuggestionType::kLocalFile, + /*suggestions=*/std::vector<app_list::FileSuggestData>{ + {app_list::FileSuggestionType::kLocalFile, file_path_2, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); + task_environment()->RunUntilIdle(); + + if (suggestion_feature_enabled) { + expected = {{HoldingSpaceItem::Type::kLocalSuggestion, file_path_2}, + {HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; + } + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + const base::FilePath file_path_3 = mount_point()->CreateArbitraryFile(); + + // Update Drive file suggestions again and check the model. GetFileSuggestKeyedService()->SetSuggestionsForType( app_list::FileSuggestionType::kDriveFile, - {{app_list::FileSuggestionType::kDriveFile, file_path_1, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}, - {app_list::FileSuggestionType::kDriveFile, file_path_2, - /*new_prediction_reason=*/absl::nullopt, - /*new_score=*/absl::nullopt}}); + /*suggestions=*/ + std::vector<app_list::FileSuggestData>{ + {app_list::FileSuggestionType::kDriveFile, file_path_1, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}, + {app_list::FileSuggestionType::kDriveFile, file_path_3, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); task_environment()->FastForwardBy(base::Seconds(1)); - if (suggestion_feature_enabled) { - expected = std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>>( - {{HoldingSpaceItem::Type::kDriveSuggestion, file_path_2}, - {HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}); - } - EXPECT_EQ(expected, - GetSuggestionsInModel(*HoldingSpaceController::Get()->model())); - // Update drive file suggestions with an empty array. + if (suggestion_feature_enabled) { + expected = {{HoldingSpaceItem::Type::kLocalSuggestion, file_path_2}, + {HoldingSpaceItem::Type::kDriveSuggestion, file_path_3}, + {HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; + } + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Update Drive file suggestions with an empty array. GetFileSuggestKeyedService()->SetSuggestionsForType( - app_list::FileSuggestionType::kDriveFile, /*suggestions=*/{}); + app_list::FileSuggestionType::kDriveFile, + /*suggestions=*/std::vector<app_list::FileSuggestData>{}); task_environment()->FastForwardBy(base::Seconds(1)); - // Drive file suggestions should be removed from the model if the feature is + // Drive file suggestions should be removed from the model if suggestions are // enabled. - if (suggestion_feature_enabled) { - expected = - std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>>({}); - } + if (suggestion_feature_enabled) + expected = {{HoldingSpaceItem::Type::kLocalSuggestion, file_path_2}}; + EXPECT_EQ(expected, GetSuggestionsInModel(model)); - EXPECT_EQ(expected, - GetSuggestionsInModel(*HoldingSpaceController::Get()->model())); + // Update local file suggestions with an empty array. + GetFileSuggestKeyedService()->SetSuggestionsForType( + app_list::FileSuggestionType::kLocalFile, + /*suggestions=*/std::vector<app_list::FileSuggestData>{}); + task_environment()->FastForwardBy(base::Seconds(1)); + + // There should be no suggestions in the model. + expected.clear(); + EXPECT_EQ(expected, GetSuggestionsInModel(model)); +} + +TEST_P(HoldingSpaceSuggestionsDelegateTest, PinAndUnpinSuggestions) { + const base::FilePath file_path_1 = mount_point()->CreateArbitraryFile(); + + // Update Drive file suggestions. Fast-forward to ensure the suggestion fetch + // completes. + GetFileSuggestKeyedService()->SetSuggestionsForType( + app_list::FileSuggestionType::kDriveFile, + /*suggestions=*/std::vector<app_list::FileSuggestData>{ + {app_list::FileSuggestionType::kDriveFile, file_path_1, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); + task_environment()->FastForwardBy(base::Seconds(1)); + + const bool suggestion_feature_enabled = + features::IsHoldingSpaceSuggestionsEnabled(); + + // Populate the expected suggestions array if the holding space suggestion + // feature is enabled. There should be no suggestions in the model when the + // feature is disabled. + std::vector<std::pair<HoldingSpaceItem::Type, base::FilePath>> expected; + if (suggestion_feature_enabled) + expected = {{HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; + + // Check the model after Drive file suggestions update. + HoldingSpaceModel* const model = HoldingSpaceController::Get()->model(); + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + const base::FilePath file_path_2 = mount_point()->CreateArbitraryFile(); + + // Update local file suggestions and check the model. + GetFileSuggestKeyedService()->SetSuggestionsForType( + app_list::FileSuggestionType::kLocalFile, + /*suggestions=*/std::vector<app_list::FileSuggestData>{ + {app_list::FileSuggestionType::kLocalFile, file_path_2, + /*new_prediction_reason=*/absl::nullopt, + /*new_score=*/absl::nullopt}}); + task_environment()->RunUntilIdle(); + + if (suggestion_feature_enabled) { + expected = {{HoldingSpaceItem::Type::kLocalSuggestion, file_path_2}, + {HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; + } + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Pin the suggested Drive file and verify that the suggestion is removed + // from the model if suggestions are enabled. + auto pinned_item = HoldingSpaceItem::CreateFileBackedItem( + HoldingSpaceItem::Type::kPinnedFile, file_path_1, + GetFileSystemUrl(GetProfile(), file_path_1), + base::BindOnce(&CreateTestHoldingSpaceImage)); + const auto& pinned_item_id = pinned_item->id(); + model->AddItem(std::move(pinned_item)); + + if (suggestion_feature_enabled) + expected = {{HoldingSpaceItem::Type::kLocalSuggestion, file_path_2}}; + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Unpin the suggested Drive file and verify that the suggestion is re-added + // to the model if suggestions are enabled. + model->RemoveItem(pinned_item_id); + + if (suggestion_feature_enabled) { + expected = {{HoldingSpaceItem::Type::kLocalSuggestion, file_path_2}, + {HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; + } + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Add an uninitialized pinned item for the suggested local file to the model + // and verify that there is no change to the model's suggestions. + auto* uninitialized_pinned_item_ptr = AddUninitializedItem( + model, HoldingSpaceItem::Type::kPinnedFile, file_path_2); + + // The `expected` suggestions should not have changed. + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Remove the suggested local file's uninitialized pinned item and verify + // that there is no change to the model's suggestions. + model->RemoveItem(uninitialized_pinned_item_ptr->id()); + + // The `expected` suggestions should not have changed. + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Add an uninitialized pinned item for the suggested local file to the model + // and verify that there is no change to the model's suggestions. + auto* partially_initialized_pinned_item_ptr = AddUninitializedItem( + model, HoldingSpaceItem::Type::kPinnedFile, file_path_2); + + // The `expected` suggestions should not have changed. + EXPECT_EQ(expected, GetSuggestionsInModel(model)); + + // Initialize the pinned item for the suggested local file and verify that + // the suggestion is removed from the model if suggestions are enabled. + model->InitializeOrRemoveItem(partially_initialized_pinned_item_ptr->id(), + GetFileSystemUrl(GetProfile(), file_path_2)); + + if (suggestion_feature_enabled) + expected = {{HoldingSpaceItem::Type::kDriveSuggestion, file_path_1}}; + EXPECT_EQ(expected, GetSuggestionsInModel(model)); } } // namespace ash
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc b/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc index 57abb96..326d3804 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.cc
@@ -21,6 +21,28 @@ } } +// Returns whether `item` represents a pinned file that also exists as a +// suggested file in `suggestions_by_type`. +bool ItemIsPinnedSuggestion( + const HoldingSpaceItem* item, + const std::map<app_list::FileSuggestionType, + std::vector<app_list::FileSuggestData>>& + suggestions_by_type) { + if (item->type() != HoldingSpaceItem::Type::kPinnedFile) + return false; + + for (const auto& [_, raw_suggestions] : suggestions_by_type) { + if (base::Contains(raw_suggestions, item->file_path(), + [](const app_list::FileSuggestData& suggestion) { + return suggestion.file_path; + })) { + return true; + } + } + + return false; +} + } // namespace HoldingSpaceSuggestionsDelegate::HoldingSpaceSuggestionsDelegate( @@ -32,6 +54,32 @@ HoldingSpaceSuggestionsDelegate::~HoldingSpaceSuggestionsDelegate() = default; +void HoldingSpaceSuggestionsDelegate::OnHoldingSpaceItemsAdded( + const std::vector<const HoldingSpaceItem*>& items) { + if (base::ranges::any_of(items, [&](const HoldingSpaceItem* item) { + return item->IsInitialized() && + ItemIsPinnedSuggestion(item, suggestions_by_type_); + })) { + UpdateSuggestionsInModel(); + } +} + +void HoldingSpaceSuggestionsDelegate::OnHoldingSpaceItemsRemoved( + const std::vector<const HoldingSpaceItem*>& items) { + if (base::ranges::any_of(items, [&](const HoldingSpaceItem* item) { + return item->IsInitialized() && + ItemIsPinnedSuggestion(item, suggestions_by_type_); + })) { + UpdateSuggestionsInModel(); + } +} + +void HoldingSpaceSuggestionsDelegate::OnHoldingSpaceItemInitialized( + const HoldingSpaceItem* item) { + if (ItemIsPinnedSuggestion(item, suggestions_by_type_)) + UpdateSuggestionsInModel(); +} + void HoldingSpaceSuggestionsDelegate::OnPersistenceRestored() { file_suggest_service_observation_.Observe( app_list::FileSuggestKeyedServiceFactory::GetInstance()->GetService( @@ -44,10 +92,7 @@ void HoldingSpaceSuggestionsDelegate::OnFileSuggestionUpdated( app_list::FileSuggestionType type) { - // TODO(https://crbug.com/1369418): Fix local file suggestions behavior and - // remove this if. - if (type == app_list::FileSuggestionType::kDriveFile) - MaybeFetchSuggestions(type); + MaybeFetchSuggestions(type); } void HoldingSpaceSuggestionsDelegate::MaybeFetchSuggestions( @@ -89,8 +134,12 @@ suggestion_items; for (const auto& [type, raw_suggestions] : suggestions_by_type_) { HoldingSpaceItem::Type item_type = GetItemTypeFromSuggestionType(type); - for (const auto& suggestion : raw_suggestions) - suggestion_items.emplace_back(item_type, suggestion.file_path); + for (const auto& suggestion : raw_suggestions) { + if (!model()->ContainsItem(HoldingSpaceItem::Type::kPinnedFile, + suggestion.file_path)) { + suggestion_items.emplace_back(item_type, suggestion.file_path); + } + } } service()->SetSuggestions(suggestion_items);
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.h b/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.h index 5f36e94..648c1bb 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.h +++ b/chrome/browser/ui/ash/holding_space/holding_space_suggestions_delegate.h
@@ -31,6 +31,11 @@ private: // HoldingSpaceKeyedServiceDelegate: + void OnHoldingSpaceItemsAdded( + const std::vector<const HoldingSpaceItem*>& items) override; + void OnHoldingSpaceItemsRemoved( + const std::vector<const HoldingSpaceItem*>& items) override; + void OnHoldingSpaceItemInitialized(const HoldingSpaceItem* item) override; void OnPersistenceRestored() override; // app_list::FileSuggestKeyedService::Observer:
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl.cc b/chrome/browser/ui/ash/projector/projector_client_impl.cc index 07f2940d..9d4e3a43 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl.cc +++ b/chrome/browser/ui/ash/projector/projector_client_impl.cc
@@ -19,7 +19,7 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/speech/on_device_speech_recognizer.h" +#include "chrome/browser/speech/speech_recognition_recognizer_client_impl.h" #include "chrome/browser/ui/ash/projector/projector_utils.h" #include "chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.h" #include "chrome/browser/ui/browser_window.h" @@ -31,6 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "media/base/media_switches.h" +#include "media/mojo/mojom/speech_recognition_service.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/display/display.h" #include "ui/display/screen.h" @@ -77,15 +78,18 @@ // ProjectorController should only request for speech recognition after it // has been informed that recognition is available. // TODO(crbug.com/1165437): Dynamically determine language code. - DCHECK(OnDeviceSpeechRecognizer::IsOnDeviceSpeechRecognizerAvailable( - GetLocale())); + DCHECK(SpeechRecognitionRecognizerClientImpl:: + IsOnDeviceSpeechRecognizerAvailable(GetLocale())); DCHECK_EQ(speech_recognizer_.get(), nullptr); recognizer_status_ = SPEECH_RECOGNIZER_OFF; - speech_recognizer_ = std::make_unique<OnDeviceSpeechRecognizer>( + speech_recognizer_ = std::make_unique<SpeechRecognitionRecognizerClientImpl>( weak_ptr_factory_.GetWeakPtr(), ProfileManager::GetActiveUserProfile(), - GetLocale(), /*recognition_mode_ime=*/false, - /*enable_formatting=*/true); + media::mojom::SpeechRecognitionOptions::New( + media::mojom::SpeechRecognitionMode::kCaption, + /*enable_formatting=*/true, GetLocale(), + /*is_server_based=*/false, + media::mojom::RecognizerClientType::kProjector)); } void ProjectorClientImpl::StopSpeechRecognition() {
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl.h b/chrome/browser/ui/ash/projector/projector_client_impl.h index 50e7aa4c..47703e5 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl.h +++ b/chrome/browser/ui/ash/projector/projector_client_impl.h
@@ -23,7 +23,7 @@ class WebView; } // namespace views -class OnDeviceSpeechRecognizer; +class SpeechRecognitionRecognizerClientImpl; // The client implementation for the ProjectorController in ash/. This client is // responsible for handling requests that have browser dependencies. @@ -96,7 +96,7 @@ ash::ProjectorController* const controller_; SpeechRecognizerStatus recognizer_status_ = SpeechRecognizerStatus::SPEECH_RECOGNIZER_OFF; - std::unique_ptr<OnDeviceSpeechRecognizer> speech_recognizer_; + std::unique_ptr<SpeechRecognitionRecognizerClientImpl> speech_recognizer_; base::ScopedObservation<session_manager::SessionManager, session_manager::SessionManagerObserver>
diff --git a/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc b/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc index 1fb0512..7a6c88e4 100644 --- a/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc +++ b/chrome/browser/ui/ash/projector/projector_soda_installation_controller.cc
@@ -11,7 +11,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/speech/on_device_speech_recognizer.h" +#include "chrome/browser/speech/speech_recognition_recognizer_client_impl.h" #include "components/prefs/pref_service.h" #include "components/soda/constants.h" #include "components/soda/soda_installer.h" @@ -40,8 +40,8 @@ soda_installer_observation_.Observe(speech::SodaInstaller::GetInstance()); locale_change_observation_.Observe(ash::LocaleUpdateController::Get()); - if (!OnDeviceSpeechRecognizer::IsOnDeviceSpeechRecognizerAvailable( - GetLocale())) { + if (!SpeechRecognitionRecognizerClientImpl:: + IsOnDeviceSpeechRecognizerAvailable(GetLocale())) { projector_controller_->OnSpeechRecognitionAvailabilityChanged( ash::SpeechRecognitionAvailability::kSodaNotInstalled); return;
diff --git a/chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc b/chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc index 5014730..dac9724 100644 --- a/chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc +++ b/chrome/browser/ui/quick_answers/quick_answers_state_ash_unittest.cc
@@ -235,26 +235,7 @@ EXPECT_TRUE(QuickAnswersState::Get()->spoken_feedback_enabled()); } -TEST_F(QuickAnswersStateAshTest, LocaleEligible) { - QuickAnswersState::Get()->AddObserver(observer()); - - EXPECT_FALSE(QuickAnswersState::Get()->is_eligible()); - EXPECT_FALSE(observer()->is_eligible()); - - UErrorCode error_code = U_ZERO_ERROR; - icu::Locale::setDefault(icu::Locale(ULOC_US), error_code); - prefs()->SetString(language::prefs::kApplicationLocale, "en"); - - SimulateUserLogin(kTestUser); - EXPECT_TRUE(QuickAnswersState::Get()->is_eligible()); - EXPECT_TRUE(observer()->is_eligible()); -} - TEST_F(QuickAnswersStateAshTest, EligibleLocales) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature( - chromeos::features::kQuickAnswersForMoreLocales); - QuickAnswersState::Get()->AddObserver(observer()); EXPECT_FALSE(QuickAnswersState::Get()->is_eligible()); @@ -273,26 +254,7 @@ EXPECT_TRUE(observer()->is_eligible()); } -TEST_F(QuickAnswersStateAshTest, LocaleIneligible) { - QuickAnswersState::Get()->AddObserver(observer()); - - EXPECT_FALSE(QuickAnswersState::Get()->is_eligible()); - EXPECT_FALSE(observer()->is_eligible()); - - UErrorCode error_code = U_ZERO_ERROR; - icu::Locale::setDefault(icu::Locale(ULOC_CHINESE), error_code); - prefs()->SetString(language::prefs::kApplicationLocale, "zh"); - - SimulateUserLogin(kTestUser); - EXPECT_FALSE(QuickAnswersState::Get()->is_eligible()); - EXPECT_FALSE(observer()->is_eligible()); -} - TEST_F(QuickAnswersStateAshTest, IneligibleLocales) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature( - chromeos::features::kQuickAnswersForMoreLocales); - QuickAnswersState::Get()->AddObserver(observer()); EXPECT_FALSE(QuickAnswersState::Get()->is_eligible());
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc index 26a0eb3..a586594 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc
@@ -341,7 +341,7 @@ ISOLATED_WORLD_ID_CHROME_INTERNAL); ConnectionHelpTabHelper::CreateForWebContents(web_contents); CoreTabHelper::CreateForWebContents(web_contents); - DIPSBounceDetector::CreateForWebContents(web_contents); + DIPSWebContentsObserver::CreateForWebContents(web_contents); if (DIPSService* dips_service = DIPSService::Get(profile)) { DIPSTabHelper::CreateForWebContents(web_contents, dips_service); }
diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view_unittest.cc b/chrome/browser/ui/views/frame/tab_strip_region_view_unittest.cc index 6c977f5..f780f67 100644 --- a/chrome/browser/ui/views/frame/tab_strip_region_view_unittest.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view_unittest.cc
@@ -104,7 +104,8 @@ tab_strip_region_view_->SetBounds(0, 0, kTabStripRegionViewWidth, 20); for (int i = 0; i < 100; ++i) { - controller_->AddTab(i, (i == 0)); + controller_->AddTab(i, + (i == 0) ? TabActive::kActive : TabActive::kInactive); CompleteAnimationAndLayout(); EXPECT_LE(tab_strip_region_view_->reserved_grab_handle_space_for_testing() ->bounds() @@ -118,7 +119,8 @@ tab_strip_region_view_->SetBounds(0, 0, kTabStripRegionViewWidth, 20); for (int i = 0; i < 100; ++i) { - controller_->AddTab(i, (i == 0)); + controller_->AddTab(i, + (i == 0) ? TabActive::kActive : TabActive::kInactive); CompleteAnimationAndLayout(); EXPECT_LE(tab_strip_region_view_->new_tab_button()->bounds().right(), kTabStripRegionViewWidth); @@ -129,7 +131,7 @@ const int kTabStripRegionViewWidth = 500; tab_strip_region_view_->SetBounds(0, 0, kTabStripRegionViewWidth, 20); - controller_->AddTab(0, true); + controller_->AddTab(0, TabActive::kActive); CompleteAnimationAndLayout(); @@ -149,7 +151,7 @@ for (int i = 0; i < 10; ++i) { tab_strip_region_view_->new_tab_button()->AnimateToStateForTesting( views::InkDropState::ACTION_TRIGGERED); - controller_->AddTab(i, true /* is_active */); + controller_->AddTab(i, TabActive::kActive); CompleteAnimationAndLayout(); tab_strip_region_view_->new_tab_button()->AnimateToStateForTesting( views::InkDropState::HIDDEN); @@ -165,7 +167,7 @@ // is maximized (Fitt's Law). TEST_P(TabStripRegionViewTest, ChildrenAreFlushWithTopOfTabStripRegionView) { tab_strip_region_view_->SetBounds(0, 0, 1000, 100); - controller_->AddTab(0, true); + controller_->AddTab(0, TabActive::kActive); CompleteAnimationAndLayout(); @@ -206,12 +208,12 @@ TEST_F(TabStripRegionViewTestWithScrollingDisabled, TabStripCannotBeLargerThanContainer) { const int minimum_active_width = TabStyleViews::GetMinimumInactiveWidth(); - controller_->AddTab(0, true); + controller_->AddTab(0, TabActive::kActive); CompleteAnimationAndLayout(); // Add tabs to the tabstrip until it is full. while (GetInactiveTabWidth() > minimum_active_width) { - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); EXPECT_LT(tab_strip_->width(), tab_strip_region_view_->width()); } @@ -219,7 +221,7 @@ // Add a few more tabs after the tabstrip is full to ensure tabs added // afterwards are not visible. for (int i = 0; i < 10; i++) { - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); } EXPECT_LT(tab_strip_->width(), tab_strip_region_view_->width()); @@ -246,12 +248,12 @@ TEST_F(TabStripRegionViewTestWithScrollingEnabled, TabStripCanBeLargerThanContainer) { const int minimum_active_width = TabStyleViews::GetMinimumInactiveWidth(); - controller_->AddTab(0, true); + controller_->AddTab(0, TabActive::kActive); CompleteAnimationAndLayout(); // Add tabs to the tabstrip until it is full and should start overflowing. while (GetInactiveTabWidth() > minimum_active_width) { - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); EXPECT_LT(tab_strip_->width(), tab_strip_region_view_->width()); } @@ -262,7 +264,7 @@ // region, not just the portion of that that's allocated to the tabstrip // itself (e.g. some of that space is for the NTB). for (int i = 0; i < 10; i++) { - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); } EXPECT_GT(tab_strip_->width(), tab_strip_region_view_->width()); @@ -273,12 +275,12 @@ TEST_F(TabStripRegionViewTestWithScrollingEnabled, TabStripScrollButtonsNotInWindowCaption) { const int minimum_active_width = TabStyleViews::GetMinimumInactiveWidth(); - controller_->AddTab(0, true); + controller_->AddTab(0, TabActive::kActive); CompleteAnimationAndLayout(); // Add tabs to the tabstrip until it is full and should start overflowing. while (GetInactiveTabWidth() > minimum_active_width) { - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); } @@ -288,7 +290,7 @@ // region, not just the portion of that that's allocated to the tabstrip // itself (e.g. some of that space is for the NTB). for (int i = 0; i < 10; i++) { - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); }
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc index 44b722a..ca24ad79 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.cc
@@ -15,7 +15,9 @@ #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_constants.h" #include "chrome/grit/component_extension_resources.h" +#include "chrome/grit/generated_resources.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/image_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_palette.h" @@ -333,16 +335,21 @@ // TODO (crbug.com/1266555): Change to translatable messages std::u16string ReadAnythingLetterSpacingModel::GetLetterSpacingName( read_anything::mojom::LetterSpacing letter_spacing) const { + int label; switch (letter_spacing) { case read_anything::mojom::LetterSpacing::kTight: - return u"Tight"; + label = IDS_READ_ANYTHING_SPACING_COMBOBOX_TIGHT; + break; case read_anything::mojom::LetterSpacing::kDefault: - return u"Default"; + label = IDS_READ_ANYTHING_SPACING_COMBOBOX_DEFAULT; + break; case read_anything::mojom::LetterSpacing::kLoose: - return u"Loose"; + label = IDS_READ_ANYTHING_SPACING_COMBOBOX_LOOSE; + break; case read_anything::mojom::LetterSpacing::kVeryLoose: - return u"Very Loose"; + label = IDS_READ_ANYTHING_SPACING_COMBOBOX_VERY_LOOSE; } + return l10n_util::GetStringUTF16(label); } std::u16string ReadAnythingLetterSpacingModel::GetDropDownTextAt(
diff --git a/chrome/browser/ui/views/tabs/compound_tab_container.cc b/chrome/browser/ui/views/tabs/compound_tab_container.cc index eba9fb7..92865133 100644 --- a/chrome/browser/ui/views/tabs/compound_tab_container.cc +++ b/chrome/browser/ui/views/tabs/compound_tab_container.cc
@@ -70,6 +70,10 @@ return base_controller_->CanExtendDragHandle(); } + const views::View* GetTabClosingModeMouseWatcherHostView() const override { + return base_controller_->GetTabClosingModeMouseWatcherHostView(); + } + private: const raw_ref<TabContainerController> base_controller_; }; @@ -125,6 +129,10 @@ return base_controller_->CanExtendDragHandle(); } + const views::View* GetTabClosingModeMouseWatcherHostView() const override { + return base_controller_->GetTabClosingModeMouseWatcherHostView(); + } + private: absl::optional<int> ModelToContainerIndex(int model_index) const { if (model_index < base_controller_->NumPinnedTabsInModel() || @@ -341,7 +349,7 @@ } int CompoundTabContainer::GetModelIndexOf(const TabSlotView* slot_view) const { - int pinned_index = pinned_tab_container_->GetModelIndexOf(slot_view); + const int pinned_index = pinned_tab_container_->GetModelIndexOf(slot_view); if (pinned_index != TabStripModel::kNoTab) // TODO(crbug.com/1346023): Maybe // optional instead. return pinned_index; @@ -362,12 +370,25 @@ } int CompoundTabContainer::GetModelIndexOfFirstNonClosingTab(Tab* tab) const { - NOTREACHED(); - // TODO(crbug.com/1346023): Impl - // If the tab is pinned, ask pinned container - // If that returns kNoTab, ask unpinned container for the first nonclosing tab - // Otherwise, just forward to unpinned container - return TabStripModel::kNoTab; + if (tab->data().pinned) { + const int pinned_index = + pinned_tab_container_->GetModelIndexOfFirstNonClosingTab(tab); + + // If there are no non-closing pinned tabs after `tab`, return the first + // non-closing unpinned tab, if there is one (if the unpinned container is + // empty or only has closing tabs, GetTabCount will be 0). + if (pinned_index == TabStripModel::kNoTab && + unpinned_tab_container_->GetTabCount() > 0) { + return NumPinnedTabs(); + } + return pinned_index; + } else { + const int unpinned_index = + unpinned_tab_container_->GetModelIndexOfFirstNonClosingTab(tab); + if (unpinned_index != TabStripModel::kNoTab) + return unpinned_index + NumPinnedTabs(); + return TabStripModel::kNoTab; + } } void CompoundTabContainer::UpdateHoverCard( @@ -376,9 +397,10 @@ // TODO(crbug.com/1346023): probably hover card controller ownership is wrong } -void CompoundTabContainer::HandleLongTap(ui::GestureEvent* event) { - // TODO(crbug.com/1346023): Impl - NOTREACHED(); +void CompoundTabContainer::HandleLongTap(ui::GestureEvent* const event) { + TabContainer* const tab_container = GetTabContainerAt(event->location()); + ConvertEventToTarget(tab_container, event); + tab_container->HandleLongTap(event); } bool CompoundTabContainer::IsRectInContentArea(const gfx::Rect& rect) { @@ -438,12 +460,18 @@ void CompoundTabContainer::EnterTabClosingMode( absl::optional<int> override_width, CloseTabSource source) { - // TODO(crbug.com/1346023): Impl - NOTREACHED(); + if (override_width.has_value()) { + override_width = override_width.value() - + pinned_tab_container_->GetPreferredSize().width(); + } + + // The pinned container can't be in closing mode, as pinned tabs don't resize. + unpinned_tab_container_->EnterTabClosingMode(override_width, source); } + void CompoundTabContainer::ExitTabClosingMode() { - // TODO(crbug.com/1346023): Impl - NOTREACHED(); + // The pinned container can't be in closing mode, as pinned tabs don't resize. + unpinned_tab_container_->ExitTabClosingMode(); } void CompoundTabContainer::SetTabSlotVisibility() { @@ -451,7 +479,7 @@ } bool CompoundTabContainer::InTabClose() { - // Only unpinned TabContainer can be in tab closing mode. + // The pinned container can't be in closing mode, as pinned tabs don't resize. return unpinned_tab_container_->InTabClose(); }
diff --git a/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc b/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc index 10fb541..1204c00 100644 --- a/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc +++ b/chrome/browser/ui/views/tabs/compound_tab_container_unittest.cc
@@ -12,6 +12,7 @@ #include "chrome/browser/ui/views/tabs/fake_tab_slot_controller.h" #include "chrome/browser/ui/views/tabs/tab_drag_context.h" #include "chrome/test/views/chrome_views_test_base.h" +#include "tab_style_views.h" #include "ui/views/view_utils.h" #include "ui/views/widget/widget.h" @@ -78,6 +79,10 @@ !tab_strip_controller_->EverHasVisibleBackgroundTabShapes(); } + const views::View* GetTabClosingModeMouseWatcherHostView() const override { + return nullptr; + } + private: const raw_ref<TabStripController> tab_strip_controller_; }; @@ -140,7 +145,7 @@ TabActive active = TabActive::kInactive) { Tab* tab = tab_container_->AddTab( std::make_unique<Tab>(tab_slot_controller_.get()), model_index, pinned); - tab_strip_controller_->AddTab(model_index, active == TabActive::kActive); + tab_strip_controller_->AddTab(model_index, active, pinned); if (active == TabActive::kActive) tab_slot_controller_->set_active_tab(tab); @@ -288,3 +293,141 @@ RemoveTab(0); EXPECT_EQ(tab_container_->GetTabCount(), 0); } + +TEST_F(CompoundTabContainerTest, GetIndexOfFirstNonClosingTab) { + // Test that CompoundTabContainer can identify the tab events should be + // forwarded to in case one is closing. + + // Create a tabstrip with four tabs. + Tab* first_pinned = AddTab(0, TabPinned::kPinned); + AddTab(1, TabPinned::kPinned); + Tab* first_unpinned = AddTab(2, TabPinned::kUnpinned); + AddTab(3, TabPinned::kUnpinned); + + // RemoveTab below *starts* the tab removal process, but leaves the view + // around to be animated closed. + + // Remove `first_unpinned`, so the next non-closing tab is the other unpinned + // tab, i.e. both tabs are in `unpinned_tab_container_`. + RemoveTab(2); + EXPECT_EQ(tab_container_->GetModelIndexOfFirstNonClosingTab(first_unpinned), + 2); + + // Both tabs are in `pinned_tab_container_`. + RemoveTab(0); + EXPECT_EQ(tab_container_->GetModelIndexOfFirstNonClosingTab(first_pinned), 0); + + // One tab is in each container. + RemoveTab(0); + EXPECT_EQ(tab_container_->GetModelIndexOfFirstNonClosingTab(first_pinned), 0); + + // There is no next tab, and this one is unpinned. + RemoveTab(0); + EXPECT_EQ(tab_container_->GetModelIndexOfFirstNonClosingTab(first_unpinned), + -1); + + // There is no next tab, and this one is pinned. + EXPECT_EQ(tab_container_->GetModelIndexOfFirstNonClosingTab(first_pinned), + -1); +} + +TEST_F(CompoundTabContainerTest, ExitsClosingModeAtStandardWidth) { + AddTab(0, TabPinned::kUnpinned, absl::nullopt, TabActive::kActive); + + // Create just enough tabs so tabs are not full size. + const int standard_width = TabStyleViews::GetStandardWidth(); + while (tab_container_->GetActiveTabWidth() == standard_width) { + AddTab(0, TabPinned::kUnpinned); + tab_container_->CompleteAnimationAndLayout(); + } + + // The test closes two tabs, we need at least one left over after that. + ASSERT_GE(tab_container_->GetTabCount(), 3); + + // Enter tab closing mode manually; this would normally happen as the result + // of a mouse/touch-based tab closure action. + tab_container_->EnterTabClosingMode(absl::nullopt, + CloseTabSource::CLOSE_TAB_FROM_MOUSE); + + // Close the second-to-last tab; tab closing mode should remain active, + // constraining tab widths to below full size. + RemoveTab(tab_container_->GetTabCount() - 2); + tab_container_->CompleteAnimationAndLayout(); + ASSERT_LT(tab_container_->GetActiveTabWidth(), standard_width); + + // Close the last tab; tab closing mode should allow tabs to resize to full + // size. + RemoveTab(tab_container_->GetTabCount() - 1); + tab_container_->CompleteAnimationAndLayout(); + EXPECT_EQ(tab_container_->GetActiveTabWidth(), standard_width); +} + +TEST_F(CompoundTabContainerTest, ClosingPinnedTabsEngagesClosingMode) { + // This test verifies that tab closing mode engages correctly when closing a + // pinned tab. + + // Add two unpinned tabs to be governed by closing mode. + AddTab(0, TabPinned::kUnpinned, absl::nullopt, TabActive::kActive); + AddTab(1, TabPinned::kUnpinned, absl::nullopt, TabActive::kInactive); + + // Create just enough (pinned) tabs so the active tab is not full size. + const int standard_width = TabStyleViews::GetStandardWidth(); + while (tab_container_->GetActiveTabWidth() == standard_width) { + AddTab(0, TabPinned::kPinned, absl::nullopt, TabActive::kInactive); + tab_container_->CompleteAnimationAndLayout(); + } + + // The test closes two tabs, we need at least one left over after that. + ASSERT_GE(tab_container_->GetTabCount(), 3); + + // Enter tab closing mode manually; this would normally happen as the result + // of a mouse/touch-based tab closure action. + tab_container_->EnterTabClosingMode(absl::nullopt, + CloseTabSource::CLOSE_TAB_FROM_MOUSE); + + // Close the third-to-last tab, which is the last pinned tab; tab closing mode + // should constrain tab widths to below full size. + RemoveTab(tab_container_->GetTabCount() - 3); + tab_container_->CompleteAnimationAndLayout(); + ASSERT_LT(tab_container_->GetActiveTabWidth(), standard_width); + + // Close the last tab, which is the inactive unpinned tab; tab closing mode + // should allow tabs to resize to full size. + RemoveTab(tab_container_->GetTabCount() - 1); + tab_container_->CompleteAnimationAndLayout(); + EXPECT_EQ(tab_container_->GetActiveTabWidth(), standard_width); +} + +TEST_F(CompoundTabContainerTest, ExitsClosingModeWhenClosingLastUnpinnedTab) { + // Add two unpinned tabs to be governed by closing mode. + AddTab(0, TabPinned::kUnpinned, absl::nullopt, TabActive::kInactive); + AddTab(1, TabPinned::kUnpinned, absl::nullopt, TabActive::kActive); + + // Create just enough (pinned) tabs so the active tab is not full size. + const int standard_width = TabStyleViews::GetStandardWidth(); + while (tab_container_->GetActiveTabWidth() == standard_width) { + AddTab(0, TabPinned::kPinned); + tab_container_->CompleteAnimationAndLayout(); + } + + // The test closes two tabs, we need at least one left over after that. + ASSERT_GE(tab_container_->GetTabCount(), 3); + + // Enter tab closing mode manually; this would normally happen as the result + // of a mouse/touch-based tab closure action. + tab_container_->EnterTabClosingMode(absl::nullopt, + CloseTabSource::CLOSE_TAB_FROM_MOUSE); + + // Close the second-to-last tab, which is the inactive unpinned tab; tab + // closing mode should remain active, constraining tab widths to below full + // size. + RemoveTab(tab_container_->GetTabCount() - 2); + tab_container_->CompleteAnimationAndLayout(); + ASSERT_LT(tab_container_->GetActiveTabWidth(), standard_width); + + // Close the last tab, which is the active unpinned tab; tab closing mode + // should exit. + RemoveTab(tab_container_->GetTabCount() - 1); + tab_container_->CompleteAnimationAndLayout(); + EXPECT_FALSE(tab_container_->InTabClose()); +}
diff --git a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc index 7bc5061..88df1bf7 100644 --- a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.cc
@@ -20,29 +20,24 @@ FakeBaseTabStripController::~FakeBaseTabStripController() = default; -void FakeBaseTabStripController::AddTab(int index, bool is_active) { - num_tabs_++; - tab_groups_.insert(tab_groups_.begin() + index, absl::nullopt); - - if (tab_strip_) - tab_strip_->AddTabAt(index, TabRendererData()); - if (is_active) { - SelectTab(index, - ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(), gfx::PointF(), - base::TimeTicks::Now(), 0, 0)); - } -} - -void FakeBaseTabStripController::AddPinnedTab(int index, bool is_active) { +void FakeBaseTabStripController::AddTab(int index, + TabActive is_active, + TabPinned is_pinned) { num_tabs_++; tab_groups_.insert(tab_groups_.begin() + index, absl::nullopt); TabRendererData data; - data.pinned = true; + if (is_pinned == TabPinned::kPinned) { + num_pinned_tabs_++; + data.pinned = true; + } if (tab_strip_) tab_strip_->AddTabAt(index, std::move(data)); - if (is_active) - active_index_ = index; + if (is_active == TabActive::kActive) { + SetActiveIndex(index); + } else if (index <= active_index_) { + SetActiveIndex(active_index_ + 1); + } } void FakeBaseTabStripController::MoveTab(int from_index, int to_index) { @@ -67,19 +62,22 @@ void FakeBaseTabStripController::RemoveTab(int index) { num_tabs_--; + if (index < num_pinned_tabs_) + num_pinned_tabs_--; tab_groups_.erase(tab_groups_.begin() + index); // RemoveTabAt() expects the controller state to have been updated already. const bool was_active = index == active_index_; if (was_active) { active_index_ = std::min(active_index_, num_tabs_ - 1); - selection_model_.SetSelectedIndex(active_index_); } else if (active_index_ > index) { --active_index_; } + selection_model_.SetSelectedIndex(active_index_); + if (tab_strip_) { tab_strip_->RemoveTabAt(nullptr, index, was_active); - if (was_active && IsValidIndex(active_index_)) + if (IsValidIndex(active_index_)) tab_strip_->SetSelection(selection_model_); } } @@ -202,7 +200,7 @@ } bool FakeBaseTabStripController::IsTabPinned(int index) const { - return false; + return index < num_pinned_tabs_; } void FakeBaseTabStripController::SelectTab(int index, const ui::Event& event) { @@ -247,7 +245,7 @@ } void FakeBaseTabStripController::CreateNewTab() { - AddTab(num_tabs_, true); + AddTab(num_tabs_, TabActive::kActive); } void FakeBaseTabStripController::CreateNewTabWithLocation(
diff --git a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h index 5ea08ef..8bcc09a 100644 --- a/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/fake_base_tab_strip_controller.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/memory/raw_ptr.h" +#include "chrome/browser/ui/tabs/tab_types.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "chrome/browser/ui/views/tabs/tab_strip_types.h" #include "components/tab_groups/tab_group_id.h" @@ -24,8 +25,9 @@ delete; ~FakeBaseTabStripController() override; - void AddTab(int index, bool is_active); - void AddPinnedTab(int index, bool is_active); + void AddTab(int index, + TabActive is_active, + TabPinned is_pinned = TabPinned::kUnpinned); void RemoveTab(int index); void MoveTabIntoGroup(int index, @@ -101,6 +103,7 @@ raw_ptr<TabStrip> tab_strip_ = nullptr; int num_tabs_ = 0; + int num_pinned_tabs_ = 0; int active_index_ = -1; tab_groups::TabGroupVisualData fake_group_data_;
diff --git a/chrome/browser/ui/views/tabs/tab_container_controller.h b/chrome/browser/ui/views/tabs/tab_container_controller.h index 0e7e0af0..0033b436 100644 --- a/chrome/browser/ui/views/tabs/tab_container_controller.h +++ b/chrome/browser/ui/views/tabs/tab_container_controller.h
@@ -13,6 +13,10 @@ class TabGroupId; } // namespace tab_groups +namespace views { +class View; +} + // Model/Controller for the TabContainer. // NOTE: All indices used by this class are in model coordinates. class TabContainerController { @@ -57,6 +61,11 @@ // Whether the window drag handle area can be extended to include the top of // inactive tabs. virtual bool CanExtendDragHandle() const = 0; + + // Tab closing mode should remain active as long as the mouse is in or near + // this view. See `TabContainerImpl::in_tab_close_` for more details on tab + // closing mode. + virtual const views::View* GetTabClosingModeMouseWatcherHostView() const = 0; }; #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_CONTAINER_CONTROLLER_H_
diff --git a/chrome/browser/ui/views/tabs/tab_container_impl.cc b/chrome/browser/ui/views/tabs/tab_container_impl.cc index 380b14d..b016aad7 100644 --- a/chrome/browser/ui/views/tabs/tab_container_impl.cc +++ b/chrome/browser/ui/views/tabs/tab_container_impl.cc
@@ -609,6 +609,11 @@ if (override_width.has_value()) override_available_width_for_tabs_ = override_width; + // Default to freezing tabs in their current state if our caller doesn't have + // a more specific plan. + if (!override_available_width_for_tabs_.has_value()) + override_available_width_for_tabs_ = width(); + resize_layout_timer_.Stop(); if (source == CLOSE_TAB_FROM_TOUCH) StartResizeLayoutTabsFromTouchTimer(); @@ -1150,38 +1155,47 @@ // The tab at |model_index| has already been removed from the model, but is // still in |tabs_view_model_|. Index math with care! const int model_count = GetTabCount() - 1; - const int tab_overlap = TabStyle::GetTabOverlap(); - if (in_tab_close_ && model_count > 0 && model_index != model_count) { - // The user closed a tab other than the last tab. Set - // override_available_width_for_tabs_ so that as the user closes tabs with - // the mouse a tab continues to fall under the mouse. - int next_active_index = controller_->GetActiveIndex(); - DCHECK(IsValidModelIndex(next_active_index)); - if (model_index <= next_active_index) { - // At this point, model's internal state has already been updated. - // |contents| has been detached from model and the active index has been - // updated. But the tab for |contents| isn't removed yet. Thus, we need to - // fix up next_active_index based on it. - next_active_index++; - } - Tab* next_active_tab = GetTabAtModelIndex(next_active_index); - Tab* tab_being_removed = GetTabAtModelIndex(model_index); - int size_delta = tab_being_removed->width(); - // When removing an active, non-pinned tab, the next active tab will be - // given the active width (unless it is pinned). Thus the width being - // removed from the container is really the current width of whichever - // inactive tab will be made active. - if (was_active && !tab_being_removed->data().pinned && - !next_active_tab->data().pinned && - layout_helper_->active_tab_width() > - layout_helper_->inactive_tab_width()) { - size_delta = next_active_tab->width(); + // If we're closing the last tab, tab closing mode is no longer meaningful. + if (model_count == 0) + ExitTabClosingMode(); + + // No updates needed if we aren't in tab closing mode or are closing the + // trailingmost tab. + if (!in_tab_close_ || model_index == model_count) + return; + + // Update `override_available_width_for_tabs_` so that as the user closes tabs + // with the mouse a tab continues to fall under the mouse. + const Tab* const tab_being_removed = GetTabAtModelIndex(model_index); + int size_delta = tab_being_removed->width(); + + // When removing an active, non-pinned tab, the next active tab will be + // given the active width (unless it is pinned). Thus the width being + // removed from the container is really the current width of whichever + // inactive tab will be made active. + if (was_active && !tab_being_removed->data().pinned && + layout_helper_->active_tab_width() > + layout_helper_->inactive_tab_width()) { + int next_active_index = controller_->GetActiveIndex(); + // The next active tab may not be in this TabContainer. + if (IsValidModelIndex(next_active_index)) { + if (model_index <= next_active_index) { + // At this point, model's internal state has already been updated. + // |contents| has been detached from model and the active index has + // been updated. But the tab for |contents| isn't removed yet. Thus, + // we need to fix up next_active_index based on it. + next_active_index++; + } + const Tab* const next_active_tab = GetTabAtModelIndex(next_active_index); + if (!next_active_tab->data().pinned) + size_delta = next_active_tab->width(); } - override_available_width_for_tabs_ = - tabs_view_model_.ideal_bounds(model_count).right() - size_delta + - tab_overlap; } + + override_available_width_for_tabs_ = + tabs_view_model_.ideal_bounds(model_count).right() - size_delta + + TabStyle::GetTabOverlap(); } void TabContainerImpl::ResizeLayoutTabs() { @@ -1249,10 +1263,11 @@ constexpr int kTabStripAnimationHSlop = 60; mouse_watcher_ = std::make_unique<views::MouseWatcher>( std::make_unique<views::MouseWatcherViewHost>( - this, gfx::Insets::TLBR( - 0, base::i18n::IsRTL() ? kTabStripAnimationHSlop : 0, - kTabStripAnimationVSlop, - base::i18n::IsRTL() ? 0 : kTabStripAnimationHSlop)), + controller_->GetTabClosingModeMouseWatcherHostView(), + gfx::Insets::TLBR( + 0, base::i18n::IsRTL() ? kTabStripAnimationHSlop : 0, + kTabStripAnimationVSlop, + base::i18n::IsRTL() ? 0 : kTabStripAnimationHSlop)), this); } mouse_watcher_->Start(GetWidget()->GetNativeWindow());
diff --git a/chrome/browser/ui/views/tabs/tab_container_unittest.cc b/chrome/browser/ui/views/tabs/tab_container_unittest.cc index 864792e..f4f9ace8 100644 --- a/chrome/browser/ui/views/tabs/tab_container_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_container_unittest.cc
@@ -104,6 +104,10 @@ !tab_strip_controller_->EverHasVisibleBackgroundTabShapes(); } + const views::View* GetTabClosingModeMouseWatcherHostView() const override { + return nullptr; + } + private: const raw_ref<TabStripController> tab_strip_controller_; }; @@ -164,7 +168,7 @@ TabPinned pinned = TabPinned::kUnpinned) { Tab* tab = tab_container_->AddTab( std::make_unique<Tab>(tab_slot_controller_.get()), model_index, pinned); - tab_strip_controller_->AddTab(model_index, active == TabActive::kActive); + tab_strip_controller_->AddTab(model_index, active, pinned); if (active == TabActive::kActive) tab_slot_controller_->set_active_tab(tab); @@ -347,13 +351,13 @@ // Close the second-to-last tab; tab closing mode should remain active, // constraining tab widths to below full size. - tab_container_->RemoveTab(tab_container_->GetTabCount() - 2, false); + RemoveTab(tab_container_->GetTabCount() - 2); tab_container_->CompleteAnimationAndLayout(); ASSERT_LT(tab_container_->GetActiveTabWidth(), standard_width); // Close the last tab; tab closing mode should allow tabs to resize to full // size. - tab_container_->RemoveTab(tab_container_->GetTabCount() - 1, false); + RemoveTab(tab_container_->GetTabCount() - 1); tab_container_->CompleteAnimationAndLayout(); EXPECT_EQ(tab_container_->GetActiveTabWidth(), standard_width); } @@ -386,7 +390,7 @@ // Remove the second from last tab tab_container_->EnterTabClosingMode(absl::nullopt, CloseTabSource::CLOSE_TAB_FROM_MOUSE); - tab_container_->RemoveTab(tab_container_->GetTabCount() - 2, false); + RemoveTab(tab_container_->GetTabCount() - 2); tab_container_->CompleteAnimationAndLayout(); // Get the group tab's close button center point @@ -398,7 +402,7 @@ tab_container_->EnterTabClosingMode(absl::nullopt, CloseTabSource::CLOSE_TAB_FROM_MOUSE); tab_container_->OnGroupContentsChanged(group1); - tab_container_->RemoveTab(1, true); + RemoveTab(1); tab_container_->CompleteAnimationAndLayout(); // Check if the next tab moves to its place
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 00d87a0..382fbf3 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -1388,6 +1388,10 @@ !controller_->EverHasVisibleBackgroundTabShapes(); } +const views::View* TabStrip::GetTabClosingModeMouseWatcherHostView() const { + return this; +} + bool TabStrip::IsGroupCollapsed(const tab_groups::TabGroupId& group) const { return controller_->IsGroupCollapsed(group); }
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 5fd35042..ba2933e 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -242,6 +242,7 @@ gfx::Range ListTabsInGroup( const tab_groups::TabGroupId& group) const override; bool CanExtendDragHandle() const override; + const views::View* GetTabClosingModeMouseWatcherHostView() const override; // TabContainerController AND TabSlotController: bool IsGroupCollapsed(const tab_groups::TabGroupId& group) const override;
diff --git a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc index c1129e4..41b9da8 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
@@ -240,8 +240,8 @@ TEST_P(TabStripTest, AccessibilityEvents) { views::test::AXEventCounter ax_counter(views::AXEventManager::Get()); - controller_->AddTab(0, false); - controller_->AddTab(1, true); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); EXPECT_EQ(0, ax_counter.GetCount(ax::mojom::Event::kSelectionAdd)); EXPECT_EQ(1, ax_counter.GetCount(ax::mojom::Event::kSelection)); EXPECT_EQ(0, ax_counter.GetCount(ax::mojom::Event::kSelectionRemove)); @@ -268,7 +268,7 @@ TEST_P(TabStripTest, AddTabAt) { TestTabStripObserver observer(tab_strip_); - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); ASSERT_EQ(1, tab_strip_->GetTabCount()); EXPECT_EQ(0, observer.last_tab_added()); Tab* tab = tab_strip_->tab_at(0); @@ -277,9 +277,9 @@ TEST_P(TabStripTest, MoveTab) { TestTabStripObserver observer(tab_strip_); - controller_->AddTab(0, false); - controller_->AddTab(1, false); - controller_->AddTab(2, false); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kInactive); + controller_->AddTab(2, TabActive::kInactive); ASSERT_EQ(3, tab_strip_->GetTabCount()); EXPECT_EQ(2, observer.last_tab_added()); Tab* tab = tab_strip_->tab_at(0); @@ -292,8 +292,8 @@ // Verifies child views are deleted after an animation completes. TEST_P(TabStripTest, RemoveTab) { TestTabStripObserver observer(tab_strip_); - controller_->AddTab(0, false); - controller_->AddTab(1, false); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kInactive); const size_t num_children = GetChildViews().size(); EXPECT_EQ(2, tab_strip_->GetTabCount()); controller_->RemoveTab(0); @@ -322,9 +322,9 @@ const bool touch_ui = ui::TouchUiController::Get()->touch_ui(); SetMaxTabStripWidth(touch_ui ? 442 : 346); - controller_->AddTab(0, false); - controller_->AddTab(1, true); - controller_->AddTab(2, false); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); + controller_->AddTab(2, TabActive::kInactive); ASSERT_EQ(3, tab_strip_->GetTabCount()); Tab* tab0 = tab_strip_->tab_at(0); @@ -343,7 +343,7 @@ // An inactive tab added to the tabstrip, now each tab size is not // big enough to accomodate 3 icons, so it should not show its // tab close button. - controller_->AddTab(3, false); + controller_->AddTab(3, TabActive::kInactive); Tab* tab3 = tab_strip_->tab_at(3); EXPECT_FALSE(tab3->showing_close_button_); @@ -358,7 +358,7 @@ // An active tab added to the tabstrip should show its tab close // button. - controller_->AddTab(4, true); + controller_->AddTab(4, TabActive::kActive); Tab* tab4 = tab_strip_->tab_at(4); ASSERT_TRUE(tab4->IsActive()); EXPECT_TRUE(tab4->showing_close_button_); @@ -394,9 +394,9 @@ // The cached widths are private, but if they give incorrect results it can // cause subtle errors in other tests. Therefore it's prudent to test them. TEST_P(TabStripTest, CachedWidthsReportCorrectSize) { - controller_->AddTab(0, false); - controller_->AddTab(1, true); - controller_->AddTab(2, false); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); + controller_->AddTab(2, TabActive::kInactive); const int standard_width = TabStyle::GetStandardWidth(); @@ -523,8 +523,8 @@ // The "blocked" attention indicator should only show for background tabs. TEST_P(TabStripTest, TabNeedsAttentionBlocked) { - controller_->AddTab(0, false); - controller_->AddTab(1, true); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); Tab* tab1 = tab_strip_->tab_at(1); @@ -542,8 +542,8 @@ // The generic "wants attention" version should always show. TEST_P(TabStripTest, TabNeedsAttentionGeneric) { - controller_->AddTab(0, false); - controller_->AddTab(1, true); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); Tab* tab1 = tab_strip_->tab_at(1); @@ -560,8 +560,8 @@ TEST_P(TabStripTest, EventsOnClosingTab) { SetMaxTabStripWidth(200); - controller_->AddTab(0, false); - controller_->AddTab(1, true); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); CompleteAnimationAndLayout(); Tab* first_tab = tab_strip_->tab_at(0); @@ -580,7 +580,7 @@ TEST_P(TabStripTest, ChangingLayoutTypeResizesTabs) { SetMaxTabStripWidth(1000); - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); Tab* tab = tab_strip_->tab_at(0); const int initial_height = tab->height(); @@ -603,9 +603,9 @@ // mapping the next tab's model index to the closing tab's slot. See // https://crbug.com/1138748 for a related crash. TEST_P(TabStripTest, CloseTabInGroupWhilePreviousTabAnimatingClosed) { - controller_->AddTab(0, true); - controller_->AddTab(1, false); - controller_->AddTab(2, false); + controller_->AddTab(0, TabActive::kActive); + controller_->AddTab(1, TabActive::kInactive); + controller_->AddTab(2, TabActive::kInactive); auto group_id = tab_groups::TabGroupId::GenerateNew(); controller_->MoveTabIntoGroup(1, group_id); @@ -692,8 +692,8 @@ TEST_P(TabStripTest, PreferredWidthDuringDrag) { // Start with two full-width tabs. - controller_->AddTab(0, false); - controller_->AddTab(1, true); + controller_->AddTab(0, TabActive::kInactive); + controller_->AddTab(1, TabActive::kActive); SetMaxTabStripWidth(1000); CompleteAnimationAndLayout(); @@ -738,7 +738,7 @@ // overflow. int invisible_tab_index = 0; for (; invisible_tab_index < 100; ++invisible_tab_index) { - controller_->AddTab(invisible_tab_index, false); + controller_->AddTab(invisible_tab_index, TabActive::kInactive); CompleteAnimationAndLayout(); if (!tab_strip_->tab_at(invisible_tab_index)->GetVisible()) break; @@ -774,11 +774,11 @@ // When we're already in overflow, adding tabs at the beginning or end of // the strip should not change how many tabs are visible. - controller_->AddTab(tab_strip_->GetTabCount(), false); + controller_->AddTab(tab_strip_->GetTabCount(), TabActive::kInactive); CompleteAnimationAndLayout(); EXPECT_TRUE(tab_strip_->tab_at(invisible_tab_index - 1)->GetVisible()); EXPECT_FALSE(tab_strip_->tab_at(invisible_tab_index)->GetVisible()); - controller_->AddTab(0, false); + controller_->AddTab(0, TabActive::kInactive); CompleteAnimationAndLayout(); EXPECT_TRUE(tab_strip_->tab_at(invisible_tab_index - 1)->GetVisible()); EXPECT_FALSE(tab_strip_->tab_at(invisible_tab_index)->GetVisible()); @@ -799,7 +799,7 @@ // overflow. int invisible_tab_index = 0; for (; invisible_tab_index < 100; ++invisible_tab_index) { - controller_->AddTab(invisible_tab_index, false); + controller_->AddTab(invisible_tab_index, TabActive::kInactive); CompleteAnimationAndLayout(); if (!tab_strip_->tab_at(invisible_tab_index)->GetVisible()) break;
diff --git a/chrome/browser/ui/views/tabs/tab_unittest.cc b/chrome/browser/ui/views/tabs/tab_unittest.cc index 90e28c2b5..d266038 100644 --- a/chrome/browser/ui/views/tabs/tab_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_unittest.cc
@@ -652,8 +652,8 @@ // This test verifies that the tab has its icon state updated when the alert // animation fade-out finishes. TEST_F(AlertIndicatorButtonTest, ShowsAndHidesAlertIndicator) { - controller_->AddPinnedTab(0, false); - controller_->AddTab(1, true); + controller_->AddTab(0, TabActive::kInactive, TabPinned::kPinned); + controller_->AddTab(1, TabActive::kActive); Tab* media_tab = tab_strip_->tab_at(0); // Pinned inactive tab only has an icon.
diff --git a/chrome/browser/ui/webui/ash/add_supervision/DIR_METADATA b/chrome/browser/ui/webui/ash/add_supervision/DIR_METADATA index c0ebf85..eff0b992 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/DIR_METADATA +++ b/chrome/browser/ui/webui/ash/add_supervision/DIR_METADATA
@@ -1,3 +1 @@ -monorail { - component: "FamilyExperiences" -} \ No newline at end of file +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence/COMMON_METADATA b/chrome/browser/ui/webui/chromeos/edu_coexistence/COMMON_METADATA deleted file mode 100644 index c0ebf85..0000000 --- a/chrome/browser/ui/webui/chromeos/edu_coexistence/COMMON_METADATA +++ /dev/null
@@ -1,3 +0,0 @@ -monorail { - component: "FamilyExperiences" -} \ No newline at end of file
diff --git a/chrome/browser/ui/webui/chromeos/edu_coexistence/DIR_METADATA b/chrome/browser/ui/webui/chromeos/edu_coexistence/DIR_METADATA index b636a0e..eff0b992 100644 --- a/chrome/browser/ui/webui/chromeos/edu_coexistence/DIR_METADATA +++ b/chrome/browser/ui/webui/chromeos/edu_coexistence/DIR_METADATA
@@ -1 +1 @@ -mixins: "//chrome/browser/ui/webui/chromeos/edu_coexistence/COMMON_METADATA" +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/ui/webui/chromeos/parent_access/DIR_METADATA b/chrome/browser/ui/webui/chromeos/parent_access/DIR_METADATA index 4f57b75..eff0b992 100644 --- a/chrome/browser/ui/webui/chromeos/parent_access/DIR_METADATA +++ b/chrome/browser/ui/webui/chromeos/parent_access/DIR_METADATA
@@ -1,3 +1 @@ -buganizer { - component_id: 1090157 -} +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc b/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc index c00a9d6e..52612c6b 100644 --- a/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/privacy_sandbox_handler_unittest.cc
@@ -71,26 +71,24 @@ auto* blocked_sites = data.arg3()->FindListKey("blockedSites"); ASSERT_TRUE(blocked_sites); - ASSERT_EQ(expected_blocked_sites.size(), - blocked_sites->GetListDeprecated().size()); + ASSERT_EQ(expected_blocked_sites.size(), blocked_sites->GetList().size()); for (size_t i = 0; i < expected_blocked_sites.size(); i++) { EXPECT_EQ(expected_blocked_sites[i], - blocked_sites->GetListDeprecated()[i].GetString()); + blocked_sites->GetList()[i].GetString()); } auto* joining_sites = data.arg3()->FindListKey("joiningSites"); ASSERT_TRUE(joining_sites); - ASSERT_EQ(expected_joining_sites.size(), - joining_sites->GetListDeprecated().size()); + ASSERT_EQ(expected_joining_sites.size(), joining_sites->GetList().size()); for (size_t i = 0; i < expected_joining_sites.size(); i++) { EXPECT_EQ(expected_joining_sites[i], - joining_sites->GetListDeprecated()[i].GetString()); + joining_sites->GetList()[i].GetString()); } } void ValidateTopicsInfo( std::vector<privacy_sandbox::CanonicalTopic> expected_topics, - base::Value::ConstListView actual_topics) { + const base::Value::List& actual_topics) { ASSERT_EQ(expected_topics.size(), actual_topics.size()); for (size_t i = 0; i < expected_topics.size(); i++) { const auto& actual_topic = actual_topics[i]; @@ -262,11 +260,10 @@ ASSERT_TRUE(data.arg2()->GetBool()); ASSERT_TRUE(data.arg3()->is_dict()); - ValidateTopicsInfo( - kTopTopics, data.arg3()->FindListKey("topTopics")->GetListDeprecated()); - ValidateTopicsInfo( - kBlockedTopics, - data.arg3()->FindListKey("blockedTopics")->GetListDeprecated()); + ValidateTopicsInfo(kTopTopics, + data.arg3()->FindListKey("topTopics")->GetList()); + ValidateTopicsInfo(kBlockedTopics, + data.arg3()->FindListKey("blockedTopics")->GetList()); } } // namespace settings
diff --git a/chrome/browser/ui/webui/settings/settings_cookies_view_handler_unittest.cc b/chrome/browser/ui/webui/settings/settings_cookies_view_handler_unittest.cc index c48ebec0..03da5be 100644 --- a/chrome/browser/ui/webui/settings/settings_cookies_view_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/settings_cookies_view_handler_unittest.cc
@@ -167,8 +167,8 @@ EXPECT_EQ(kGetDisplaylistCallbackID, get_display_list_response.arg1()->GetString()); ASSERT_TRUE(get_display_list_response.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - get_display_list_response.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = + get_display_list_response.arg3()->GetList(); ASSERT_EQ(2U, local_data_list.size()); EXPECT_EQ(kTestHost1, local_data_list[0].FindKey("site")->GetString()); EXPECT_EQ(kTestHost2, local_data_list[1].FindKey("site")->GetString()); @@ -284,7 +284,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView cookies_list = data.arg3()->GetListDeprecated(); + const base::Value::List& cookies_list = data.arg3()->GetList(); ASSERT_EQ(2UL, cookies_list.size()); EXPECT_EQ("cookie", cookies_list[0].FindKey("type")->GetString()); EXPECT_EQ("local_storage", cookies_list[1].FindKey("type")->GetString()); @@ -307,8 +307,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - data.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = data.arg3()->GetList(); ASSERT_EQ(1U, local_data_list.size()); EXPECT_EQ(kTestHost1, local_data_list[0].FindKey("site")->GetString()); } @@ -326,8 +325,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - data.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = data.arg3()->GetList(); ASSERT_EQ(2U, local_data_list.size()); EXPECT_EQ(kTestHost1, local_data_list[0].FindKey("site")->GetString()); EXPECT_EQ(kTestHost2, local_data_list[1].FindKey("site")->GetString()); @@ -351,8 +349,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - data.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = data.arg3()->GetList(); ASSERT_EQ(1U, local_data_list.size()); EXPECT_EQ(kTestHost2, local_data_list[0].FindKey("site")->GetString()); } @@ -376,8 +373,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - data.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = data.arg3()->GetList(); ASSERT_EQ(1U, local_data_list.size()); EXPECT_EQ(kTestHost1, local_data_list[0].FindKey("site")->GetString()); } @@ -397,7 +393,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView cookies_list = data.arg3()->GetListDeprecated(); + const base::Value::List& cookies_list = data.arg3()->GetList(); ASSERT_EQ(2UL, cookies_list.size()); EXPECT_EQ("cookie", cookies_list[0].FindKey("type")->GetString()); EXPECT_EQ("local_storage", cookies_list[1].FindKey("type")->GetString()); @@ -430,8 +426,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - data.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = data.arg3()->GetList(); ASSERT_EQ(0U, local_data_list.size()); } } @@ -451,7 +446,7 @@ task_environment()->RunUntilIdle(); const content::TestWebUI::CallData& data = *web_ui()->call_data().back(); - base::Value::ConstListView cookies_list = data.arg3()->GetListDeprecated(); + const base::Value::List& cookies_list = data.arg3()->GetList(); ASSERT_EQ(2UL, cookies_list.size()); // Find the entry item associated with the kTestCookie1 cookie. for (const auto& cookie : cookies_list) { @@ -483,7 +478,7 @@ task_environment()->RunUntilIdle(); const content::TestWebUI::CallData& data = *web_ui()->call_data().back(); - base::Value::ConstListView cookies_list = data.arg3()->GetListDeprecated(); + const base::Value::List& cookies_list = data.arg3()->GetList(); ASSERT_EQ(1UL, cookies_list.size()); EXPECT_EQ("local_storage", cookies_list[0].FindKey("type")->GetString()); } @@ -517,8 +512,7 @@ EXPECT_EQ("cr.webUIResponse", data.function_name()); EXPECT_EQ(kCallbackId, data.arg1()->GetString()); ASSERT_TRUE(data.arg2()->GetBool()); - base::Value::ConstListView local_data_list = - data.arg3()->GetListDeprecated(); + const base::Value::List& local_data_list = data.arg3()->GetList(); ASSERT_EQ(1U, local_data_list.size()); EXPECT_EQ(kTestHost2, local_data_list[0].FindKey("site")->GetString()); }
diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc index e405816..2497fe3 100644 --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc
@@ -76,7 +76,7 @@ // Expect a non-empty list of dictionaries containing non-empty strings for // profile avatar icon urls and labels. - EXPECT_FALSE(icons->GetListDeprecated().empty()); + EXPECT_FALSE(icons->GetList().empty()); if (gaia_included) { VerifyGaiaAvatar(icons, gaia_selected); } else { @@ -87,8 +87,8 @@ gaia_selected || (selected_index == profiles::GetPlaceholderAvatarIndex()); - for (size_t i = 1; i < icons->GetListDeprecated().size(); ++i) { - const base::Value& icon = icons->GetListDeprecated()[i]; + for (size_t i = 1; i < icons->GetList().size(); ++i) { + const base::Value& icon = icons->GetList()[i]; EXPECT_TRUE(icon.is_dict()); const std::string* icon_url = icon.FindStringKey("url"); @@ -132,7 +132,7 @@ std::unique_ptr<TestManageProfileHandler> handler_; void VerifyGaiaAvatar(const base::Value* icons, bool gaia_selected) { - const base::Value& icon = icons->GetListDeprecated()[0]; + const base::Value& icon = icons->GetList()[0]; EXPECT_TRUE(icon.is_dict()); EXPECT_EQ(*icon.FindIntKey("index"), 0); @@ -147,7 +147,7 @@ void VerifyDefaultGenericAvatar(const base::Value* icons, size_t selected_index) { - const base::Value& icon = icons->GetListDeprecated()[0]; + const base::Value& icon = icons->GetList()[0]; EXPECT_TRUE(icon.is_dict()); EXPECT_TRUE(!icon.FindStringKey("label")->empty()); int icon_index_int = icon.FindIntKey("index").value_or(0);
diff --git a/chrome/browser/vr/elements/repositioner.cc b/chrome/browser/vr/elements/repositioner.cc index ec573a31..c36f5c4 100644 --- a/chrome/browser/vr/elements/repositioner.cc +++ b/chrome/browser/vr/elements/repositioner.cc
@@ -81,11 +81,11 @@ if (reset_yaw_) { gfx::Vector3dF current_right = {1, 0, 0}; transform_.TransformVector(¤t_right); - transform_.ConcatTransform( + transform_.PostConcat( gfx::Transform(gfx::Quaternion(current_right, {1, 0, 0}))); } else { transform_ = initial_transform_; - transform_.ConcatTransform(gfx::Transform( + transform_.PostConcat(gfx::Transform( gfx::Quaternion(initial_laser_direction_, laser_direction_))); } @@ -108,7 +108,7 @@ gfx::Vector3dF expected_right = gfx::CrossProduct(new_forward, up); gfx::Quaternion rotate_to_expected_right(new_right, expected_right); - transform_.ConcatTransform(gfx::Transform(rotate_to_expected_right)); + transform_.PostConcat(gfx::Transform(rotate_to_expected_right)); if (gfx::AngleBetweenVectorsInDegrees( initial_laser_direction_, laser_direction_) > kDragThresholdDegrees) { has_moved_beyond_threshold_ = true;
diff --git a/chrome/browser/vr/elements/reticle.cc b/chrome/browser/vr/elements/reticle.cc index 1a057b1..01b41a2 100644 --- a/chrome/browser/vr/elements/reticle.cc +++ b/chrome/browser/vr/elements/reticle.cc
@@ -171,7 +171,7 @@ gfx::Vector3dF expected_right = gfx::CrossProduct(forward, up); gfx::Quaternion rotate_to_expected_right(right, expected_right); - mat.ConcatTransform(gfx::Transform(rotate_to_expected_right)); + mat.PostConcat(gfx::Transform(rotate_to_expected_right)); mat.PostTranslate3d(model_->reticle.target_point.OffsetFromOrigin()); return mat;
diff --git a/chrome/browser/vr/elements/scaled_depth_adjuster.cc b/chrome/browser/vr/elements/scaled_depth_adjuster.cc index 544e229..ff1171d 100644 --- a/chrome/browser/vr/elements/scaled_depth_adjuster.cc +++ b/chrome/browser/vr/elements/scaled_depth_adjuster.cc
@@ -33,7 +33,7 @@ gfx::Transform inherited; for (UiElement* anc = parent(); anc; anc = anc->parent()) { if (anc->type() == kTypeScaledDepthAdjuster) { - inherited.ConcatTransform(anc->LocalTransform()); + inherited.PostConcat(anc->LocalTransform()); } } bool success = inherited.GetInverse(&transform_);
diff --git a/chrome/browser/vr/elements/ui_element.cc b/chrome/browser/vr/elements/ui_element.cc index 5104926..3cc999a 100644 --- a/chrome/browser/vr/elements/ui_element.cc +++ b/chrome/browser/vr/elements/ui_element.cc
@@ -462,7 +462,7 @@ gfx::Transform UiElement::ComputeTargetWorldSpaceTransform() const { gfx::Transform m; for (const UiElement* current = this; current; current = current->parent()) { - m.ConcatTransform(current->GetTargetLocalTransform()); + m.PostConcat(current->GetTargetLocalTransform()); } return m; } @@ -1040,10 +1040,10 @@ gfx::Transform inheritable = LocalTransform(); if (parent_) { - inheritable.ConcatTransform(parent_->inheritable_transform()); + inheritable.PostConcat(parent_->inheritable_transform()); } - transform.ConcatTransform(inheritable); + transform.PostConcat(inheritable); changed = !transform.ApproximatelyEqual(world_space_transform_) || !inheritable.ApproximatelyEqual(inheritable_transform_); set_world_space_transform(transform);
diff --git a/chrome/browser/vr/input_delegate_for_testing.cc b/chrome/browser/vr/input_delegate_for_testing.cc index 49c6e57..213f08f 100644 --- a/chrome/browser/vr/input_delegate_for_testing.cc +++ b/chrome/browser/vr/input_delegate_for_testing.cc
@@ -25,7 +25,7 @@ void SetOriginAndTransform(vr::ControllerModel* model) { gfx::Transform mat; mat.Translate3d(kStartControllerPosition); - mat.PreconcatTransform( + mat.PreConcat( gfx::Transform(gfx::Quaternion(kForwardVector, model->laser_direction))); model->transform = mat; model->laser_origin = kLaserOriginOffset;
diff --git a/chrome/browser/vr/ui.cc b/chrome/browser/vr/ui.cc index e294ee5..7b741c9 100644 --- a/chrome/browser/vr/ui.cc +++ b/chrome/browser/vr/ui.cc
@@ -835,7 +835,7 @@ gfx::Point3F right_top{0.5, 0.5, 0}; gfx::Transform transform = element->world_space_transform(); - transform.ConcatTransform(view_matrix); + transform.PostConcat(view_matrix); // Transform to view space. transform.TransformPoint(&left_bottom);
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt index 6602e304..91a04f0 100644 --- a/chrome/build/mac-arm.pgo.txt +++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@ -chrome-mac-arm-main-1664539181-d07ccea5a56f20ca0d8b23dc25efc955dd8441c4.profdata +chrome-mac-arm-main-1664560771-91f99a664a154fbfe2c7292d3becde86c703ec7c.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 1d890182..6884c74b 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1664539181-18a7342452c772c049914f96b0eea3e98d89a5ee.profdata +chrome-mac-main-1664560771-b0bb206fad4530a3b3feb8e7b08756d1be71c22f.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index 54954b0..062cd1c2 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1664549964-703058a079f627dc4a66ccdfdcd4efbdebe56335.profdata +chrome-win32-main-1664560771-d3371ba59248dec10e6f6af08d2091bdada82ce2.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index 9ec349a7..0a7c6cd 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1664549964-1625700ce22588f8d9733d54d4d908d745a412fe.profdata +chrome-win64-main-1664560771-4cea98b725280ec1f9213e5b02a62f279cd2371c.profdata
diff --git a/chrome/common/extensions/api/wm_desks_private.idl b/chrome/common/extensions/api/wm_desks_private.idl index 7ac8295..b815af5a 100644 --- a/chrome/common/extensions/api/wm_desks_private.idl +++ b/chrome/common/extensions/api/wm_desks_private.idl
@@ -84,5 +84,12 @@ // Launches a saved desk from the library back to active desk. [supportsPromises] static void recallSavedDesk(DOMString savedDeskUuid, DeskIdCallback callback); + + // Retrieves the UUID of the current active desk. + [supportsPromises] static void getActiveDesk(DeskIdCallback callback); + + // Switches to the target desk. + [supportsPromises] static void switchDesk( + DOMString deskUuid, VoidCallback callback); }; };
diff --git a/chrome/common/profiler/main_thread_stack_sampling_profiler.cc b/chrome/common/profiler/main_thread_stack_sampling_profiler.cc index 459100a..21f29ca 100644 --- a/chrome/common/profiler/main_thread_stack_sampling_profiler.cc +++ b/chrome/common/profiler/main_thread_stack_sampling_profiler.cc
@@ -7,13 +7,10 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/threading/platform_thread.h" -#include "chrome/common/channel_info.h" #include "chrome/common/profiler/process_type.h" #include "chrome/common/profiler/thread_profiler.h" -#include "chrome/common/profiler/unwind_util.h" #include "components/metrics/call_stack_profile_builder.h" #include "components/metrics/call_stack_profile_metrics_provider.h" -#include "components/version_info/channel.h" #include "content/public/common/content_switches.h" namespace { @@ -38,11 +35,6 @@ MainThreadStackSamplingProfiler::MainThreadStackSamplingProfiler() { const metrics::CallStackProfileParams::Process process = GetProfileParamsProcess(*base::CommandLine::ForCurrentProcess()); - - if (process == metrics::CallStackProfileParams::Process::kBrowser) { - RequestUnwindPrerequisitesInstallation(chrome::GetChannel()); - } - sampling_profiler_ = CreateThreadProfiler(process); }
diff --git a/chrome/renderer/media/chrome_speech_recognition_client.cc b/chrome/renderer/media/chrome_speech_recognition_client.cc index dc9e617..24590795 100644 --- a/chrome/renderer/media/chrome_speech_recognition_client.cc +++ b/chrome/renderer/media/chrome_speech_recognition_client.cc
@@ -130,6 +130,9 @@ media::mojom::SpeechRecognitionOptions::New(); options->recognition_mode = media::mojom::SpeechRecognitionMode::kCaption; options->enable_formatting = true; + options->recognizer_client_type = + media::mojom::RecognizerClientType::kLiveCaption; + speech_recognition_context_->BindRecognizer( speech_recognition_recognizer_.BindNewPipeAndPassReceiver(), std::move(speech_recognition_client_remote), std::move(options),
diff --git a/chrome/services/speech/speech_recognition_recognizer_impl.cc b/chrome/services/speech/speech_recognition_recognizer_impl.cc index 208ea89..97b879ec 100644 --- a/chrome/services/speech/speech_recognition_recognizer_impl.cc +++ b/chrome/services/speech/speech_recognition_recognizer_impl.cc
@@ -37,12 +37,12 @@ // static const char SpeechRecognitionRecognizerImpl::kCaptionBubbleVisibleHistogramName[] = - "Accessibility.LiveCaption.Duration.CaptionBubbleVisible2"; + "Accessibility.LiveCaption.Duration.CaptionBubbleVisible3"; // static const char SpeechRecognitionRecognizerImpl::kCaptionBubbleHiddenHistogramName[] = - "Accessibility.LiveCaption.Duration.CaptionBubbleHidden2"; + "Accessibility.LiveCaption.Duration.CaptionBubbleHidden3"; namespace { @@ -223,13 +223,16 @@ size_t buffer_size = 0; // Update watch time durations. - base::TimeDelta duration = - media::AudioTimestampHelper::FramesToTime(frame_count, sample_rate); - if (is_client_requesting_speech_recognition_) { - caption_bubble_visible_duration_ += duration; - } else { - caption_bubble_hidden_duration_ += duration; - return; + if (options_->recognizer_client_type == + media::mojom::RecognizerClientType::kLiveCaption) { + base::TimeDelta duration = + media::AudioTimestampHelper::FramesToTime(frame_count, sample_rate); + if (is_client_requesting_speech_recognition_) { + caption_bubble_visible_duration_ += duration; + } else { + caption_bubble_hidden_duration_ += duration; + return; + } } // Verify the channel count. @@ -337,6 +340,13 @@ } void SpeechRecognitionRecognizerImpl::RecordDuration() { + if (options_->recognizer_client_type != + media::mojom::RecognizerClientType::kLiveCaption) { + return; + } + + // TODO(b:245620092) Create metrics for other features using speech + // recognition. if (caption_bubble_visible_duration_.is_positive()) { base::UmaHistogramLongTimes100(kCaptionBubbleVisibleHistogramName, caption_bubble_visible_duration_);
diff --git a/chrome/services/speech/speech_recognition_service_impl.cc b/chrome/services/speech/speech_recognition_service_impl.cc index 8c19b16..eedd2c9 100644 --- a/chrome/services/speech/speech_recognition_service_impl.cc +++ b/chrome/services/speech/speech_recognition_service_impl.cc
@@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors +// Copyright 2020 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,6 +16,13 @@ namespace speech { +namespace { + +constexpr char kInvalidSpeechRecogntionOptions[] = + "Invalid SpeechRecognitionOptions provided"; + +} // namespace + SpeechRecognitionServiceImpl::SpeechRecognitionServiceImpl( mojo::PendingReceiver<media::mojom::SpeechRecognitionService> receiver) : receiver_(this, std::move(receiver)) {} @@ -25,6 +32,9 @@ void SpeechRecognitionServiceImpl::BindAudioSourceSpeechRecognitionContext( mojo::PendingReceiver<media::mojom::AudioSourceSpeechRecognitionContext> context) { + // TODO(b/249867435): Make this function create mojo::ReportBadMessage because + // this method shouldn't be called on platforms other than ChromeOS. ChromeOS + // clients should use CrosSpeechRecognitionService. audio_source_speech_recognition_contexts_.Add(this, std::move(context)); } @@ -45,6 +55,15 @@ mojo::PendingRemote<media::mojom::SpeechRecognitionRecognizerClient> client, media::mojom::SpeechRecognitionOptionsPtr options, BindRecognizerCallback callback) { + // This is currently only used by LiveCaption and server side + // speech recognition is not available to it. + if (options->is_server_based || + options->recognizer_client_type != + media::mojom::RecognizerClientType::kLiveCaption) { + mojo::ReportBadMessage(kInvalidSpeechRecogntionOptions); + return; + } + // Destroy the speech recognition service if the SODA files haven't been // downloaded yet. if (!base::PathExists(binary_path_) || !base::PathExists(config_path_)) { @@ -65,6 +84,15 @@ mojo::PendingRemote<media::mojom::SpeechRecognitionRecognizerClient> client, media::mojom::SpeechRecognitionOptionsPtr options, BindRecognizerCallback callback) { + // TODO(b/249867435): Remove SpeechRecognitionServiceImpl's implementation of + // AudioSourceSpeechRecognitionContext should be removed. AudioSourceFetcher + // is only ever used from ChromeOS and it should be accessed + // from CrosSpeechRecognitionService. + if (options->is_server_based) { + mojo::ReportBadMessage(kInvalidSpeechRecogntionOptions); + return; + } + // Destroy the speech recognition service if the SODA files haven't been // downloaded yet. if (!base::PathExists(binary_path_) || !base::PathExists(config_path_)) {
diff --git a/chrome/services/speech/speech_recognition_service_impl.h b/chrome/services/speech/speech_recognition_service_impl.h index 813179c..672bc55 100644 --- a/chrome/services/speech/speech_recognition_service_impl.h +++ b/chrome/services/speech/speech_recognition_service_impl.h
@@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors +// Copyright 2020 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file.
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index a4802f7..dc09fa2 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -3950,7 +3950,7 @@ "../browser/signin/chromeos_mirror_account_consistency_browsertest.cc", "../browser/speech/extension_api/tts_extension_api_ash_browsertest.cc", "../browser/speech/network_speech_recognizer_browsertest.cc", - "../browser/speech/on_device_speech_recognizer_browsertest.cc", + "../browser/speech/speech_recognition_recognizer_client_impl_browsertest.cc", "../browser/support_tool/ash/ui_hierarchy_data_collector_browsertest.cc", "../browser/ui/app_list/app_list_client_impl_browsertest.cc", "../browser/ui/app_list/app_list_sort_browsertest.cc",
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ToolbarUnitTestUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ToolbarUnitTestUtils.java index 2bd0ad4..51185549 100644 --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ToolbarUnitTestUtils.java +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ToolbarUnitTestUtils.java
@@ -6,7 +6,6 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.toolbar.LocationBarModel; -import org.chromium.content_public.browser.WebContents; /** * Utilities for Toolbar unit tests. @@ -15,7 +14,7 @@ public static final LocationBarModel.OfflineStatus OFFLINE_STATUS = new LocationBarModel.OfflineStatus() { @Override - public boolean isShowingTrustedOfflinePage(WebContents webContents) { + public boolean isShowingTrustedOfflinePage(Tab tab) { return true; }
diff --git a/chrome/test/data/extensions/api_test/wm_desks_private/background.js b/chrome/test/data/extensions/api_test/wm_desks_private/background.js index 76b2b88..1c51cb5 100644 --- a/chrome/test/data/extensions/api_test/wm_desks_private/background.js +++ b/chrome/test/data/extensions/api_test/wm_desks_private/background.js
@@ -102,4 +102,30 @@ chrome.test.assertTrue(uuidRegex.test(newDeskUuid)); chrome.test.succeed(); }, + + // Tests switches to current desk. + async function testSwitchToCurrentDesk() { + const activeDesk = await chrome.wmDesksPrivate.getActiveDesk(); + await chrome.wmDesksPrivate.switchDesk( + activeDesk); + const activeDesk1 = await chrome.wmDesksPrivate.getActiveDesk(); + chrome.test.assertEq(activeDesk, activeDesk1); + chrome.test.succeed(); + }, + + // Tests switches to a different desk. + async function testSwitchToDifferentDesk() { + const activeDesk = await chrome.wmDesksPrivate.getActiveDesk(); + await chrome.windows.create(); + + // Launch a new desk. + await chrome.wmDesksPrivate.launchDesk({ deskName: "test" }); + await chrome.windows.create(); + + // Wait for launch Desk animation to settle. + chrome.wmDesksPrivate.switchDesk(activeDesk); + const activeDesk1 = await chrome.wmDesksPrivate.getActiveDesk(); + chrome.test.assertEq(activeDesk, activeDesk1); + chrome.test.succeed(); + }, ]);
diff --git a/chrome/test/data/webui/chromeos/arc_account_picker/test_util.d.ts b/chrome/test/data/webui/chromeos/arc_account_picker/test_util.d.ts new file mode 100644 index 0000000..8ca810a5 --- /dev/null +++ b/chrome/test/data/webui/chromeos/arc_account_picker/test_util.d.ts
@@ -0,0 +1,14 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import {Account} from 'chrome://chrome-signin/arc_account_picker/arc_account_picker_browser_proxy.js'; +import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js'; + +export function setTestArcAccountPickerBrowserProxy( + testBrowserProxy: TestArcAccountPickerBrowserProxy): void; +export function getFakeAccountsNotAvailableInArcList(): Account[]; + +export class TestArcAccountPickerBrowserProxy extends TestBrowserProxy { + setAccountsNotAvailableInArc(accountsNotAvailableInArc: Account[]): void; +}
diff --git a/chrome/test/data/webui/chromeos/edu_coexistence/DIR_METADATA b/chrome/test/data/webui/chromeos/edu_coexistence/DIR_METADATA index b636a0e..eff0b992 100644 --- a/chrome/test/data/webui/chromeos/edu_coexistence/DIR_METADATA +++ b/chrome/test/data/webui/chromeos/edu_coexistence/DIR_METADATA
@@ -1 +1 @@ -mixins: "//chrome/browser/ui/webui/chromeos/edu_coexistence/COMMON_METADATA" +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn b/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn index ad95cb58..f3d5ce9 100644 --- a/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn +++ b/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn
@@ -98,7 +98,9 @@ deps = [ "../..:chai_assert", "../..:test_util", + "//ash/webui/os_feedback_ui/resources:fake_data", "//ash/webui/os_feedback_ui/resources:feedback_flow", + "//ash/webui/os_feedback_ui/resources:feedback_types", "//ash/webui/os_feedback_ui/resources:help_content", "//ash/webui/os_feedback_ui/resources:search_page", ]
diff --git a/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js b/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js index 7010848..b9c1b65 100644 --- a/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js +++ b/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {fakeEmptySearchResponse, fakeSearchResponse} from 'chrome://os-feedback/fake_data.js'; +import {fakeEmptySearchResponse, fakeFeedbackContext, fakeInternalUserFeedbackContext, fakeSearchResponse} from 'chrome://os-feedback/fake_data.js'; import {FakeHelpContentProvider} from 'chrome://os-feedback/fake_help_content_provider.js'; import {FeedbackFlowState} from 'chrome://os-feedback/feedback_flow.js'; import {setHelpContentProviderForTesting} from 'chrome://os-feedback/mojo_interface_provider.js'; +import {domainQuestions, questionnaireBegin} from 'chrome://os-feedback/questionnaire.js'; import {OS_FEEDBACK_UNTRUSTED_ORIGIN, SearchPageElement} from 'chrome://os-feedback/search_page.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.js'; @@ -112,6 +113,9 @@ let textAreaElement = null; await initializePage(); + // The 'input' event triggers a listener that checks for internal user + // account, so we need to set up the context. + page.feedbackContext = fakeFeedbackContext; textAreaElement = getElement('#descriptionText'); // Verify the textarea is empty and hint is showing. assertEquals('', textAreaElement.value); @@ -153,6 +157,9 @@ let textAreaElement = null; await initializePage(); + // The 'input' event triggers a listener that checks for internal user + // account, so we need to set up the context. + page.feedbackContext = fakeFeedbackContext; textAreaElement = getElement('#descriptionText'); // Verify the textarea is empty now. assertEquals('', textAreaElement.value); @@ -233,6 +240,9 @@ */ test('DescriptionEmptyError', async () => { await initializePage(); + // The 'input' event triggers a listener that checks for internal user + // account, so we need to set up the context. + page.feedbackContext = fakeFeedbackContext; const errorMsg = getElement('#emptyErrorContainer'); // Verify that the error message is hidden in the beginning. @@ -285,4 +295,110 @@ assertTrue(!!actualCurrentState); assertEquals(FeedbackFlowState.SEARCH, actualCurrentState); }); + + test('typingBluetoothWithInternalAccountShowsQuestionnaire', async () => { + let textAreaElement = null; + await initializePage(); + // The questionnaire will be only shown if the account belongs to an + // internal user. + page.feedbackContext = fakeInternalUserFeedbackContext; + + textAreaElement = getElement('#descriptionText'); + textAreaElement.value = 'My cat got a blue tooth because of ChromeOS.'; + // Setting the value of the textarea in code does not trigger the + // input event. So we trigger it here. + textAreaElement.dispatchEvent(new Event('input')); + await flushTasks(); + + // Check that the questionnaire and all relevant domain questions are + // present. + assertTrue(textAreaElement.value.indexOf(questionnaireBegin) >= 0); + domainQuestions['bluetooth'].forEach((question) => { + assertTrue(textAreaElement.value.indexOf(question) >= 0); + }); + }); + + test('typingInternetWithInternalAccountShowsQuestionnaire', async () => { + let textAreaElement = null; + await initializePage(); + // The questionnaire will be only shown if the account belongs to an + // internal user. + page.feedbackContext = fakeInternalUserFeedbackContext; + + textAreaElement = getElement('#descriptionText'); + textAreaElement.value = 'The entire Internet is down.'; + // Setting the value of the textarea in code does not trigger the + // input event. So we trigger it here. + textAreaElement.dispatchEvent(new Event('input')); + await flushTasks(); + + // Check that the questionnaire and all relevant domain questions are + // present. + assertTrue(textAreaElement.value.indexOf(questionnaireBegin) >= 0); + domainQuestions['wifi'].forEach((question) => { + assertTrue(textAreaElement.value.indexOf(question) >= 0); + }); + }); + + test('typing5GWithInternalAccountShowsQuestionnaire', async () => { + let textAreaElement = null; + await initializePage(); + // The questionnaire will be only shown if the account belongs to an + // internal user. + page.feedbackContext = fakeInternalUserFeedbackContext; + + textAreaElement = getElement('#descriptionText'); + textAreaElement.value = 'These 5G towers control my mind.'; + // Setting the value of the textarea in code does not trigger the + // input event. So we trigger it here. + textAreaElement.dispatchEvent(new Event('input')); + await flushTasks(); + + // Check that the questionnaire and all relevant domain questions are + // present. + assertTrue(textAreaElement.value.indexOf(questionnaireBegin) >= 0); + domainQuestions['cellular'].forEach((question) => { + assertTrue(textAreaElement.value.indexOf(question) >= 0); + }); + }); + + test( + 'typingSomethingElseWithInternalAccountDoesNotShowQuestionnaire', + async () => { + let textAreaElement = null; + await initializePage(); + // The questionnaire will be only shown if the account belongs to an + // internal user. + page.feedbackContext = fakeInternalUserFeedbackContext; + + textAreaElement = getElement('#descriptionText'); + textAreaElement.value = 'You should just make ChromeOS better.'; + // Setting the value of the textarea in code does not trigger the + // input event. So we trigger it here. + textAreaElement.dispatchEvent(new Event('input')); + await flushTasks(); + + // Check that the questionnaire is not shown. + assertFalse(textAreaElement.value.indexOf(questionnaireBegin) >= 0); + }); + + test( + 'typingBluetoothWithoutInternalAccountDoesNotShowQuestionnaire', + async () => { + let textAreaElement = null; + await initializePage(); + // The questionnaire will be only shown if the account belongs to an + // internal user. + page.feedbackContext = fakeFeedbackContext; + + textAreaElement = getElement('#descriptionText'); + textAreaElement.value = 'My cat got a blue tooth because of ChromeOS.'; + // Setting the value of the textarea in code does not trigger the + // input event. So we trigger it here. + textAreaElement.dispatchEvent(new Event('input')); + await flushTasks(); + + // Check that the questionnaire is not shown. + assertFalse(textAreaElement.value.indexOf(questionnaireBegin) >= 0); + }); }
diff --git a/chrome/test/data/webui/chromeos/parent_access/DIR_METADATA b/chrome/test/data/webui/chromeos/parent_access/DIR_METADATA new file mode 100644 index 0000000..eff0b992 --- /dev/null +++ b/chrome/test/data/webui/chromeos/parent_access/DIR_METADATA
@@ -0,0 +1 @@ +mixins: "//chrome/browser/ash/child_accounts/COMMON_METADATA" \ No newline at end of file
diff --git a/chrome/test/data/webui/cr_elements/cr_action_menu_test.ts b/chrome/test/data/webui/cr_elements/cr_action_menu_test.ts index 314a354..898bca2 100644 --- a/chrome/test/data/webui/cr_elements/cr_action_menu_test.ts +++ b/chrome/test/data/webui/cr_elements/cr_action_menu_test.ts
@@ -8,7 +8,7 @@ import {AnchorAlignment, CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'; import {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.js'; import {isMac, isWindows} from 'chrome://resources/js/cr.m.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.js'; import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts b/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts index de7a1ba..d794c48 100644 --- a/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts +++ b/chrome/test/data/webui/cr_elements/cr_menu_selector_focus_test.ts
@@ -5,7 +5,7 @@ import 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js'; import {CrMenuSelector} from 'chrome://resources/cr_elements/cr_menu_selector/cr_menu_selector.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.js'; import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; import {assertEquals, assertFalse} from 'chrome://webui-test/chai_assert.js';
diff --git a/chrome/test/data/webui/cr_focus_row_mixin_test.ts b/chrome/test/data/webui/cr_focus_row_mixin_test.ts index 8696691..6ee0310 100644 --- a/chrome/test/data/webui/cr_focus_row_mixin_test.ts +++ b/chrome/test/data/webui/cr_focus_row_mixin_test.ts
@@ -3,7 +3,7 @@ // found in the LICENSE file. // clang-format off -import {FocusRowMixin} from 'chrome://resources/js/cr/ui/focus_row_mixin.js'; +import {FocusRowMixin} from 'chrome://resources/js/focus_row_mixin.js'; import {getDeepActiveElement} from 'chrome://resources/js/util.js'; import {down, pressAndReleaseKeyOn, up} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
diff --git a/chrome/test/data/webui/inline_login/BUILD.gn b/chrome/test/data/webui/inline_login/BUILD.gn index 5caa9a4..fc4c6f80 100644 --- a/chrome/test/data/webui/inline_login/BUILD.gn +++ b/chrome/test/data/webui/inline_login/BUILD.gn
@@ -3,30 +3,73 @@ # found in the LICENSE file. import("//tools/grit/preprocess_if_expr.gni") +import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") +assert(is_chromeos_ash || is_win || is_mac) + +preprocessed_folder = "$target_gen_dir/preprocessed" + +test_files = [ + "inline_login_test.ts", + "inline_login_test_util.ts", +] + +if (is_chromeos_ash) { + test_files += [ + "arc_account_picker_page_test.ts", + "inline_login_signin_blocked_by_policy_page_test.ts", + "inline_login_welcome_page_test.ts", + ] +} + preprocess_if_expr("preprocess") { in_folder = "." - out_folder = target_gen_dir + out_folder = preprocessed_folder out_manifest = "$target_gen_dir/preprocessed_manifest.json" - in_files = [ - "inline_login_test.js", - "inline_login_test_util.js", - ] + in_files = test_files +} +ts_library("build_ts") { + root_dir = preprocessed_folder + out_dir = "$target_gen_dir/tsc" + tsconfig_base = "tsconfig_base.json" + path_mappings = [ + "chrome://chrome-signin/gaia_auth_host/*|" + + rebase_path("//chrome/browser/resources/gaia_auth_host/*", + target_gen_dir), + "chrome://chrome-signin/*|" + + rebase_path("$root_gen_dir/chrome/browser/resources/inline_login/tsc/*", + target_gen_dir), + "chrome://webui-test/*|" + + rebase_path("$root_gen_dir/chrome/test/data/webui/tsc/*", + target_gen_dir), + ] if (is_chromeos_ash) { - in_files += [ - "arc_account_picker_page_test.js", - "inline_login_signin_blocked_by_policy_page_test.js", - "inline_login_welcome_page_test.js", + path_mappings += [ + "chrome://chrome-signin/arc_account_picker/*|" + + rebase_path( + "//chrome/browser/resources/chromeos/arc_account_picker/*", + target_gen_dir), + "chrome://webui-test/chromeos/arc_account_picker/*|" + + rebase_path("//chrome/test/data/webui/chromeos/arc_account_picker/*", + target_gen_dir), ] } + + in_files = test_files + deps = [ + "..:build_ts", + "//chrome/browser/resources/inline_login:build_ts", + ] + extra_deps = [ ":preprocess" ] } generate_grd("build_grdp") { grd_prefix = "webui_inline_login" out_grd = "$target_gen_dir/resources.grdp" - deps = [ ":preprocess" ] - manifest_files = [ "$target_gen_dir/preprocessed_manifest.json" ] + deps = [ ":build_ts" ] + manifest_files = + filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ]) resource_path_prefix = "inline_login" }
diff --git a/chrome/test/data/webui/inline_login/arc_account_picker_page_test.js b/chrome/test/data/webui/inline_login/arc_account_picker_page_test.ts similarity index 70% rename from chrome/test/data/webui/inline_login/arc_account_picker_page_test.js rename to chrome/test/data/webui/inline_login/arc_account_picker_page_test.ts index d4f99de..b8dfd6dcd 100644 --- a/chrome/test/data/webui/inline_login/arc_account_picker_page_test.js +++ b/chrome/test/data/webui/inline_login/arc_account_picker_page_test.ts
@@ -12,51 +12,38 @@ import {assert} from 'chrome://resources/js/assert.js'; import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; - -import {assertDeepEquals, assertEquals} from '../chai_assert.js'; -import {getFakeAccountsNotAvailableInArcList, setTestArcAccountPickerBrowserProxy, TestArcAccountPickerBrowserProxy} from '../chromeos/arc_account_picker/test_util.js'; +import {assertDeepEquals, assertEquals, assertTrue} from 'chrome://webui-test/chai_assert.js'; +import {getFakeAccountsNotAvailableInArcList, setTestArcAccountPickerBrowserProxy, TestArcAccountPickerBrowserProxy} from 'chrome://webui-test/chromeos/arc_account_picker/test_util.js'; import {fakeAuthExtensionData, fakeAuthExtensionDataWithEmail, TestAuthenticator, TestInlineLoginBrowserProxy} from './inline_login_test_util.js'; -window.arc_account_picker_page_test = {}; -const arc_account_picker_page_test = window.arc_account_picker_page_test; -arc_account_picker_page_test.suiteName = 'InlineLoginArcPickerPageTest'; - -/** @enum {string} */ -arc_account_picker_page_test.TestNames = { - ArcPickerActive: 'ArcPickerActive', - ArcPickerHiddenForReauth: 'ArcPickerHiddenForReauth', - ArcPickerHiddenNoAccounts: 'ArcPickerHiddenNoAccounts', - AddAccount: 'AddAccount', - MakeAvailableInArc: 'MakeAvailableInArc', +const arc_account_picker_page_test = { + suiteName: 'InlineLoginArcPickerPageTest', + TestNames: { + ArcPickerActive: 'ArcPickerActive', + ArcPickerHiddenForReauth: 'ArcPickerHiddenForReauth', + ArcPickerHiddenNoAccounts: 'ArcPickerHiddenNoAccounts', + AddAccount: 'AddAccount', + MakeAvailableInArc: 'MakeAvailableInArc', + }, }; +Object.assign(window, {arc_account_picker_page_test}); suite(arc_account_picker_page_test.suiteName, () => { - /** @type {ArcAccountPickerAppElement} */ - let arcAccountPickerComponent; - /** @type {InlineLoginAppElement} */ - let inlineLoginComponent; - /** @type {TestInlineLoginBrowserProxy} */ - let testBrowserProxy; - /** @type {TestArcAccountPickerBrowserProxy} */ - let testArcBrowserProxy; + let arcAccountPickerComponent: ArcAccountPickerAppElement; + let inlineLoginComponent: InlineLoginAppElement; + let testBrowserProxy: TestInlineLoginBrowserProxy; + let testArcBrowserProxy: TestArcAccountPickerBrowserProxy; - /** - * @return {string} id of the active view. - */ - function getActiveViewId() { - return inlineLoginComponent.shadowRoot - .querySelector('div.active[slot="view"]') - .id; + /** @return id of the active view. */ + function getActiveViewId(): string { + return inlineLoginComponent.shadowRoot! + .querySelector('div.active[slot="view"]')!.id; } - /** - * @param {?AccountAdditionOptions} dialogArgs - * @param {!Array<Account>} accountsNotAvailableInArc - * @param {!Object} authExtensionData - */ async function testSetup( - dialogArgs, accountsNotAvailableInArc, authExtensionData) { + dialogArgs: AccountAdditionOptions|null, + accountsNotAvailableInArc: Account[], authExtensionData: object) { document.body.innerHTML = ''; testBrowserProxy = new TestInlineLoginBrowserProxy(); @@ -67,18 +54,17 @@ testArcBrowserProxy.setAccountsNotAvailableInArc(accountsNotAvailableInArc); setTestArcAccountPickerBrowserProxy(testArcBrowserProxy); - inlineLoginComponent = /** @type {InlineLoginAppElement} */ ( - document.createElement('inline-login-app')); + inlineLoginComponent = document.createElement('inline-login-app'); document.body.appendChild(inlineLoginComponent); inlineLoginComponent.setAuthExtHostForTest(new TestAuthenticator()); flush(); - arcAccountPickerComponent = /** @type {ArcAccountPickerAppElement} */ ( - inlineLoginComponent.shadowRoot.querySelector( - 'arc-account-picker-app')); + arcAccountPickerComponent = inlineLoginComponent.shadowRoot!.querySelector( + 'arc-account-picker-app')!; - const switchViewPromise = new Promise( - resolve => inlineLoginComponent.addEventListener( - 'switch-view-notify-for-testing', () => resolve())); + const switchViewPromise = new Promise<void>(resolve => { + inlineLoginComponent.addEventListener( + 'switch-view-notify-for-testing', () => resolve()); + }); webUIListenerCallback('load-auth-extension', authExtensionData); await switchViewPromise; flush(); @@ -98,7 +84,8 @@ 'ARC account picker screen should be active'); const uiAccounts = [ - ...arcAccountPickerComponent.root.querySelectorAll('.account-item'), + ...arcAccountPickerComponent.shadowRoot!.querySelectorAll( + '.account-item'), ].filter(item => item.id !== 'addAccountButton'); assertEquals( getFakeAccountsNotAvailableInArcList().length, uiAccounts.length); @@ -143,8 +130,11 @@ View.ARC_ACCOUNT_PICKER, getActiveViewId(), 'ARC account picker screen should be active'); - arcAccountPickerComponent.shadowRoot.querySelector('#addAccountButton') - .click(); + const button = + arcAccountPickerComponent.shadowRoot!.querySelector<HTMLElement>( + '#addAccountButton'); + assertTrue(!!button); + button.click(); assertEquals( View.WELCOME, getActiveViewId(), 'Welcome screen should be active after Add account button click'); @@ -164,9 +154,11 @@ 'ARC account picker screen should be active'); const expectedAccount = getFakeAccountsNotAvailableInArcList()[0]; - arcAccountPickerComponent.shadowRoot - .querySelectorAll('.account-item')[0] - .click(); + const accountItem = + arcAccountPickerComponent.shadowRoot!.querySelector<HTMLElement>( + '.account-item'); + assertTrue(!!accountItem); + accountItem.click(); const account = await testArcBrowserProxy.whenCalled('makeAvailableInArc'); assertDeepEquals(expectedAccount, account);
diff --git a/chrome/test/data/webui/inline_login/inline_login_browsertest.js b/chrome/test/data/webui/inline_login/inline_login_browsertest.js index 7d489c2..d836382 100644 --- a/chrome/test/data/webui/inline_login/inline_login_browsertest.js +++ b/chrome/test/data/webui/inline_login/inline_login_browsertest.js
@@ -50,6 +50,12 @@ }); GEN('#if BUILDFLAG(IS_CHROMEOS_ASH)'); +TEST_F('InlineLoginBrowserTest', 'OkButton', function() { + this.runMochaTest(inline_login_test.TestNames.OkButton); +}); +GEN('#endif') + +GEN('#if BUILDFLAG(IS_CHROMEOS_ASH)'); // TODO(crbug.com/1347746): Merge this test suite with the test above after the // feature is launched. var InlineLoginBrowserTestWithArcAccountRestrictionsEnabled =
diff --git a/chrome/test/data/webui/inline_login/inline_login_signin_blocked_by_policy_page_test.js b/chrome/test/data/webui/inline_login/inline_login_signin_blocked_by_policy_page_test.ts similarity index 67% rename from chrome/test/data/webui/inline_login/inline_login_signin_blocked_by_policy_page_test.js rename to chrome/test/data/webui/inline_login/inline_login_signin_blocked_by_policy_page_test.ts index 5ab7ab39..4b3e102e 100644 --- a/chrome/test/data/webui/inline_login/inline_login_signin_blocked_by_policy_page_test.js +++ b/chrome/test/data/webui/inline_login/inline_login_signin_blocked_by_policy_page_test.ts
@@ -17,47 +17,33 @@ import {assert} from 'chrome://resources/js/assert.js'; import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; - -import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js'; +import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {fakeSigninBlockedByPolicyData, TestAuthenticator, TestInlineLoginBrowserProxy} from './inline_login_test_util.js'; -window.inline_login_signin_blocked_by_policy_page_test = {}; -const inline_login_signin_blocked_by_policy_page_test = - window.inline_login_signin_blocked_by_policy_page_test; -inline_login_signin_blocked_by_policy_page_test.suiteName = - 'InlineLoginSigninBlockedByPolicyPageTest'; - -/** @enum {string} */ -inline_login_signin_blocked_by_policy_page_test.TestNames = { - BlockedSigninPage: 'BlockedSigninPage', - FireWebUIListenerCallback: 'FireWebUIListenerCallback', - OkButton: 'OkButton', +const inline_login_signin_blocked_by_policy_page_test = { + suiteName: 'InlineLoginSigninBlockedByPolicyPageTest', + TestNames: { + BlockedSigninPage: 'BlockedSigninPage', + FireWebUIListenerCallback: 'FireWebUIListenerCallback', + OkButton: 'OkButton', + }, }; +Object.assign(window, {inline_login_signin_blocked_by_policy_page_test}); suite(inline_login_signin_blocked_by_policy_page_test.suiteName, () => { - /** @type {SigninBlockedByPolicyPageElement} */ - let signinBlockedByPolicyPageComponent; - /** @type {InlineLoginAppElement} */ - let inlineLoginComponent; - /** @type {TestInlineLoginBrowserProxy} */ - let testBrowserProxy; - /** @type {TestAuthenticator} */ - let testAuthenticator; + let signinBlockedByPolicyPageComponent: SigninBlockedByPolicyPageElement; + let inlineLoginComponent: InlineLoginAppElement; + let testBrowserProxy: TestInlineLoginBrowserProxy; + let testAuthenticator: TestAuthenticator; - /** - * @return {string} id of the active view. - */ - function getActiveViewId() { - return inlineLoginComponent.shadowRoot - .querySelector('div.active[slot="view"]') - .id; + /** @return id of the active view. */ + function getActiveViewId(): string { + return inlineLoginComponent.shadowRoot! + .querySelector('div.active[slot="view"]')!.id; } - /** - * @param {?AccountAdditionOptions} dialogArgs - */ - function testSetup(dialogArgs) { + function testSetup(dialogArgs: AccountAdditionOptions|null) { document.body.innerHTML = ''; testBrowserProxy = new TestInlineLoginBrowserProxy(); testBrowserProxy.setDialogArguments(dialogArgs); @@ -70,9 +56,8 @@ inlineLoginComponent.setAuthExtHostForTest(testAuthenticator); flush(); signinBlockedByPolicyPageComponent = - /** @type {SigninBlockedByPolicyPageElement}*/ - (inlineLoginComponent.shadowRoot.querySelector( - 'signin-blocked-by-policy-page')); + inlineLoginComponent.shadowRoot!.querySelector( + 'signin-blocked-by-policy-page')!; } test( @@ -89,15 +74,16 @@ 'Sing-in blocked by policy page should be shown'); const title = - signinBlockedByPolicyPageComponent.shadowRoot.querySelector('h1'); + signinBlockedByPolicyPageComponent.shadowRoot!.querySelector('h1'); + assertTrue(!!title); assertEquals( title.textContent, 'Can\'t sign in with this account', 'The titles do not match'); - const textBody = - signinBlockedByPolicyPageComponent.shadowRoot.querySelector( - '.secondary'); + const textBody = signinBlockedByPolicyPageComponent.shadowRoot! + .querySelector<HTMLElement>('.secondary'); + assertTrue(!!textBody); assertEquals( - textBody.textContent, + textBody.textContent!, 'john.doe@example.com is managed by example.com. You can\'t add ' + 'this email as an additional account.\n To use ' + 'john.doe@example.com, first sign out of your Chromebook. ' + @@ -117,32 +103,35 @@ assertEquals( View.SIGNIN_BLOCKED_BY_POLICY, getActiveViewId(), 'Sing-in blocked by policy should be shown'); - let textBody = - signinBlockedByPolicyPageComponent.shadowRoot.querySelector( - '.secondary'); + let textBody = signinBlockedByPolicyPageComponent.shadowRoot! + .querySelector<HTMLElement>('.secondary'); + assertTrue(!!textBody); assertTrue( - textBody.textContent.includes('john.doe@example.com'), + textBody.textContent!.includes('john.doe@example.com'), 'Invalid user email'); assertTrue( - textBody.textContent.includes('example.com'), + textBody.textContent!.includes('example.com'), 'Invalid hosted domain'); assertTrue( - textBody.textContent.includes('Chromebook'), 'Invalid device type'); + textBody.textContent!.includes('Chromebook'), + 'Invalid device type'); webUIListenerCallback('show-signin-error-page', { email: 'coyote@acme.com', hostedDomain: 'acme.com', deviceType: 'Chromebox', signinBlockedByPolicy: true, }); - textBody = signinBlockedByPolicyPageComponent.shadowRoot.querySelector( - '.secondary'); + textBody = signinBlockedByPolicyPageComponent.shadowRoot! + .querySelector<HTMLElement>('.secondary'); + assertTrue(!!textBody); assertTrue( - textBody.textContent.includes('coyote@acme.com'), + textBody.textContent!.includes('coyote@acme.com'), 'Invalid user email'); assertTrue( - textBody.textContent.includes('acme.com'), 'Invalid hosted domain'); + textBody.textContent!.includes('acme.com'), + 'Invalid hosted domain'); assertTrue( - textBody.textContent.includes('Chromebox'), 'Invalid device type'); + textBody.textContent!.includes('Chromebox'), 'Invalid device type'); }); test( @@ -156,7 +145,9 @@ 'show-signin-error-page', fakeSigninBlockedByPolicyData); const okButton = - inlineLoginComponent.shadowRoot.querySelector('.next-button'); + inlineLoginComponent.shadowRoot!.querySelector<HTMLElement>( + '.next-button'); + assertTrue(!!okButton); // OK button and signin blocked by policy screen should be visible. assertFalse(okButton.hidden, 'OK button should be visible'); assertEquals(
diff --git a/chrome/test/data/webui/inline_login/inline_login_test.js b/chrome/test/data/webui/inline_login/inline_login_test.ts similarity index 68% rename from chrome/test/data/webui/inline_login/inline_login_test.js rename to chrome/test/data/webui/inline_login/inline_login_test.ts index 9eab4b4..b9e6ecf2 100644 --- a/chrome/test/data/webui/inline_login/inline_login_test.js +++ b/chrome/test/data/webui/inline_login/inline_login_test.ts
@@ -10,56 +10,50 @@ import {isChromeOS, webUIListenerCallback} from 'chrome://resources/js/cr.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; - -import {assertDeepEquals, assertEquals, assertFalse, assertTrue} from '../chai_assert.js'; -import {isChildVisible} from '../test_util.js'; +import {assertDeepEquals, assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; +import {isChildVisible} from 'chrome://webui-test/test_util.js'; import {fakeAuthExtensionData, getFakeAccountsList, TestAuthenticator, TestInlineLoginBrowserProxy} from './inline_login_test_util.js'; -window.inline_login_test = {}; -const inline_login_test = window.inline_login_test; -inline_login_test.suiteName = 'InlineLoginTest'; - -/** @enum {string} */ -inline_login_test.TestNames = { - Initialize: 'Initialize', - WebUICallbacks: 'WebUICallbacks', - AuthExtHostCallbacks: 'AuthExtHostCallbacks', - BackButton: 'BackButton', - OkButton: 'OkButton', +const inline_login_test = { + suiteName: 'InlineLoginTest', + TestNames: { + Initialize: 'Initialize', + WebUICallbacks: 'WebUICallbacks', + AuthExtHostCallbacks: 'AuthExtHostCallbacks', + BackButton: 'BackButton', + OkButton: 'OkButton', + }, }; +Object.assign(window, {inline_login_test}); suite(inline_login_test.suiteName, () => { - /** @type {InlineLoginAppElement} */ - let inlineLoginComponent; - /** @type {TestInlineLoginBrowserProxy} */ - let testBrowserProxy; - /** @type {TestAuthenticator} */ - let testAuthenticator; + let inlineLoginComponent: InlineLoginAppElement; + let testBrowserProxy: TestInlineLoginBrowserProxy; + let testAuthenticator: TestAuthenticator; - function isVisible(selector) { + function isVisible(selector: string): boolean { if (!inlineLoginComponent) { return false; } return isChildVisible(inlineLoginComponent, selector, false); } + // <if expr="chromeos_ash"> suiteSetup(function() { // This test suite tests the 'default' behavior of inline login page, when // only 'Add account' screen is shown: this happens on Chrome Desktop or // when `kInlineLoginWelcomePageSkipped` pref is set to true. - if (isChromeOS) { - loadTimeData.overrideValues({shouldSkipWelcomePage: true}); - } + loadTimeData.overrideValues({shouldSkipWelcomePage: true}); }); + // </if> setup(() => { document.body.innerHTML = ''; testBrowserProxy = new TestInlineLoginBrowserProxy(); InlineLoginBrowserProxyImpl.setInstance(testBrowserProxy); document.body.innerHTML = ''; - inlineLoginComponent = /** @type {InlineLoginAppElement} */ ( - document.createElement('inline-login-app')); + inlineLoginComponent = document.createElement('inline-login-app'); document.body.appendChild(inlineLoginComponent); testAuthenticator = new TestAuthenticator(); inlineLoginComponent.setAuthExtHostForTest(testAuthenticator); @@ -70,23 +64,16 @@ webUIListenerCallback('load-auth-extension', fakeAuthExtensionData); // 'Add account' screen should be shown. assertTrue(isVisible(`#${View.ADD_ACCOUNT}`)); - if (isChromeOS) { - // 'Welcome' screen should be hidden. - assertFalse(isVisible(`#${View.WELCOME}`)); - } else { - // 'Welcome' screen should exist only on Chrome OS. - assertEquals( - null, - inlineLoginComponent.shadowRoot.querySelector(`#${View.WELCOME}`)); - } + + // <if expr="chromeos_ash"> + // 'Welcome' screen should be hidden. + assertFalse(isVisible(`#${View.WELCOME}`)); + // </if> // The 'loading' spinner should be shown and 'initialize' should be called // on startup. - assertTrue( - inlineLoginComponent.shadowRoot.querySelector('paper-spinner-lite') - .active); - assertTrue( - inlineLoginComponent.shadowRoot.querySelector('#signinFrame').hidden); + assertTrue(inlineLoginComponent.$.spinner.active); + assertTrue(inlineLoginComponent.$.signinFrame.hidden); assertEquals(1, testBrowserProxy.getCallCount('initialize')); }); @@ -110,14 +97,10 @@ test(assert(inline_login_test.TestNames.AuthExtHostCallbacks), async () => { const fakeUrl = 'www.google.com/fake'; - assertTrue( - inlineLoginComponent.shadowRoot.querySelector('paper-spinner-lite') - .active); + assertTrue(inlineLoginComponent.$.spinner.active); testAuthenticator.dispatchEvent(new Event('ready')); assertEquals(1, testBrowserProxy.getCallCount('authExtensionReady')); - assertFalse( - inlineLoginComponent.shadowRoot.querySelector('paper-spinner-lite') - .active); + assertFalse(inlineLoginComponent.$.spinner.active); testAuthenticator.dispatchEvent( new CustomEvent('resize', {detail: fakeUrl})); @@ -130,9 +113,7 @@ new CustomEvent('authCompleted', {detail: fakeCredentials})); const completeLoginResult = await testBrowserProxy.whenCalled('completeLogin'); - assertTrue( - inlineLoginComponent.shadowRoot.querySelector('paper-spinner-lite') - .active); + assertTrue(inlineLoginComponent.$.spinner.active); if (isChromeOS && loadTimeData.getBoolean('isArcAccountRestrictionsEnabled')) { @@ -157,22 +138,28 @@ }); }); + // <if expr="not chromeos_ash"> test(assert(inline_login_test.TestNames.BackButton), () => { const backButton = - inlineLoginComponent.shadowRoot.querySelector('.back-button'); - if (!isChromeOS) { - // Back button should be shown only on ChromeOS. - assertEquals(null, backButton); - return; - } + inlineLoginComponent.shadowRoot!.querySelector('.back-button'); + // Back button should only exist on ChromeOS. + assertEquals(null, backButton); + }); + // </if> + + + // <if expr="chromeos_ash"> + test(assert(inline_login_test.TestNames.BackButton), () => { + const backButton = + inlineLoginComponent.shadowRoot!.querySelector<HTMLElement>( + '.back-button'); + assertTrue(!!backButton); let backInWebviewCalls = 0; - inlineLoginComponent.shadowRoot.querySelector('#signinFrame').back = () => - backInWebviewCalls++; + inlineLoginComponent.$.signinFrame.back = () => backInWebviewCalls++; // If we cannot go back in the webview - we should close the dialog. - inlineLoginComponent.shadowRoot.querySelector('#signinFrame').canGoBack = - () => false; + inlineLoginComponent.$.signinFrame.canGoBack = () => false; backButton.click(); assertEquals(1, testBrowserProxy.getCallCount('dialogClose')); assertEquals(0, backInWebviewCalls); @@ -180,8 +167,7 @@ testBrowserProxy.reset(); // Go back in the webview if possible. - inlineLoginComponent.shadowRoot.querySelector('#signinFrame').canGoBack = - () => true; + inlineLoginComponent.$.signinFrame.canGoBack = () => true; backButton.click(); assertEquals(0, testBrowserProxy.getCallCount('dialogClose')); assertEquals(1, backInWebviewCalls); @@ -189,7 +175,8 @@ test(assert(inline_login_test.TestNames.OkButton), () => { // 'OK' button should be hidden. - assertTrue( - inlineLoginComponent.shadowRoot.querySelector('.next-button').hidden); + assertTrue(inlineLoginComponent.shadowRoot! + .querySelector<HTMLElement>('.next-button')!.hidden); }); + // </if> });
diff --git a/chrome/test/data/webui/inline_login/inline_login_test_util.js b/chrome/test/data/webui/inline_login/inline_login_test_util.ts similarity index 63% rename from chrome/test/data/webui/inline_login/inline_login_test_util.js rename to chrome/test/data/webui/inline_login/inline_login_test_util.ts index c832fd09..122c62cdb 100644 --- a/chrome/test/data/webui/inline_login/inline_login_test_util.js +++ b/chrome/test/data/webui/inline_login/inline_login_test_util.ts
@@ -6,13 +6,13 @@ import {AccountAdditionOptions} from 'chrome://chrome-signin/arc_account_picker/arc_util.js'; // </if> -import {AuthMode, AuthParams} from 'chrome://chrome-signin/gaia_auth_host/authenticator.js'; +import {InlineLoginBrowserProxy} from 'chrome://chrome-signin/inline_login_browser_proxy.js'; +import {AuthCompletedCredentials, AuthMode, AuthParams} from 'chrome://chrome-signin/gaia_auth_host/authenticator.js'; import {NativeEventTarget as EventTarget} from 'chrome://resources/js/cr/event_target.js'; -import {TestBrowserProxy} from '../test_browser_proxy.js'; +import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js'; -/** @return {!Array<string>} */ -export function getFakeAccountsList() { +export function getFakeAccountsList(): string[] { return ['test@gmail.com', 'test2@gmail.com', 'test3@gmail.com']; } @@ -41,45 +41,37 @@ }; export class TestAuthenticator extends EventTarget { - constructor() { - super(); - /** - * @type {?AuthMode} - */ - this.authMode = null; - /** - * @type {?AuthParams} - */ - this.data = null; - /** @type {number} */ - this.loadCalls = 0; - /** @type {number} */ - this.getAccountsResponseCalls = 0; - /** @type {Array<string>} */ - this.getAccountsResponseResult = null; - } + authMode: AuthMode|null = null; + data: AuthParams|null = null; + loadCalls: number = 0; + getAccountsResponseCalls: number = 0; + getAccountsResponseResult: string[]|null = null; /** - * @param {AuthMode} authMode Authorization mode. - * @param {AuthParams} data Parameters for the authorization flow. + * @param authMode Authorization mode. + * @param data Parameters for the authorization flow. */ - load(authMode, data) { + load(authMode: AuthMode, data: AuthParams) { this.loadCalls++; this.authMode = authMode; this.data = data; } /** - * @param {Array<string>} accounts list of emails. + * @param accounts list of emails. */ - getAccountsResponse(accounts) { + getAccountsResponse(accounts: string[]) { this.getAccountsResponseCalls++; this.getAccountsResponseResult = accounts; } } -/** @implements {InlineLoginBrowserProxy} */ -export class TestInlineLoginBrowserProxy extends TestBrowserProxy { +export class TestInlineLoginBrowserProxy extends TestBrowserProxy implements + InlineLoginBrowserProxy { + // <if expr="chromeos_ash"> + private dialogArguments_: AccountAdditionOptions|null = null; + // </if> + constructor() { super([ 'initialize', @@ -97,82 +89,60 @@ 'getDialogArguments', // </if> ]); - - // <if expr="chromeos_ash"> - /** - * @private {?AccountAdditionOptions} - */ - this.dialogArguments_ = null; - // </if> } // <if expr="chromeos_ash"> - /** - * @param {?AccountAdditionOptions} dialogArguments - */ - setDialogArguments(dialogArguments) { + setDialogArguments(dialogArguments: AccountAdditionOptions|null) { this.dialogArguments_ = dialogArguments; } // </if> - /** @override */ initialize() { this.methodCalled('initialize'); } - /** @override */ authExtensionReady() { this.methodCalled('authExtensionReady'); } - /** @override */ - switchToFullTab(url) { + switchToFullTab(url: string) { this.methodCalled('switchToFullTab', url); } - /** @override */ - completeLogin(credentials) { + completeLogin(credentials: AuthCompletedCredentials) { this.methodCalled('completeLogin', credentials); } - /** @override */ - lstFetchResults(arg) { + lstFetchResults(arg: string) { this.methodCalled('lstFetchResults', arg); } - /** @override */ - recordAction(metricsAction) { + recordAction(metricsAction: string) { this.methodCalled('metricsHandler:recordAction', metricsAction); } - /** @override */ showIncognito() { this.methodCalled('showIncognito'); } - /** @override */ getAccounts() { this.methodCalled('getAccounts'); return Promise.resolve(getFakeAccountsList()); } - /** @override */ dialogClose() { this.methodCalled('dialogClose'); } // <if expr="chromeos_ash"> - /** @override */ - skipWelcomePage(skip) { + skipWelcomePage(skip: boolean) { this.methodCalled('skipWelcomePage', skip); } - /** @override */ openGuestWindow() { this.methodCalled('openGuestWindow'); } - /** @override */ getDialogArguments() { return JSON.stringify(this.dialogArguments_); }
diff --git a/chrome/test/data/webui/inline_login/inline_login_welcome_page_test.js b/chrome/test/data/webui/inline_login/inline_login_welcome_page_test.ts similarity index 65% rename from chrome/test/data/webui/inline_login/inline_login_welcome_page_test.js rename to chrome/test/data/webui/inline_login/inline_login_welcome_page_test.ts index 0b48424..87c4de8 100644 --- a/chrome/test/data/webui/inline_login/inline_login_welcome_page_test.js +++ b/chrome/test/data/webui/inline_login/inline_login_welcome_page_test.ts
@@ -4,61 +4,50 @@ import 'chrome://chrome-signin/inline_login_app.js'; +import {AccountAdditionOptions} from 'chrome://chrome-signin/arc_account_picker/arc_util.js'; import {InlineLoginAppElement, View} from 'chrome://chrome-signin/inline_login_app.js'; import {InlineLoginBrowserProxyImpl} from 'chrome://chrome-signin/inline_login_browser_proxy.js'; import {assert} from 'chrome://resources/js/assert.js'; import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {waitAfterNextRender} from 'chrome://webui-test/polymer_test_util.js'; -import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js'; - import {fakeAuthExtensionData, fakeAuthExtensionDataWithEmail, TestAuthenticator, TestInlineLoginBrowserProxy} from './inline_login_test_util.js'; -window.inline_login_welcome_page_test = {}; -const inline_login_welcome_page_test = window.inline_login_welcome_page_test; -inline_login_welcome_page_test.suiteName = 'InlineLoginWelcomePageTest'; - -/** @enum {string} */ -inline_login_welcome_page_test.TestNames = { - Reauthentication: 'Reauthentication', - OkButton: 'OkButton', - Checkbox: 'Checkbox', - GoBack: 'GoBack', - IsAvailableInArc: 'IsAvailableInArc', - ToggleHidden: 'ToggleHidden', - LinkClick: 'LinkClick', +const inline_login_welcome_page_test = { + suiteName: 'InlineLoginWelcomePageTest', + TestNames: { + Reauthentication: 'Reauthentication', + OkButton: 'OkButton', + Checkbox: 'Checkbox', + GoBack: 'GoBack', + IsAvailableInArc: 'IsAvailableInArc', + ToggleHidden: 'ToggleHidden', + LinkClick: 'LinkClick', + }, }; +Object.assign(window, {inline_login_welcome_page_test}); suite(inline_login_welcome_page_test.suiteName, () => { - /** @type {InlineLoginAppElement} */ - let inlineLoginComponent; - /** @type {TestInlineLoginBrowserProxy} */ - let testBrowserProxy; - /** @type {TestAuthenticator} */ - let testAuthenticator; + let inlineLoginComponent: InlineLoginAppElement; + let testBrowserProxy: TestInlineLoginBrowserProxy; + let testAuthenticator: TestAuthenticator; - /** - * @return {string} id of the active view. - */ - function getActiveViewId() { - return inlineLoginComponent.shadowRoot - .querySelector('div.active[slot="view"]') - .id; + /** @return The id of the active view. */ + function getActiveViewId(): string { + return inlineLoginComponent.shadowRoot! + .querySelector('div.active[slot="view"]')!.id; } - /** - * @param {?AccountAdditionOptions} dialogArgs - */ - function testSetup(dialogArgs) { + function testSetup(dialogArgs: AccountAdditionOptions|null) { document.body.innerHTML = ''; testBrowserProxy = new TestInlineLoginBrowserProxy(); testBrowserProxy.setDialogArguments(dialogArgs); InlineLoginBrowserProxyImpl.setInstance(testBrowserProxy); document.body.innerHTML = ''; - inlineLoginComponent = /** @type {InlineLoginAppElement} */ ( - document.createElement('inline-login-app')); + inlineLoginComponent = document.createElement('inline-login-app'); document.body.appendChild(inlineLoginComponent); testAuthenticator = new TestAuthenticator(); inlineLoginComponent.setAuthExtHostForTest(testAuthenticator); @@ -84,7 +73,9 @@ testSetup(/*dialogArgs=*/ null); webUIListenerCallback('load-auth-extension', fakeAuthExtensionData); const okButton = - inlineLoginComponent.shadowRoot.querySelector('.next-button'); + inlineLoginComponent.shadowRoot!.querySelector<HTMLElement>( + '.next-button'); + assertTrue(!!okButton); // OK button and welcome screen should be visible. assertFalse(okButton.hidden, 'OK button should be visible'); assertEquals( @@ -109,15 +100,19 @@ testSetup(/*dialogArgs=*/ null); webUIListenerCallback('load-auth-extension', fakeAuthExtensionData); - const checkbox = - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('cr-checkbox'); + const welcomePageApp = + inlineLoginComponent.shadowRoot!.querySelector('welcome-page-app'); + assertTrue(!!welcomePageApp); + const checkbox = welcomePageApp.shadowRoot!.querySelector('cr-checkbox'); + assertTrue(!!checkbox); assertFalse(checkbox.checked, 'Checkbox should be unchecked by default'); checkbox.click(); assertTrue(checkbox.checked, 'Checkbox should be checked'); const okButton = - inlineLoginComponent.shadowRoot.querySelector('.next-button'); + inlineLoginComponent.shadowRoot!.querySelector<HTMLElement>( + '.next-button'); + assertTrue(!!okButton); okButton.click(); return testBrowserProxy.whenCalled('skipWelcomePage').then(skip => { assertEquals(true, skip, 'skipWelcomePage should be called with "true"'); @@ -128,9 +123,13 @@ testSetup(/*dialogArgs=*/ null); webUIListenerCallback('load-auth-extension', fakeAuthExtensionData); const backButton = - inlineLoginComponent.shadowRoot.querySelector('.back-button'); + inlineLoginComponent.shadowRoot!.querySelector<HTMLElement>( + '.back-button'); + assertTrue(!!backButton); const okButton = - inlineLoginComponent.shadowRoot.querySelector('.next-button'); + inlineLoginComponent.shadowRoot!.querySelector<HTMLElement>( + '.next-button'); + assertTrue(!!okButton); assertTrue(backButton.hidden, 'Back button should be hidden'); assertFalse(okButton.hidden, 'OK button should be visible'); @@ -158,14 +157,15 @@ showArcAvailabilityPicker: false, }; testSetup(dialogArgs); - const toggle = - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('.arc-toggle-container'); + const welcomePageApp = + inlineLoginComponent.shadowRoot!.querySelector('welcome-page-app'); + assertTrue(!!welcomePageApp); + const toggle = welcomePageApp.shadowRoot!.querySelector<HTMLElement>( + '.arc-toggle-container'); assertTrue(!!toggle); assertFalse(toggle.hidden, 'ARC toggle should be visible'); const toggleButton = - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('cr-toggle'); + welcomePageApp.shadowRoot!.querySelector('cr-toggle'); assertTrue(!!toggleButton); assertTrue(toggleButton.checked); toggleButton.click(); @@ -181,9 +181,11 @@ showArcAvailabilityPicker: true, }; testSetup(dialogArgs); - const toggle = - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('.arc-toggle-container'); + const welcomePageApp = + inlineLoginComponent.shadowRoot!.querySelector('welcome-page-app'); + assertTrue(!!welcomePageApp); + const toggle = welcomePageApp.shadowRoot!.querySelector<HTMLElement>( + '.arc-toggle-container'); assertTrue(!!toggle); assertTrue(toggle.hidden, 'ARC toggle should be hidden'); }); @@ -195,24 +197,24 @@ }; testSetup(dialogArgs); - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('#osSettingsLink') - .click(); + const welcomePageApp = + inlineLoginComponent.shadowRoot!.querySelector('welcome-page-app'); + assertTrue(!!welcomePageApp); + + welcomePageApp.shadowRoot!.querySelector<HTMLElement>( + '#osSettingsLink')!.click(); await testBrowserProxy.whenCalled('dialogClose'); - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('#appsSettingsLink') - .click(); + welcomePageApp.shadowRoot!.querySelector<HTMLElement>( + '#appsSettingsLink')!.click(); await testBrowserProxy.whenCalled('dialogClose'); - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('#newPersonLink') - .click(); + welcomePageApp.shadowRoot!.querySelector<HTMLElement>( + '#newPersonLink')!.click(); await testBrowserProxy.whenCalled('dialogClose'); - inlineLoginComponent.shadowRoot.querySelector('welcome-page-app') - .shadowRoot.querySelector('#guestModeLink') - .click(); + welcomePageApp.shadowRoot!.querySelector<HTMLElement>( + '#guestModeLink')!.click(); return testBrowserProxy.whenCalled('openGuestWindow'); }); });
diff --git a/chrome/test/data/webui/inline_login/tsconfig_base.json b/chrome/test/data/webui/inline_login/tsconfig_base.json new file mode 100644 index 0000000..4880fbc --- /dev/null +++ b/chrome/test/data/webui/inline_login/tsconfig_base.json
@@ -0,0 +1,12 @@ +{ + "extends": "../../../../../tools/typescript/tsconfig_base.json", + "compilerOptions": { + "typeRoots": [ + "./../../../../../third_party/node/node_modules/@types" + ], + "types": [ + "chai", + "mocha" + ] + } +}
diff --git a/chrome/test/data/webui/side_panel/bookmarks/bookmarks_list_interactive_ui_test.ts b/chrome/test/data/webui/side_panel/bookmarks/bookmarks_list_interactive_ui_test.ts index 9e50389..54ef51e 100644 --- a/chrome/test/data/webui/side_panel/bookmarks/bookmarks_list_interactive_ui_test.ts +++ b/chrome/test/data/webui/side_panel/bookmarks/bookmarks_list_interactive_ui_test.ts
@@ -9,7 +9,7 @@ import {BookmarksApiProxyImpl} from 'chrome://read-later.top-chrome/bookmarks/bookmarks_api_proxy.js'; import {BookmarksListElement} from 'chrome://read-later.top-chrome/bookmarks/bookmarks_list.js'; import {ShoppingListApiProxyImpl} from 'chrome://read-later.top-chrome/bookmarks/commerce/shopping_list_api_proxy.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {down, keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; import {assertEquals, assertFalse, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
diff --git a/chrome/test/data/webui/tab_search/tab_search_media_tabs_test.ts b/chrome/test/data/webui/tab_search/tab_search_media_tabs_test.ts index 6373cd69..f115cdd 100644 --- a/chrome/test/data/webui/tab_search/tab_search_media_tabs_test.ts +++ b/chrome/test/data/webui/tab_search/tab_search_media_tabs_test.ts
@@ -1,219 +1,219 @@ -// Copyright 2020 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'chrome://webui-test/mojo_webui_test_support.js'; - -import {MetricsReporterImpl} from 'chrome://resources/js/metrics_reporter/metrics_reporter.js'; -import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; -import {ProfileData, Tab, TabAlertState, TabSearchApiProxyImpl, TabSearchAppElement} from 'chrome://tab-search.top-chrome/tab_search.js'; -import {assertEquals} from 'chrome://webui-test/chai_assert.js'; -import {MockedMetricsReporter} from 'chrome://webui-test/metrics_reporter/mocked_metrics_reporter.js'; -import {flushTasks} from 'chrome://webui-test/test_util.js'; - -import {createProfileData, createTab, SAMPLE_WINDOW_DATA, SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB, SAMPLE_WINDOW_HEIGHT} from './tab_search_test_data.js'; -import {initLoadTimeDataWithDefaults} from './tab_search_test_helper.js'; -import {TestTabSearchApiProxy} from './test_tab_search_api_proxy.js'; - -suite('TabSearchMediaTabsTest', () => { - let tabSearchApp: TabSearchAppElement; - let testProxy: TestTabSearchApiProxy; - - function verifyTabIds(rows: NodeListOf<HTMLElement>, ids: number[]) { - assertEquals(ids.length, rows.length); - rows.forEach((row, index) => { - assertEquals(ids[index]!.toString(), row.getAttribute('id')); - }); - } - - function queryRows(): NodeListOf<HTMLElement> { - return tabSearchApp.$.tabsList.querySelectorAll( - 'tab-search-item, tab-search-group-item'); - } - - function queryListTitle(): NodeListOf<HTMLElement> { - return tabSearchApp.$.tabsList.querySelectorAll('.list-section-title'); - } - - /** - * @param sampleData A mock data object containing relevant profile data for - * the test. - */ - async function setupTest( - sampleData: ProfileData, - loadTimeOverriddenData?: {[key: string]: number|string|boolean}) { - initLoadTimeDataWithDefaults(loadTimeOverriddenData); - - MetricsReporterImpl.setInstanceForTest(new MockedMetricsReporter()); - - testProxy = new TestTabSearchApiProxy(); - testProxy.setProfileData(sampleData); - TabSearchApiProxyImpl.setInstance(testProxy); - - tabSearchApp = document.createElement('tab-search-app'); - - document.body.innerHTML = ''; - document.body.appendChild(tabSearchApp); - await flushTasks(); - } - - test('Verify initially selected tab is most recently used tab', async () => { - await setupTest( - createProfileData({ - windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB, - }), - {mediaTabsEnabled: true}); - assertEquals(1, tabSearchApp.getSelectedIndex()); - const tabSearchItems = queryRows(); - keyDownOn(tabSearchItems[1]!, 0, [], 'ArrowUp'); - assertEquals(0, tabSearchApp.getSelectedIndex()); - - Object.defineProperty( - document, 'visibilityState', {value: 'hidden', writable: true}); - document.dispatchEvent(new Event('visibilitychange')); - await flushTasks(); - // Note that unlike the 'Verify hiding document resets selection and - // search text' test case, if no search query was originally provided - // onSearchChanged will not be called when hidden and the index is not - // reset until the state is visible again. - assertEquals(-1, tabSearchApp.getSelectedIndex()); - - // The selected tab should again be the most recently used tab. - Object.defineProperty( - document, 'visibilityState', {value: 'visible', writable: true}); - document.dispatchEvent(new Event('visibilitychange')); - await flushTasks(); - assertEquals(1, tabSearchApp.getSelectedIndex()); - - // During search there should be no Audio & Video section and the selected - // index should be 0. - const searchField = tabSearchApp.$.searchField; - searchField.setValue('Google'); - await flushTasks(); - verifyTabIds(queryRows(), [2, 1]); - assertEquals(0, tabSearchApp.getSelectedIndex()); - - // When the search query is reset the initially selected index should also - // be reset. - searchField.setValue(''); - await flushTasks(); - assertEquals(1, tabSearchApp.getSelectedIndex()); - }); - - test('Verify initially selected tab is not the active tab', async () => { - const tabs = [ - createTab({ - active: false, - alertStates: [TabAlertState.kMediaRecording], - index: 0, - tabId: 1, - title: 'Meet', - url: {url: 'https://meet.google.com/'}, - lastActiveTimeTicks: {internalValue: BigInt(4)}, - }), - createTab({ - active: false, - alertStates: [TabAlertState.kAudioPlaying], - index: 1, - tabId: 2, - title: 'Youtube', - url: {url: 'https://youtube.com/'}, - lastActiveTimeTicks: {internalValue: BigInt(3)}, - }), - createTab({ - active: true, - index: 2, - tabId: 3, - title: 'Google', - url: {url: 'https://www.google.com'}, - lastActiveTimeTicks: {internalValue: BigInt(5)}, - }), - createTab({ - active: false, - index: 3, - tabId: 4, - title: 'Example', - url: {url: 'https://www.example.com'}, - lastActiveTimeTicks: {internalValue: BigInt(2)}, - }), - ]; - - await setupTest( - createProfileData({ - windows: [{active: true, height: SAMPLE_WINDOW_HEIGHT, tabs}], - }), - {mediaTabsEnabled: true}); - - // MRU is the tab with Id 3 but since it is the active tab the selected - // index should be the next MRU tab. - assertEquals(0, tabSearchApp.getSelectedIndex()); - }); - - test('Show media tab in Audio & Video section', async () => { - await setupTest( - createProfileData({windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB})); - // One media tab and two non-media tabs. - assertEquals(3, queryRows().length); - // "Audio and Video" and "Open Tabs" section should both exist. - assertEquals(2, queryListTitle().length); - }); - - - test('Tab is no longer media tab', async () => { - await setupTest( - createProfileData({windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB})); - const updatedTab: Tab = createTab({ - alertStates: [], - tabId: 1, - lastActiveTimeTicks: {internalValue: BigInt(5)}, - }); - - const tabUpdateInfo = { - inActiveWindow: true, - tab: updatedTab, - }; - testProxy.getCallbackRouterRemote().tabUpdated(tabUpdateInfo); - await flushTasks(); - // Three non-media tabs. - assertEquals(3, queryRows().length); - // Only "Open Tabs" section should exist. - assertEquals(1, queryListTitle().length); - }); - - - test('Non-media tab becomes media tab', async () => { - await setupTest( - createProfileData({windows: SAMPLE_WINDOW_DATA}), - ); - assertEquals(1, queryListTitle().length); - - const updatedTab: Tab = createTab({ - alertStates: [TabAlertState.kAudioPlaying], - tabId: 5, - lastActiveTimeTicks: {internalValue: BigInt(1)}, - }); - - const tabUpdateInfo = { - inActiveWindow: true, - tab: updatedTab, - }; - testProxy.getCallbackRouterRemote().tabUpdated(tabUpdateInfo); - await flushTasks(); - // One media tab, the rest are non-media tabs. - assertEquals(6, queryRows().length); - // "Audio and Video" and "Open Tabs" section should both exist. - assertEquals(2, queryListTitle().length); - }); - - - test('Search for media tab', async () => { - await setupTest( - createProfileData({windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB})); - const searchField = tabSearchApp.$.searchField; - searchField.setValue('google'); - await flushTasks(); - // No media tabs section when there is a search query. - assertEquals(1, queryListTitle().length); - assertEquals(2, queryRows().length); - }); -}); +// Copyright 2020 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'chrome://webui-test/mojo_webui_test_support.js'; + +import {MetricsReporterImpl} from 'chrome://resources/js/metrics_reporter/metrics_reporter.js'; +import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js'; +import {ProfileData, Tab, TabAlertState, TabSearchApiProxyImpl, TabSearchAppElement} from 'chrome://tab-search.top-chrome/tab_search.js'; +import {assertEquals} from 'chrome://webui-test/chai_assert.js'; +import {MockedMetricsReporter} from 'chrome://webui-test/metrics_reporter/mocked_metrics_reporter.js'; +import {flushTasks} from 'chrome://webui-test/test_util.js'; + +import {createProfileData, createTab, SAMPLE_WINDOW_DATA, SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB, SAMPLE_WINDOW_HEIGHT} from './tab_search_test_data.js'; +import {initLoadTimeDataWithDefaults} from './tab_search_test_helper.js'; +import {TestTabSearchApiProxy} from './test_tab_search_api_proxy.js'; + +suite('TabSearchMediaTabsTest', () => { + let tabSearchApp: TabSearchAppElement; + let testProxy: TestTabSearchApiProxy; + + function verifyTabIds(rows: NodeListOf<HTMLElement>, ids: number[]) { + assertEquals(ids.length, rows.length); + rows.forEach((row, index) => { + assertEquals(ids[index]!.toString(), row.getAttribute('id')); + }); + } + + function queryRows(): NodeListOf<HTMLElement> { + return tabSearchApp.$.tabsList.querySelectorAll( + 'tab-search-item, tab-search-group-item'); + } + + function queryListTitle(): NodeListOf<HTMLElement> { + return tabSearchApp.$.tabsList.querySelectorAll('.list-section-title'); + } + + /** + * @param sampleData A mock data object containing relevant profile data for + * the test. + */ + async function setupTest( + sampleData: ProfileData, + loadTimeOverriddenData?: {[key: string]: number|string|boolean}) { + initLoadTimeDataWithDefaults(loadTimeOverriddenData); + + MetricsReporterImpl.setInstanceForTest(new MockedMetricsReporter()); + + testProxy = new TestTabSearchApiProxy(); + testProxy.setProfileData(sampleData); + TabSearchApiProxyImpl.setInstance(testProxy); + + tabSearchApp = document.createElement('tab-search-app'); + + document.body.innerHTML = ''; + document.body.appendChild(tabSearchApp); + await flushTasks(); + } + + test('Verify initially selected tab is most recently used tab', async () => { + await setupTest( + createProfileData({ + windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB, + }), + {mediaTabsEnabled: true}); + assertEquals(1, tabSearchApp.getSelectedIndex()); + const tabSearchItems = queryRows(); + keyDownOn(tabSearchItems[1]!, 0, [], 'ArrowUp'); + assertEquals(0, tabSearchApp.getSelectedIndex()); + + Object.defineProperty( + document, 'visibilityState', {value: 'hidden', writable: true}); + document.dispatchEvent(new Event('visibilitychange')); + await flushTasks(); + // Note that unlike the 'Verify hiding document resets selection and + // search text' test case, if no search query was originally provided + // onSearchChanged will not be called when hidden and the index is not + // reset until the state is visible again. + assertEquals(-1, tabSearchApp.getSelectedIndex()); + + // The selected tab should again be the most recently used tab. + Object.defineProperty( + document, 'visibilityState', {value: 'visible', writable: true}); + document.dispatchEvent(new Event('visibilitychange')); + await flushTasks(); + assertEquals(1, tabSearchApp.getSelectedIndex()); + + // During search there should be no Audio & Video section and the selected + // index should be 0. + const searchField = tabSearchApp.$.searchField; + searchField.setValue('Google'); + await flushTasks(); + verifyTabIds(queryRows(), [2, 1]); + assertEquals(0, tabSearchApp.getSelectedIndex()); + + // When the search query is reset the initially selected index should also + // be reset. + searchField.setValue(''); + await flushTasks(); + assertEquals(1, tabSearchApp.getSelectedIndex()); + }); + + test('Verify initially selected tab is not the active tab', async () => { + const tabs = [ + createTab({ + active: false, + alertStates: [TabAlertState.kMediaRecording], + index: 0, + tabId: 1, + title: 'Meet', + url: {url: 'https://meet.google.com/'}, + lastActiveTimeTicks: {internalValue: BigInt(4)}, + }), + createTab({ + active: false, + alertStates: [TabAlertState.kAudioPlaying], + index: 1, + tabId: 2, + title: 'Youtube', + url: {url: 'https://youtube.com/'}, + lastActiveTimeTicks: {internalValue: BigInt(3)}, + }), + createTab({ + active: true, + index: 2, + tabId: 3, + title: 'Google', + url: {url: 'https://www.google.com'}, + lastActiveTimeTicks: {internalValue: BigInt(5)}, + }), + createTab({ + active: false, + index: 3, + tabId: 4, + title: 'Example', + url: {url: 'https://www.example.com'}, + lastActiveTimeTicks: {internalValue: BigInt(2)}, + }), + ]; + + await setupTest( + createProfileData({ + windows: [{active: true, height: SAMPLE_WINDOW_HEIGHT, tabs}], + }), + {mediaTabsEnabled: true}); + + // MRU is the tab with Id 3 but since it is the active tab the selected + // index should be the next MRU tab. + assertEquals(0, tabSearchApp.getSelectedIndex()); + }); + + test('Show media tab in Audio & Video section', async () => { + await setupTest( + createProfileData({windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB})); + // One media tab and two non-media tabs. + assertEquals(3, queryRows().length); + // "Audio and Video" and "Open Tabs" section should both exist. + assertEquals(2, queryListTitle().length); + }); + + + test('Tab is no longer media tab', async () => { + await setupTest( + createProfileData({windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB})); + const updatedTab: Tab = createTab({ + alertStates: [], + tabId: 1, + lastActiveTimeTicks: {internalValue: BigInt(5)}, + }); + + const tabUpdateInfo = { + inActiveWindow: true, + tab: updatedTab, + }; + testProxy.getCallbackRouterRemote().tabUpdated(tabUpdateInfo); + await flushTasks(); + // Three non-media tabs. + assertEquals(3, queryRows().length); + // Only "Open Tabs" section should exist. + assertEquals(1, queryListTitle().length); + }); + + + test('Non-media tab becomes media tab', async () => { + await setupTest( + createProfileData({windows: SAMPLE_WINDOW_DATA}), + ); + assertEquals(1, queryListTitle().length); + + const updatedTab: Tab = createTab({ + alertStates: [TabAlertState.kAudioPlaying], + tabId: 5, + lastActiveTimeTicks: {internalValue: BigInt(1)}, + }); + + const tabUpdateInfo = { + inActiveWindow: true, + tab: updatedTab, + }; + testProxy.getCallbackRouterRemote().tabUpdated(tabUpdateInfo); + await flushTasks(); + // One media tab, the rest are non-media tabs. + assertEquals(6, queryRows().length); + // "Audio and Video" and "Open Tabs" section should both exist. + assertEquals(2, queryListTitle().length); + }); + + + test('Search for media tab', async () => { + await setupTest( + createProfileData({windows: SAMPLE_WINDOW_DATA_WITH_MEDIA_TAB})); + const searchField = tabSearchApp.$.searchField; + searchField.setValue('google'); + await flushTasks(); + // No media tabs section when there is a search query. + assertEquals(1, queryListTitle().length); + assertEquals(2, queryRows().length); + }); +});
diff --git a/chrome/test/data/webui/tab_strip/tab_list_test.ts b/chrome/test/data/webui/tab_strip/tab_list_test.ts index ac4203f..872125e 100644 --- a/chrome/test/data/webui/tab_strip/tab_list_test.ts +++ b/chrome/test/data/webui/tab_strip/tab_list_test.ts
@@ -4,7 +4,7 @@ import 'chrome://tab-strip.top-chrome/tab_list.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {TabElement} from 'chrome://tab-strip.top-chrome/tab.js'; import {TabGroupElement} from 'chrome://tab-strip.top-chrome/tab_group.js'; import {setScrollAnimationEnabledForTesting, TabListElement} from 'chrome://tab-strip.top-chrome/tab_list.js';
diff --git a/chrome/test/data/webui/test_store_ts.ts b/chrome/test/data/webui/test_store_ts.ts index 6c15514..1a16d49 100644 --- a/chrome/test/data/webui/test_store_ts.ts +++ b/chrome/test/data/webui/test_store_ts.ts
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {Action, Store} from 'chrome://resources/js/cr/ui/store_ts.js'; +import {Action, Store} from 'chrome://resources/js/store_ts.js'; import {PromiseResolver} from 'chrome://resources/js/promise_resolver.js'; import {assertTrue} from 'chrome://webui-test/chai_assert.js';
diff --git a/chrome/test/enterprise/e2e/.vpython3 b/chrome/test/enterprise/e2e/.vpython3 index f972053a..465370d 100644 --- a/chrome/test/enterprise/e2e/.vpython3 +++ b/chrome/test/enterprise/e2e/.vpython3
@@ -11,8 +11,7 @@ verify_pep425_tag: [ {python: "cp38", abi: "cp38", platform: "manylinux1_x86_64"}, -# TODO(https://crbug.com/1363689): Uncomment when this wheel has been added. -# {python: "cp38", abi: "cp38", platform: "linux_arm64"}, + {python: "cp38", abi: "cp38", platform: "linux_arm64"}, {python: "cp38", abi: "cp38", platform: "macosx_10_10_intel"}, {python: "cp38", abi: "cp38", platform: "macosx_11_0_arm64"}, @@ -162,7 +161,7 @@ wheel: < name: "infra/python/wheels/grpcio/${vpython_platform}" - version: "version:1.39.0" + version: "version:1.44.0" > wheel: <
diff --git a/chromeos/ash/services/assistant/service.cc b/chromeos/ash/services/assistant/service.cc index 30ca376..f4c86e2 100644 --- a/chromeos/ash/services/assistant/service.cc +++ b/chromeos/ash/services/assistant/service.cc
@@ -40,7 +40,6 @@ #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/scope_set.h" -#include "components/user_manager/known_user.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" #include "services/network/public/cpp/shared_url_loader_factory.h" @@ -536,8 +535,8 @@ // Note that this account can either be a regular account using real gaia, // or a fake gaia account. CoreAccountInfo account_info = RetrievePrimaryAccountInfo(); - AccountId account_id = user_manager::known_user::GetAccountId( - account_info.email, account_info.gaia, AccountType::GOOGLE); + AccountId account_id = + AccountId::FromUserEmailGaiaId(account_info.email, account_info.gaia); scoped_ash_session_observer_ = std::make_unique<ScopedAshSessionObserver>(this, account_id); }
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc b/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc index 5b7dcfed..a05609b 100644 --- a/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc +++ b/chromeos/components/quick_answers/public/cpp/quick_answers_state.cc
@@ -25,17 +25,6 @@ // Supported languages of the Quick Answers feature. const std::string kSupportedLanguages[] = {"en", "es", "it", "fr", "pt", "de"}; -bool IsQuickAnswersAllowedForLocale(const std::string& locale, - const std::string& runtime_locale) { - // String literals used in some cases in the array because their - // constant equivalents don't exist in: - // third_party/icu/source/common/unicode/uloc.h - const std::string kAllowedLocales[] = {ULOC_CANADA, ULOC_UK, ULOC_US, - "en_AU", "en_IN", "en_NZ"}; - return base::Contains(kAllowedLocales, locale) || - base::Contains(kAllowedLocales, runtime_locale); -} - std::string ConsentResultTypeToString(ConsentResultType type) { switch (type) { case ConsentResultType::kAllow: @@ -98,13 +87,8 @@ if (resolved_application_locale_.empty()) return; - bool is_eligible = IsQuickAnswersAllowedForLocale( - resolved_application_locale_, icu::Locale::getDefault().getName()); - - if (chromeos::features::IsQuickAnswersForMoreLocalesEnabled()) { - is_eligible = IsSupportedLanguage( - l10n_util::GetLanguage(resolved_application_locale_)); - } + bool is_eligible = + IsSupportedLanguage(l10n_util::GetLanguage(resolved_application_locale_)); if (is_eligible_ == is_eligible) return;
diff --git a/chromeos/components/quick_answers/utils/spell_checker.cc b/chromeos/components/quick_answers/utils/spell_checker.cc index b31bf058..8c45055 100644 --- a/chromeos/components/quick_answers/utils/spell_checker.cc +++ b/chromeos/components/quick_answers/utils/spell_checker.cc
@@ -93,15 +93,13 @@ l10n_util::GetLanguage(QuickAnswersState::Get()->application_locale())); // Add preferred languages if supported. - if (chromeos::features::IsQuickAnswersForMoreLocalesEnabled()) { - auto preferred_languages_list = - base::SplitString(QuickAnswersState::Get()->preferred_languages(), ",", - base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); - for (const std::string& locale : preferred_languages_list) { - auto language = l10n_util::GetLanguage(locale); - if (QuickAnswersState::Get()->IsSupportedLanguage(language)) - languages.insert(language); - } + auto preferred_languages_list = + base::SplitString(QuickAnswersState::Get()->preferred_languages(), ",", + base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); + for (const std::string& locale : preferred_languages_list) { + auto language = l10n_util::GetLanguage(locale); + if (QuickAnswersState::Get()->IsSupportedLanguage(language)) + languages.insert(language); } spellcheck_languages_.clear();
diff --git a/chromeos/components/quick_answers/utils/spell_checker_unittest.cc b/chromeos/components/quick_answers/utils/spell_checker_unittest.cc index c7364064..f6e0ed5 100644 --- a/chromeos/components/quick_answers/utils/spell_checker_unittest.cc +++ b/chromeos/components/quick_answers/utils/spell_checker_unittest.cc
@@ -125,10 +125,6 @@ } TEST_F(SpellCheckerTest, ShouldNotSetupWithUnsupportedApplicationLocale) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature( - chromeos::features::kQuickAnswersForMoreLocales); - EXPECT_FALSE(fake_quick_answers_state()->prefs_initialized()); EXPECT_FALSE(spell_checker()->GetSpellcheckLanguagesForTesting().size()); @@ -169,11 +165,7 @@ "en"); } -TEST_F(SpellCheckerTest, ShouldSetupWithPreferredLanguagesWithFlag) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature( - chromeos::features::kQuickAnswersForMoreLocales); - +TEST_F(SpellCheckerTest, ShouldSetupWithPreferredLanguages) { EXPECT_FALSE(fake_quick_answers_state()->prefs_initialized()); EXPECT_FALSE(spell_checker()->GetSpellcheckLanguagesForTesting().size()); @@ -200,11 +192,7 @@ "it"); } -TEST_F(SpellCheckerTest, ShouldFilterUnsupportedPreferredLanguagesWithFlag) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature( - chromeos::features::kQuickAnswersForMoreLocales); - +TEST_F(SpellCheckerTest, ShouldFilterUnsupportedPreferredLanguages) { EXPECT_FALSE(fake_quick_answers_state()->prefs_initialized()); EXPECT_FALSE(spell_checker()->GetSpellcheckLanguagesForTesting().size());
diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc index c638dcf..6906bdc2 100644 --- a/chromeos/constants/chromeos_features.cc +++ b/chromeos/constants/chromeos_features.cc
@@ -53,11 +53,6 @@ "QuickAnswersV2SettingsSubToggle", base::FEATURE_DISABLED_BY_DEFAULT); -// Enables Quick Answers for more locales. -BASE_FEATURE(kQuickAnswersForMoreLocales, - "QuickAnswersForMoreLocales", - base::FEATURE_ENABLED_BY_DEFAULT); - bool IsCloudGamingDeviceEnabled() { #if BUILDFLAG(IS_CHROMEOS_LACROS) return chromeos::BrowserParamsProxy::Get()->IsCloudGamingDevice(); @@ -78,8 +73,4 @@ return base::FeatureList::IsEnabled(kQuickAnswersV2SettingsSubToggle); } -bool IsQuickAnswersForMoreLocalesEnabled() { - return base::FeatureList::IsEnabled(kQuickAnswersForMoreLocales); -} - } // namespace chromeos::features
diff --git a/chromeos/constants/chromeos_features.h b/chromeos/constants/chromeos_features.h index 480b552..9277b9dd 100644 --- a/chromeos/constants/chromeos_features.h +++ b/chromeos/constants/chromeos_features.h
@@ -31,8 +31,6 @@ BASE_DECLARE_FEATURE(kDisableQuickAnswersV2Translation); COMPONENT_EXPORT(CHROMEOS_CONSTANTS) BASE_DECLARE_FEATURE(kQuickAnswersV2SettingsSubToggle); -COMPONENT_EXPORT(CHROMEOS_CONSTANTS) -BASE_DECLARE_FEATURE(kQuickAnswersForMoreLocales); // Keep alphabetized. @@ -43,8 +41,6 @@ bool IsQuickAnswersV2SettingsSubToggleEnabled(); COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsQuickAnswersAlwaysTriggerForSingleWord(); -COMPONENT_EXPORT(CHROMEOS_CONSTANTS) -bool IsQuickAnswersForMoreLocalesEnabled(); } // namespace features } // namespace chromeos
diff --git a/components/browsing_data/content/cache_storage_helper.cc b/components/browsing_data/content/cache_storage_helper.cc index d31ef1d..6e7f7b9 100644 --- a/components/browsing_data/content/cache_storage_helper.cc +++ b/components/browsing_data/content/cache_storage_helper.cc
@@ -26,12 +26,12 @@ void GetAllStorageKeysInfoForCacheStorageCallback( CacheStorageHelper::FetchCallback callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_info) { + std::vector<storage::mojom::StorageUsageInfoPtr> usage_info) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!callback.is_null()); std::list<content::StorageUsageInfo> result; - for (const storage::mojom::StorageUsageInfoV2Ptr& usage : usage_info) { + for (const storage::mojom::StorageUsageInfoPtr& usage : usage_info) { if (!HasWebScheme(usage->storage_key.origin().GetURL())) continue; // Non-websafe state is not considered browsing data. result.emplace_back(usage->storage_key, usage->total_size_bytes,
diff --git a/components/browsing_data/content/indexed_db_helper.cc b/components/browsing_data/content/indexed_db_helper.cc index 9d809bb9..0a968b9 100644 --- a/components/browsing_data/content/indexed_db_helper.cc +++ b/components/browsing_data/content/indexed_db_helper.cc
@@ -51,7 +51,7 @@ void IndexedDBHelper::IndexedDBUsageInfoReceived( FetchCallback callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usages) { + std::vector<storage::mojom::StorageUsageInfoPtr> usages) { DCHECK(!callback.is_null()); std::list<content::StorageUsageInfo> result; for (const auto& usage : usages) {
diff --git a/components/browsing_data/content/indexed_db_helper.h b/components/browsing_data/content/indexed_db_helper.h index 3f52900..eae9e27 100644 --- a/components/browsing_data/content/indexed_db_helper.h +++ b/components/browsing_data/content/indexed_db_helper.h
@@ -62,7 +62,7 @@ // Enumerates all indexed database files in the IndexedDB thread. void IndexedDBUsageInfoReceived( FetchCallback callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usages); + std::vector<storage::mojom::StorageUsageInfoPtr> usages); }; // This class is an implementation of IndexedDBHelper that does
diff --git a/components/browsing_data/content/local_storage_helper_browsertest.cc b/components/browsing_data/content/local_storage_helper_browsertest.cc index 055a2fc..3f064d3 100644 --- a/components/browsing_data/content/local_storage_helper_browsertest.cc +++ b/components/browsing_data/content/local_storage_helper_browsertest.cc
@@ -146,10 +146,10 @@ delete_run_loop.Run(); // Ensure the origin has been deleted, but other origins are intact. - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_infos; + std::vector<storage::mojom::StorageUsageInfoPtr> usage_infos; base::RunLoop get_usage_run_loop; GetLocalStorageControl()->GetUsage(base::BindLambdaForTesting( - [&](std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_infos_in) { + [&](std::vector<storage::mojom::StorageUsageInfoPtr> usage_infos_in) { usage_infos.swap(usage_infos_in); get_usage_run_loop.Quit(); }));
diff --git a/components/exo/surface.cc b/components/exo/surface.cc index 3167b51..340216b 100644 --- a/components/exo/surface.cc +++ b/components/exo/surface.cc
@@ -1444,7 +1444,7 @@ viewport_to_target_matrix.postScale(device_scale_factor, device_scale_factor); gfx::Transform quad_to_target_transform(buffer_transform_); - quad_to_target_transform.ConcatTransform( + quad_to_target_transform.PostConcat( gfx::SkMatrixToTransform(viewport_to_target_matrix)); bool are_contents_opaque =
diff --git a/components/exo/wayland/zaura_shell.cc b/components/exo/wayland/zaura_shell.cc index 72b0700..2a18705 100644 --- a/components/exo/wayland/zaura_shell.cc +++ b/components/exo/wayland/zaura_shell.cc
@@ -72,7 +72,7 @@ gfx::Transform transform_relative_to_screen; DCHECK(window->layer()->GetTargetTransformRelativeTo( window->GetRootWindow()->layer(), &transform_relative_to_screen)); - transform_relative_to_screen.ConcatTransform( + transform_relative_to_screen.PostConcat( window->GetRootWindow()->layer()->GetTargetTransform()); return transform_relative_to_screen.Preserves2dAxisAlignment(); }
diff --git a/components/flags_ui/resources/flags.ts b/components/flags_ui/resources/flags.ts index 142c685..fa59079 100644 --- a/components/flags_ui/resources/flags.ts +++ b/components/flags_ui/resources/flags.ts
@@ -11,7 +11,7 @@ import {assert} from 'chrome://resources/js/assert_ts.js'; import {isIOS, sendWithPromise} from 'chrome://resources/js/cr.m.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {PromiseResolver} from 'chrome://resources/js/promise_resolver.js'; import {$} from 'chrome://resources/js/util.js';
diff --git a/components/history_clusters/core/config.cc b/components/history_clusters/core/config.cc index 640f185b..805d44b 100644 --- a/components/history_clusters/core/config.cc +++ b/components/history_clusters/core/config.cc
@@ -264,7 +264,7 @@ DCHECK_GE(has_page_title_ranking_weight, 0.0f); } - // The `kJourneysCategoryFiltering` feature and child parans. + // The `kJourneysCategoryFiltering` feature and child params. { should_use_categories_to_filter_on_prominent_ui_surfaces = base::FeatureList::IsEnabled( @@ -317,6 +317,11 @@ "content_clustering_intersection_threshold", cluster_interaction_threshold); + content_cluster_using_cosine_similarity = GetFieldTrialParamByFeatureAsBool( + features::kOnDeviceClusteringContentClustering, + "use_content_clustering_cosine_similarity", + content_cluster_using_cosine_similarity); + exclude_entities_that_have_no_collections_from_content_clustering = GetFieldTrialParamByFeatureAsBool( features::kOnDeviceClusteringContentClustering,
diff --git a/components/history_clusters/core/config.h b/components/history_clusters/core/config.h index ec025aa..33b1f54 100644 --- a/components/history_clusters/core/config.h +++ b/components/history_clusters/core/config.h
@@ -272,16 +272,17 @@ float content_visibility_threshold = 0.7; // Returns true if content clustering should use the intersection similarity - // score. Note, if this is used, the threshold used for clustering by content - // score should be < .5 (see ContentClusteringSimilarityThreshold above) or - // the weightings between entity and category content similarity scores should - // be adjusted. + // score. bool content_cluster_on_intersection_similarity = false; // Returns the threshold, in terms of the number of overlapping keywords, to // use when clustering based on intersection score. int cluster_interaction_threshold = 2; + // Returns true if content clustering should use the cosine similarity + // algorithm. + bool content_cluster_using_cosine_similarity = false; + // Returns whether we should exclude entities that do not have associated // collections from content clustering. bool exclude_entities_that_have_no_collections_from_content_clustering =
diff --git a/components/history_clusters/core/content_annotations_cluster_processor.cc b/components/history_clusters/core/content_annotations_cluster_processor.cc index 7e89169..a1c1f55 100644 --- a/components/history_clusters/core/content_annotations_cluster_processor.cc +++ b/components/history_clusters/core/content_annotations_cluster_processor.cc
@@ -4,9 +4,10 @@ #include "components/history_clusters/core/content_annotations_cluster_processor.h" +#include <math.h> + #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" -#include "base/strings/utf_string_conversions.h" #include "components/history_clusters/core/config.h" #include "components/optimization_guide/core/entity_metadata.h" @@ -14,24 +15,62 @@ namespace { -// Return the Jaccard Similarity between two sets of -// strings. -float CalculateJaccardSimilarity( - const base::flat_set<std::u16string>& cluster1, - const base::flat_set<std::u16string>& cluster2) { +float CalculateMagnitude(const base::flat_map<std::string, float>& cluster) { + float magnitude = 0.0; + for (const auto& token : cluster) { + magnitude += token.second * token.second; + } + return sqrt(magnitude); +} + +// Returns the cosine similarity between two occurrence maps. +float CalculateCosineSimiliarity( + const base::flat_map<std::string, float>& cluster1, + const base::flat_map<std::string, float>& cluster2) { // If either cluster is empty, just say that they are different. if (cluster1.empty() || cluster2.empty()) return 0.0; - base::flat_set<std::u16string> cluster_union; + base::flat_set<std::string> all_words; + for (const auto& token : cluster1) { + all_words.insert(token.first); + } + for (const auto& token : cluster2) { + all_words.insert(token.first); + } + + float dot_product = 0.0; + for (const auto& word : all_words) { + float cluster1_value = cluster1.contains(word) ? cluster1.at(word) : 0.0; + float cluster2_value = cluster2.contains(word) ? cluster2.at(word) : 0.0; + dot_product += cluster1_value * cluster2_value; + } + float mag_cluster1 = CalculateMagnitude(cluster1); + float mag_cluster2 = CalculateMagnitude(cluster2); + + return dot_product / (mag_cluster1 * mag_cluster2); +} + +// Return the Jaccard Similarity between two sets of +// strings. +float CalculateJaccardSimilarity( + const base::flat_map<std::string, float>& cluster1, + const base::flat_map<std::string, float>& cluster2) { + // If either cluster is empty, just say that they are different. + if (cluster1.empty() || cluster2.empty()) + return 0.0; + + base::flat_set<std::string> cluster_union; int intersection_size = 0; for (const auto& token : cluster1) { - if (cluster2.find(token) != cluster2.end()) { + if (cluster2.find(token.first) != cluster2.end()) { intersection_size++; } - cluster_union.insert(token); + cluster_union.insert(token.first); } - cluster_union.insert(cluster2.begin(), cluster2.end()); + for (const auto& token : cluster2) { + cluster_union.insert(token.first); + } return cluster_union.empty() ? 0.0 @@ -42,15 +81,15 @@ // Returns 1 if the clusters share more than a threshold number of tokens in // common and 0 otherwise. float CalculateIntersectionSimilarity( - const base::flat_set<std::u16string>& cluster1, - const base::flat_set<std::u16string>& cluster2) { + const base::flat_map<std::string, float>& cluster1, + const base::flat_map<std::string, float>& cluster2) { // If either clusters is empty, just say that they're different. if (cluster1.empty() || cluster2.empty()) return 0.0; int intersection_size = 0; for (const auto& token : cluster1) { - if (cluster2.find(token) != cluster2.end()) { + if (cluster2.find(token.first) != cluster2.end()) { intersection_size++; } } @@ -59,10 +98,13 @@ } // Returns the similarity score based on the configured similarity metric. -float CalculateSimilarityScore(const base::flat_set<std::u16string>& cluster1, - const base::flat_set<std::u16string>& cluster2) { +float CalculateSimilarityScore( + const base::flat_map<std::string, float>& cluster1, + const base::flat_map<std::string, float>& cluster2) { if (GetConfig().content_cluster_on_intersection_similarity) return CalculateIntersectionSimilarity(cluster1, cluster2); + if (GetConfig().content_cluster_using_cosine_similarity) + return CalculateCosineSimiliarity(cluster1, cluster2); return CalculateJaccardSimilarity(cluster1, cluster2); } @@ -78,9 +120,10 @@ std::vector<history::Cluster> ContentAnnotationsClusterProcessor::ProcessClusters( const std::vector<history::Cluster>& clusters) { - std::vector<base::flat_set<std::u16string>> bows(clusters.size()); + std::vector<base::flat_map<std::string, float>> occurrence_maps( + clusters.size()); for (size_t i = 0; i < clusters.size(); i++) { - bows[i] = CreateBoWForCluster(clusters.at(i)); + occurrence_maps[i] = CreateOccurrenceMapForCluster(clusters.at(i)); } // Now cluster on the entries in each BoW between clusters. @@ -97,7 +140,8 @@ if (merged_cluster_indices.find(j) != merged_cluster_indices.end()) { continue; } - float entity_similarity = CalculateSimilarityScore(bows[i], bows[j]); + float entity_similarity = + CalculateSimilarityScore(occurrence_maps[i], occurrence_maps[j]); if (entity_similarity > GetConfig().content_clustering_similarity_threshold) { // Add the visits to the aggregated cluster. @@ -112,10 +156,10 @@ return aggregated_clusters; } -base::flat_set<std::u16string> -ContentAnnotationsClusterProcessor::CreateBoWForCluster( +base::flat_map<std::string, float> +ContentAnnotationsClusterProcessor::CreateOccurrenceMapForCluster( const history::Cluster& cluster) { - base::flat_set<std::u16string> bag_of_words; + base::flat_map<std::string, float> occurrence_map; for (const auto& visit : cluster.visits) { for (const auto& entity : visit.annotated_visit.content_annotations.model_annotations.entities) { @@ -149,10 +193,10 @@ } } - bag_of_words.insert(base::UTF8ToUTF16(entity.id)); + occurrence_map[entity.id] += 1.0; } } - return bag_of_words; + return occurrence_map; } } // namespace history_clusters
diff --git a/components/history_clusters/core/content_annotations_cluster_processor.h b/components/history_clusters/core/content_annotations_cluster_processor.h index 96d64e9..dd0d50a 100644 --- a/components/history_clusters/core/content_annotations_cluster_processor.h +++ b/components/history_clusters/core/content_annotations_cluster_processor.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/containers/flat_set.h" +#include "base/containers/flat_map.h" #include "components/history_clusters/core/cluster_processor.h" namespace optimization_guide { @@ -30,9 +30,9 @@ const std::vector<history::Cluster>& clusters) override; private: - // Creates a bag of words for `cluster` of the set - // of unique entities, respectively, from each visit. - base::flat_set<std::u16string> CreateBoWForCluster( + // Creates an occurrence map for `cluster` of the set + // of entities from each visit. + base::flat_map<std::string, float> CreateOccurrenceMapForCluster( const history::Cluster& cluster); // The map from entity ID to entity metadata.
diff --git a/components/history_clusters/core/content_annotations_cluster_processor_unittest.cc b/components/history_clusters/core/content_annotations_cluster_processor_unittest.cc index ac255c0..67cce06 100644 --- a/components/history_clusters/core/content_annotations_cluster_processor_unittest.cc +++ b/components/history_clusters/core/content_annotations_cluster_processor_unittest.cc
@@ -156,6 +156,113 @@ ElementsAre(testing::VisitResult(12, 1.0)))); } +class ContentAnnotationsClusterProcessorCosineSimilarityTest + : public ContentAnnotationsClusterProcessorTest { + public: + ContentAnnotationsClusterProcessorCosineSimilarityTest() { + config_.content_clustering_enabled = true; + config_.content_cluster_on_intersection_similarity = false; + config_.content_clustering_similarity_threshold = 0.5; + config_.exclude_entities_that_have_no_collections_from_content_clustering = + false; + config_.collections_to_block_from_content_clustering = {}; + config_.content_cluster_using_cosine_similarity = true; + SetConfigForTesting(config_); + } + + private: + Config config_; +}; + +TEST_F(ContentAnnotationsClusterProcessorCosineSimilarityTest, AboveThreshold) { + std::vector<history::Cluster> clusters; + + history::AnnotatedVisit visit = + testing::CreateDefaultAnnotatedVisit(1, GURL("https://github.com/")); + visit.content_annotations.model_annotations.entities = {{"github", 1}}; + visit.content_annotations.model_annotations.categories = {{"category", 1}}; + history::AnnotatedVisit visit2 = + testing::CreateDefaultAnnotatedVisit(2, GURL("https://google.com/")); + visit2.content_annotations.model_annotations.entities = {{"github", 1}}; + history::AnnotatedVisit visit4 = + testing::CreateDefaultAnnotatedVisit(4, GURL("https://github.com/")); + visit4.content_annotations.model_annotations.entities = {{"github", 1}}; + history::Cluster cluster1; + cluster1.visits = {testing::CreateClusterVisit(visit), + testing::CreateClusterVisit(visit2), + testing::CreateClusterVisit(visit4)}; + clusters.push_back(cluster1); + + // After the context clustering, visit5 will not be in the same cluster as + // visit, visit2, and visit4 but all of the visits have the same entity + // so they will be clustered in the content pass. + history::AnnotatedVisit visit5 = testing::CreateDefaultAnnotatedVisit( + 10, GURL("https://nonexistentreferrer.com/")); + visit5.content_annotations.model_annotations.entities = {{"github", 1}}; + visit5.content_annotations.model_annotations.categories = {{"category", 1}}; + history::Cluster cluster2; + cluster2.visits = {testing::CreateClusterVisit(visit5)}; + clusters.push_back(cluster2); + + std::vector<history::Cluster> result_clusters = ProcessClusters(clusters); + EXPECT_THAT( + testing::ToVisitResults(result_clusters), + ElementsAre(ElementsAre( + testing::VisitResult(1, 1.0), testing::VisitResult(2, 1.0), + testing::VisitResult(4, 1.0), testing::VisitResult(10, 1.0)))); + ASSERT_EQ(result_clusters.size(), 1u); +} + +TEST_F(ContentAnnotationsClusterProcessorCosineSimilarityTest, BelowThreshold) { + std::vector<history::Cluster> clusters; + + history::AnnotatedVisit visit = + testing::CreateDefaultAnnotatedVisit(1, GURL("https://github.com/")); + visit.content_annotations.model_annotations.entities = {{"github", 1}}; + visit.content_annotations.model_annotations.categories = {{"category", 1}}; + + history::AnnotatedVisit visit2 = + testing::CreateDefaultAnnotatedVisit(2, GURL("https://google.com/")); + visit2.visit_row.visit_duration = base::Seconds(20); + history::Cluster cluster1; + cluster1.visits = {testing::CreateClusterVisit(visit), + testing::CreateClusterVisit(visit2)}; + clusters.push_back(cluster1); + + // After the context clustering, visit4 will not be in the same cluster as + // visit and visit2 but should be clustered together since they have the same + // entities. + history::AnnotatedVisit visit4 = + testing::CreateDefaultAnnotatedVisit(4, GURL("https://github.com/")); + visit4.content_annotations.model_annotations.entities = {{"github", 1}}; + history::Cluster cluster2; + cluster2.visits = {testing::CreateClusterVisit(visit4)}; + clusters.push_back(cluster2); + + // This visit has no entities and shouldn't be grouped with the others. + history::AnnotatedVisit visit6 = + testing::CreateDefaultAnnotatedVisit(11, GURL("https://othervisit.com/")); + history::Cluster cluster4; + cluster4.visits = {testing::CreateClusterVisit(visit6)}; + clusters.push_back(cluster4); + + // This visit has no content annotations and shouldn't be grouped with the + // others. + history::AnnotatedVisit visit7 = testing::CreateDefaultAnnotatedVisit( + 12, GURL("https://nocontentannotations.com/")); + history::Cluster cluster5; + cluster5.visits = {testing::CreateClusterVisit(visit7)}; + clusters.push_back(cluster5); + + std::vector<history::Cluster> result_clusters = ProcessClusters(clusters); + EXPECT_THAT(testing::ToVisitResults(result_clusters), + ElementsAre(ElementsAre(testing::VisitResult(1, 1.0), + testing::VisitResult(2, 1.0), + testing::VisitResult(4, 1.0)), + ElementsAre(testing::VisitResult(11, 1.0)), + ElementsAre(testing::VisitResult(12, 1.0)))); +} + class ContentAnnotationsClusterProcessorIntersectionMetricTest : public ContentAnnotationsClusterProcessorTest { public:
diff --git a/components/management/resources/management.html b/components/management/resources/management.html index 389a77f1..969e8c4 100644 --- a/components/management/resources/management.html +++ b/components/management/resources/management.html
@@ -9,7 +9,6 @@ <!-- TODO(crbug.com/487000): Remove this once injected by web. --> <script src="chrome://resources/js/ios/web_ui.js"></script> <script src="chrome://resources/js/load_time_data_deprecated.js"></script> - <script src="chrome://resources/js/util_deprecated.js"></script> <script src="strings.js"></script> <script src="management.js"></script>
diff --git a/components/management/resources/management.js b/components/management/resources/management.js index 2fe28b22..cc7c824 100644 --- a/components/management/resources/management.js +++ b/components/management/resources/management.js
@@ -4,8 +4,8 @@ document.addEventListener('DOMContentLoaded', function() { if (isManaged()) { - $('managed-info').classList.remove('hidden'); + document.body.querySelector('#managed-info').classList.remove('hidden'); } else { - $('unmanaged-info').classList.remove('hidden'); + document.body.querySelector('#unmanaged-info').classList.remove('hidden'); } });
diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc index 8bb2e5f9..8ce08e7 100644 --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc
@@ -303,7 +303,9 @@ // Treat javascript: scheme queries followed by things that are unlikely to // be code as UNKNOWN, rather than script to execute (URL). - if (RE2::FullMatch(base::UTF16ToUTF8(text), "(?i)javascript:([^;=().\"]*)")) { + if (base::EqualsCaseInsensitiveASCII(parsed_scheme_utf8, + url::kJavaScriptScheme) && + RE2::FullMatch(base::UTF16ToUTF8(text), "(?i)javascript:([^;=().\"]*)")) { return metrics::OmniboxInputType::UNKNOWN; }
diff --git a/components/omnibox/browser/clipboard_provider.cc b/components/omnibox/browser/clipboard_provider.cc index b897704..482da72 100644 --- a/components/omnibox/browser/clipboard_provider.cc +++ b/components/omnibox/browser/clipboard_provider.cc
@@ -42,9 +42,10 @@ const size_t kMaxClipboardSuggestionShownNumTimesSimpleSize = 20; -// Clipboard suggestions should be placed above search and url suggestions -// (including MostVisited tiles), but below query tiles. -const int kClipboardMatchRelevanceScore = 1501; +// Clipboard suggestion is placed in a dedicated SECTION_MOBILE_VERBATIM +// The section is shared with Verbatim Match, and Clipboard should be +// placed directly below, so its relative relevance score must be lower. +const int kClipboardMatchRelevanceScore = 1; bool IsMatchDeletionEnabled() { return base::FeatureList::IsEnabled( @@ -119,6 +120,13 @@ } } +// Builds SuggestionGroup data used to decide where and how to present related +// suggestions. +omnibox::SuggestionGroup BuildSuggestionGroup() { + omnibox::SuggestionGroup suggestion_group; + suggestion_group.set_section(omnibox::SECTION_MOBILE_VERBATIM); + return suggestion_group; +} } // namespace ClipboardProvider::ClipboardProvider(AutocompleteProviderClient* client, @@ -263,6 +271,8 @@ clipboard_contents_age); matches_.push_back(match); + suggestion_groups_map_.emplace(omnibox::GROUP_MOBILE_CLIPBOARD, + BuildSuggestionGroup()); } bool ClipboardProvider::TemplateURLSupportsTextSearch() { @@ -447,6 +457,7 @@ IsMatchDeletionEnabled(), AutocompleteMatchType::CLIPBOARD_URL); + match.suggestion_group_id = omnibox::GROUP_MOBILE_CLIPBOARD; match.description.assign(l10n_util::GetStringUTF16(IDS_LINK_FROM_CLIPBOARD)); if (!match.description.empty()) match.description_class.push_back({0, ACMatchClassification::NONE}); @@ -468,6 +479,7 @@ IsMatchDeletionEnabled(), AutocompleteMatchType::CLIPBOARD_TEXT); + match.suggestion_group_id = omnibox::GROUP_MOBILE_CLIPBOARD; match.description.assign(l10n_util::GetStringUTF16(IDS_TEXT_FROM_CLIPBOARD)); if (!match.description.empty()) match.description_class.push_back({0, ACMatchClassification::NONE}); @@ -491,6 +503,7 @@ IsMatchDeletionEnabled(), AutocompleteMatchType::CLIPBOARD_IMAGE); + match.suggestion_group_id = omnibox::GROUP_MOBILE_CLIPBOARD; match.description.assign(l10n_util::GetStringUTF16(IDS_IMAGE_FROM_CLIPBOARD)); if (!match.description.empty()) match.description_class.push_back({0, ACMatchClassification::NONE});
diff --git a/components/omnibox/browser/most_visited_sites_provider.cc b/components/omnibox/browser/most_visited_sites_provider.cc index a5ea4ae..7d86402 100644 --- a/components/omnibox/browser/most_visited_sites_provider.cc +++ b/components/omnibox/browser/most_visited_sites_provider.cc
@@ -24,8 +24,9 @@ namespace { // The relevance score for suggest tiles. -// Suggest tiles should be positioned below the Query Tiles object. -constexpr const int kMostVisitedTilesRelevance = 1500; +// Suggest tiles are placed in a dedicated SECTION_MOBILE_MOST_VISITED +// making its relative relevance score not important. +constexpr const int kMostVisitedTilesRelevance = 1; constexpr const int kMaxRecordedTileIndex = 15; constexpr char kHistogramTileTypeCountSearch[] = @@ -68,6 +69,7 @@ match.description_class = ClassifyTermMatches({}, match.description.length(), 0, ACMatchClassification::NONE); + match.suggestion_group_id = omnibox::GROUP_MOBILE_MOST_VISITED; return match; } @@ -130,6 +132,13 @@ return true; } +// Builds SuggestionGroup data used to decide where and how to present related +// suggestions. +omnibox::SuggestionGroup BuildSuggestionGroup() { + omnibox::SuggestionGroup suggestion_group; + suggestion_group.set_section(omnibox::SECTION_MOBILE_MOST_VISITED); + return suggestion_group; +} } // namespace void MostVisitedSitesProvider::Start(const AutocompleteInput& input, @@ -164,7 +173,6 @@ void MostVisitedSitesProvider::Stop(bool clear_cached_results, bool due_to_user_inactivity) { AutocompleteProvider::Stop(clear_cached_results, due_to_user_inactivity); - request_weak_ptr_factory_.InvalidateWeakPtrs(); } @@ -187,8 +195,11 @@ void MostVisitedSitesProvider::OnMostVisitedUrlsAvailable( const history::MostVisitedURLList& urls) { done_ = true; - if (BuildTileSuggest(this, client_, urls, matches_)) + if (BuildTileSuggest(this, client_, urls, matches_)) { + suggestion_groups_map_.emplace(omnibox::GROUP_MOBILE_MOST_VISITED, + BuildSuggestionGroup()); NotifyListeners(true); + } } bool MostVisitedSitesProvider::AllowMostVisitedSitesSuggestions(
diff --git a/components/omnibox/browser/suggestion_group.proto b/components/omnibox/browser/suggestion_group.proto index dae369f..ef86204b 100644 --- a/components/omnibox/browser/suggestion_group.proto +++ b/components/omnibox/browser/suggestion_group.proto
@@ -19,20 +19,32 @@ // The default section. Any group with this section is placed above all other // groups. Must not be removed or renumbered and must have the lowest value. SECTION_DEFAULT = 0; + + // Mobile-specific auxiliary suggestions. These suggestions are sourced on + // device, and appear above any other content. + // SECTION_MOBILE_VERBATIM hosts: + // - Search Ready Omnibox / Verbatim match + // - Clipboard suggestions + SECTION_MOBILE_VERBATIM = 1; + // SECTION_MOBILE_MOST_VISITED hosts a horizontal carousel with: + // - Most Visited Tiles + // - Organic Repeatable Queries + SECTION_MOBILE_MOST_VISITED = 2; + // A contiguous range reserved for remote zero-prefix suggestions. // The sections are dynamically assigned to the groups found in the server // response based on the order in which they appear in the results. // Accommodates up to 10 distinct suggestion groups in the server response. - SECTION_REMOTE_ZPS_1 = 1; - SECTION_REMOTE_ZPS_2 = 2; - SECTION_REMOTE_ZPS_3 = 3; - SECTION_REMOTE_ZPS_4 = 4; - SECTION_REMOTE_ZPS_5 = 5; - SECTION_REMOTE_ZPS_6 = 6; - SECTION_REMOTE_ZPS_7 = 7; - SECTION_REMOTE_ZPS_8 = 8; - SECTION_REMOTE_ZPS_9 = 9; - SECTION_REMOTE_ZPS_10 = 10; + SECTION_REMOTE_ZPS_1 = 3; + SECTION_REMOTE_ZPS_2 = 4; + SECTION_REMOTE_ZPS_3 = 5; + SECTION_REMOTE_ZPS_4 = 6; + SECTION_REMOTE_ZPS_5 = 7; + SECTION_REMOTE_ZPS_6 = 8; + SECTION_REMOTE_ZPS_7 = 9; + SECTION_REMOTE_ZPS_8 = 10; + SECTION_REMOTE_ZPS_9 = 11; + SECTION_REMOTE_ZPS_10 = 12; } // Contains information about a suggestion group.
diff --git a/components/omnibox/browser/zero_suggest_verbatim_match_provider.cc b/components/omnibox/browser/zero_suggest_verbatim_match_provider.cc index 65a2437e..4f8508c5 100644 --- a/components/omnibox/browser/zero_suggest_verbatim_match_provider.cc +++ b/components/omnibox/browser/zero_suggest_verbatim_match_provider.cc
@@ -14,9 +14,10 @@ #include "components/url_formatter/url_formatter.h" namespace { -// The relevance score for verbatim match. -// Must outrank the QueryTiles relevance score. -const int kVerbatimMatchRelevanceScore = 1600; +// Verbatim Match is placed in a dedicated SECTION_MOBILE_VERBATIM +// This section may be occupied only by Clipboard suggestion on +// so the relevance score here must outrank this of the Clipboard. +const int kVerbatimMatchRelevanceScore = 2; // Returns whether specific context is eligible for a verbatim match. // Only offer verbatim match on a site visit and SRP (no NTP etc). @@ -32,6 +33,13 @@ context == metrics::OmniboxEventProto::OTHER; } +// Builds SuggestionGroup data used to decide where and how to present related +// suggestions. +omnibox::SuggestionGroup BuildSuggestionGroup() { + omnibox::SuggestionGroup group_details; + group_details.set_section(omnibox::SECTION_MOBILE_VERBATIM); + return group_details; +} } // namespace ZeroSuggestVerbatimMatchProvider::ZeroSuggestVerbatimMatchProvider( @@ -46,10 +54,9 @@ if (!IsVerbatimMatchEligible(input.current_page_classification())) return; - // Only offer verbatim match after the user just focused the Omnibox, - // or if the input field is empty. - if (input.focus_type() == metrics::OmniboxFocusType::INTERACTION_DEFAULT || - input.focus_type() == metrics::OmniboxFocusType::INTERACTION_CLOBBER) + // Only offer verbatim match after the user just focused the Omnibox on NTP, + // SRP, or existing website view, or if the input field is empty. + if (input.focus_type() == metrics::OmniboxFocusType::INTERACTION_DEFAULT) return; // For consistency with other zero-prefix providers. @@ -73,6 +80,7 @@ input.current_title(), kVerbatimMatchRelevanceScore); // Make sure the URL is formatted the same was as most visited sites. auto format_types = AutocompleteMatch::GetFormatTypes(false, false); + match.suggestion_group_id = omnibox::GROUP_MOBILE_SEARCH_READY_OMNIBOX; match.contents = url_formatter::FormatUrl(page_url, format_types, base::UnescapeRule::SPACES, nullptr, nullptr, nullptr); @@ -95,4 +103,6 @@ match.provider = this; matches_.push_back(match); + suggestion_groups_map_.emplace(omnibox::GROUP_MOBILE_SEARCH_READY_OMNIBOX, + BuildSuggestionGroup()); }
diff --git a/components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc b/components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc index c1f3b638..07b5729 100644 --- a/components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc +++ b/components/omnibox/browser/zero_suggest_verbatim_match_provider_unittest.cc
@@ -145,14 +145,14 @@ // test. As a result, the test would validate what the mocks fill in. } -TEST_P(ZeroSuggestVerbatimMatchProviderTest, NoVerbatimMatchOnClearInput) { +TEST_P(ZeroSuggestVerbatimMatchProviderTest, OffersVerbatimMatchOnClobber) { std::string url("https://www.wired.com/"); AutocompleteInput input(std::u16string(), // Note: empty input. GetParam(), TestSchemeClassifier()); input.set_current_url(GURL(url)); input.set_focus_type(metrics::OmniboxFocusType::INTERACTION_CLOBBER); provider_->Start(input, false); - ASSERT_TRUE(provider_->matches().empty()); + ASSERT_EQ(IsVerbatimMatchEligible(), provider_->matches().size() > 0); // Note: we intentionally do not validate the match content here. // The content is populated either by HistoryURLProvider or // AutocompleteProviderClient both of which we would have to mock for this @@ -160,7 +160,7 @@ } TEST_P(ZeroSuggestVerbatimMatchProviderTest, - NoVerbatimMatchOnClearInputInIncognito) { + OffersVerbatimMatchOnClobberInIncognito) { std::string url("https://www.wired.com/"); AutocompleteInput input(std::u16string(), // Note: empty input. GetParam(), TestSchemeClassifier()); @@ -168,7 +168,7 @@ input.set_focus_type(metrics::OmniboxFocusType::INTERACTION_CLOBBER); ON_CALL(mock_client_, IsOffTheRecord()).WillByDefault([] { return true; }); provider_->Start(input, false); - ASSERT_TRUE(provider_->matches().empty()); + ASSERT_EQ(IsVerbatimMatchEligible(), provider_->matches().size() > 0); // Note: we intentionally do not validate the match content here. // The content is populated either by HistoryURLProvider or // AutocompleteProviderClient both of which we would have to mock for this
diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc index cf6f5ad..936efd0 100644 --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc
@@ -142,13 +142,13 @@ // eligible to send the current page URL to the suggest server. BASE_FEATURE(kClobberTriggersContextualWebZeroSuggest, "OmniboxClobberTriggersContextualWebZeroSuggest", - enabled_by_default_desktop_only); + enabled_by_default_desktop_android); // Enables on-clobber (i.e., when the user clears the whole omnibox text) // zero-prefix suggestions on the SRP. BASE_FEATURE(kClobberTriggersSRPZeroSuggest, "OmniboxClobberTriggersSRPZeroSuggest", - enabled_by_default_desktop_only); + enabled_by_default_desktop_android); // Enables on-focus zero-prefix suggestions on the Open Web, that are contextual // to the current URL. Will only work if user is signed-in and syncing, or is @@ -183,6 +183,12 @@ "OmniboxLocalZeroSuggestAgeThreshold", base::FEATURE_DISABLED_BY_DEFAULT); +// Used to enable sending INTERACTION_CLOBBER focus type for zero-prefix +// requests with an empty input on Web/SRP on Android platform. +BASE_FEATURE(kOmniboxOnClobberFocusTypeOnAndroid, + "OmniboxOnClobberFocusTypeOnAndroid", + base::FEATURE_DISABLED_BY_DEFAULT); + // Enables on-focus zero-prefix suggestions on the NTP for signed-out users. BASE_FEATURE(kZeroSuggestOnNTPForSignedOutUsers, "OmniboxTrendingZeroPrefixSuggestionsOnNTP",
diff --git a/components/omnibox/common/omnibox_features.h b/components/omnibox/common/omnibox_features.h index 12e73fb..4d939cb3 100644 --- a/components/omnibox/common/omnibox_features.h +++ b/components/omnibox/common/omnibox_features.h
@@ -49,6 +49,7 @@ BASE_DECLARE_FEATURE(kLocalHistorySuggestRevamp); BASE_DECLARE_FEATURE(kLocalHistoryZeroSuggestBeyondNTP); BASE_DECLARE_FEATURE(kOmniboxLocalZeroSuggestAgeThreshold); +BASE_DECLARE_FEATURE(kOmniboxOnClobberFocusTypeOnAndroid); BASE_DECLARE_FEATURE(kZeroSuggestOnNTPForSignedOutUsers); BASE_DECLARE_FEATURE(kZeroSuggestPrefetching); BASE_DECLARE_FEATURE(kZeroSuggestPrefetchingOnSRP);
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json index c6509d3b..e9fa4f5 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json
@@ -13800,16 +13800,6 @@ 'dynamic_refresh': True, 'per_profile': False, }, - 'items': [ - { - 'value': True, - 'caption': 'Managed guest sessions behave like managed sessions', - }, - { - 'value': False, - 'caption': 'Managed guest sessions behave like standard public sessions', - }, - ], 'deprecated': True, 'example_value': True, 'id': 463, @@ -13862,16 +13852,6 @@ 'dynamic_refresh': True, 'per_profile': False, }, - 'items': [ - { - 'value': True, - 'caption': 'Close privacy warning notifications after a delay', - }, - { - 'value': False, - 'caption': 'Show privacy notifications until dismissed by the user', - }, - ], 'deprecated': True, 'example_value': True, 'id': 688, @@ -14134,16 +14114,6 @@ 'dynamic_refresh': True, 'per_profile': True, }, - 'items': [ - { - 'value': True, - 'caption': 'Allow users to opt in to Safe Browsing extended reporting', - }, - { - 'value': False, - 'caption': 'Do not allow users to opt in to Safe Browsing extended reporting', - }, - ], 'deprecated': True, 'example_value': True, 'id': 299, @@ -18211,6 +18181,16 @@ 'dynamic_refresh': False, 'per_profile': False, }, + 'items': [ + { + 'value': True, + 'caption': 'Only allow guest browser logins', + }, + { + 'value': False, + 'caption': 'Allow guest browser logins and profile logins', + }, + ], 'example_value': True, 'id': 574, 'caption': '''Enforce browser guest mode''', @@ -18230,6 +18210,16 @@ 'dynamic_refresh': True, 'per_profile': False, }, + 'items': [ + { + 'value': True, + 'caption': 'Allow adding new profiles', + }, + { + 'value': False, + 'caption': 'Disallow adding new profiles', + }, + ], 'example_value': True, 'id': 276, 'caption': '''Enable add person in user manager''', @@ -18252,6 +18242,16 @@ 'dynamic_refresh': False, 'per_profile': False, }, + 'items': [ + { + 'value': True, + 'caption': 'Force the user to sign in before using the browser', + }, + { + 'value': False, + 'caption': 'Allow the user to use the browser without signing in', + }, + ], 'example_value': False, 'id': 346, 'caption': '''Enable force sign in for <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>''', @@ -18406,7 +18406,7 @@ 'id': 280, 'caption': '''Minimum TLS version to fallback to''', 'tags': ['system-security'], - 'desc': '''Warning: The TLS version fallback will be removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> after version 52 (around September 2016) and this policy will stop working then. + 'desc': '''This policy was removed in M53 after TLS version fallback was removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. When a TLS handshake fails, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> would previously retry the connection with a lesser version of TLS in order to work around bugs in HTTPS servers. This setting configures the version at which this fallback process will stop. If a server performs version negotiation correctly (i.e. without breaking the connection) then this setting doesn't apply. Regardless, the resulting connection must still comply with SSLVersionMin. @@ -18451,7 +18451,7 @@ 'id': 361, 'caption': '''Maximum SSL version enabled''', 'tags': ['system-security'], - 'desc': '''Warning: The max TLS version policy will be entirely removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> around version 75 (around June 2019). + 'desc': '''This policy was removed in M75 after the max TLS version policy was removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. If this policy is not configured then <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> uses the default maximum version. @@ -18604,7 +18604,7 @@ 'id': 310, 'caption': '''Enable RC4 cipher suites in TLS''', 'tags': ['system-security'], - 'desc': '''Warning: RC4 will be completely removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> after version 52 (around September 2016) and this policy will stop working then. + 'desc': '''This policy was removed in M53 after RC4 was removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. If the policy is not set, or is set to false, then RC4 cipher suites in TLS will not be enabled. Otherwise it may be set to true to retain compatibility with an outdated server. This is a stopgap measure and the server should be reconfigured.''', }, @@ -18629,7 +18629,7 @@ 'id': 334, 'caption': '''Enable DHE cipher suites in TLS''', 'tags': ['system-security'], - 'desc': '''Warning: DHE will be completely removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> after version 57 (around March 2017) and this policy will stop working then. + 'desc': '''This policy was removed in M58 after DHE was removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. If the policy is not set, or is set to false, then DHE cipher suites in TLS will not be enabled. Otherwise it may be set to true to enable DHE cipher suites and retain compatibility with an outdated server. This is a stopgap measure and the server should be reconfigured. @@ -18676,6 +18676,16 @@ 'features': { 'dynamic_refresh': True, }, + 'items': [ + { + 'value': True, + 'caption': 'Only allow users to turn off the device using the physical power button', + }, + { + 'value': False, + 'caption': 'Allow users to turn off the device using either the shut down icon or the physical power button', + }, + ], 'example_value': True, 'id': 284, 'caption': '''Automatic reboot on device shutdown''', @@ -18731,6 +18741,16 @@ 'dynamic_refresh': False, 'per_profile': True, }, + 'items': [ + { + 'value': True, + 'caption': 'Maximize the first browser window on first run', + }, + { + 'value': False, + 'caption': 'Default system behavior (depends on screen size)', + }, + ], 'example_value': True, 'id': 298, 'caption': '''Maximize the first browser window on first run''', @@ -18816,6 +18836,16 @@ 'dynamic_refresh': False, 'per_profile': False, }, + 'items': [ + { + 'value': True, + 'caption': 'Allow QUIC', + }, + { + 'value': False, + 'caption': 'Disallow QUIC', + }, + ], 'example_value': True, 'id': 301, 'caption': '''Allow QUIC protocol''', @@ -18897,6 +18927,16 @@ 'dynamic_refresh': False, 'per_profile': False, }, + 'items': [ + { + 'value': True, + 'caption': 'Enable hardware acceleration', + }, + { + 'value': False, + 'caption': 'Disable hardware acceleration', + }, + ], 'example_value': True, 'id': 304, 'caption': '''Use hardware acceleration when available''', @@ -22105,16 +22145,6 @@ 'dynamic_refresh': False, 'per_profile': False, }, - 'items': [ - { - 'value': True, - 'caption': 'Require site isolation for the sign-in screen', - }, - { - 'value': False, - 'caption': 'Use the default site isolation settings for the sign-in screen', - }, - ], 'deprecated': True, 'example_value': True, 'id': 418, @@ -22348,16 +22378,6 @@ 'dynamic_refresh': False, 'per_profile': False, }, - 'items': [ - { - 'value': True, - 'caption': 'Allow WebDriver to override incompatible policies', - }, - { - 'value': False, - 'caption': 'Do not allow WebDriver to override incompatible policies', - }, - ], 'deprecated': True, 'example_value': True, 'id': 414, @@ -31983,7 +32003,7 @@ 'id': 858, 'caption': '''Enable 3DES cipher suites in TLS''', 'tags': ['system-security'], - 'desc': '''Warning: 3DES will be completely removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> in version 95 (around October 2021) and this policy will stop working then. + 'desc': '''This policy was removed in M97 after 3DES was removed from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. If the policy is set to true, then 3DES cipher suites in TLS will be enabled. If it is set to false, they will be disabled. If the policy is unset, 3DES cipher suites are disabled by default. This policy may be used to temporarily retain compatibility with an outdated server. This is a stopgap measure and the server should be reconfigured. ''',
diff --git a/components/policy/resources/webui/policy_base.js b/components/policy/resources/webui/policy_base.js index 3ccf24ec..b80dce2 100644 --- a/components/policy/resources/webui/policy_base.js +++ b/components/policy/resources/webui/policy_base.js
@@ -12,7 +12,7 @@ import './policy_table.js'; import {addSingletonGetter, addWebUIListener} from 'chrome://resources/js/cr.m.js'; -import {FocusOutlineManager} from 'chrome://resources/js/cr/ui/focus_outline_manager.js'; +import {FocusOutlineManager} from 'chrome://resources/js/focus_outline_manager.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {$} from 'chrome://resources/js/util.js';
diff --git a/components/print_media_strings.grdp b/components/print_media_strings.grdp index 2a2dc51..f9b1433 100644 --- a/components/print_media_strings.grdp +++ b/components/print_media_strings.grdp
@@ -173,9 +173,53 @@ desc="In Title Case: Media size shown to user in print preview for media ``Envelope DL''"> Envelope DL </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B0_1030X1456MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B0''"> + JIS B0 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B1_728X1030MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B1''"> + JIS B1 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B2_515X728MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B2''"> + JIS B2 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B3_364X515MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B3''"> + JIS B3 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B4_257X364MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B4''"> + JIS B4 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B5_182X257MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B5''"> + JIS B5 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B6_128X182MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B6''"> + JIS B6 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B7_91X128MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B7''"> + JIS B7 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B8_64X91MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B8''"> + JIS B8 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B9_45X64MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B9''"> + JIS B9 + </message> + <message name="PRINT_PREVIEW_MEDIA_JIS_B10_32X45MM" + desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B10''"> + JIS B10 + </message> <message name="PRINT_PREVIEW_MEDIA_JIS_EXEC_216X330MM" - desc="In Title Case: Media size shown to user in print preview for media ``Exec''"> - Exec + desc="Media size shown to user in print preview for media ``JIS Exec''. JIS is an acronym and Exec is the name of the paper size."> + JIS Exec </message> <message name="PRINT_PREVIEW_MEDIA_JPN_CHOU2_111_1X146MM" desc="In Title Case: Media size shown to user in print preview for media ``Envelope Chou 2''"> @@ -194,8 +238,8 @@ Envelope Chou 40 </message> <message name="PRINT_PREVIEW_MEDIA_JPN_HAGAKI_100X148MM" - desc="In Title Case: Media size shown to user in print preview for media ``Hagaki (Postcard)''"> - Hagaki (Postcard) + desc="In Title Case: Media size shown to user in print preview for media ``Hagaki Postcard''"> + Hagaki Postcard </message> <message name="PRINT_PREVIEW_MEDIA_JPN_KAHU_240X322_1MM" desc="In Title Case: Media size shown to user in print preview for media ``Envelope Kahu''"> @@ -230,8 +274,8 @@ Envelope Kaku 8 </message> <message name="PRINT_PREVIEW_MEDIA_JPN_OUFUKU_148X200MM" - desc="In Title Case: Media size shown to user in print preview for media ``Oufuku Hagaki (Postcard)''"> - Oufuku Hagaki (Postcard) + desc="In Title Case: Media size shown to user in print preview for media ``Oufuku Hagaki Postcard''"> + Oufuku Hagaki Postcard </message> <message name="PRINT_PREVIEW_MEDIA_JPN_YOU4_105X235MM" desc="In Title Case: Media size shown to user in print preview for media ``Envelope You 4''"> @@ -450,8 +494,8 @@ 3.5x5 </message> <message name="PRINT_PREVIEW_MEDIA_OM_DAI_PA_KAI_275X395MM" - desc="In Title Case: Media size shown to user in print preview for media ``Dai-Pa-Kai''"> - Dai-Pa-Kai + desc="In Title Case: Media size shown to user in print preview for media ``275 x 395 mm''"> + 275 x 395 mm </message> <message name="PRINT_PREVIEW_MEDIA_OM_FOLIO_SP_215X315MM" desc="In Title Case: Media size shown to user in print preview for media ``Folio-Sp''"> @@ -466,16 +510,16 @@ Envelope Italian </message> <message name="PRINT_PREVIEW_MEDIA_OM_JUURO_KU_KAI_198X275MM" - desc="In Title Case: Media size shown to user in print preview for media ``Juuro-Ku-Kai''"> - Juuro-Ku-Kai + desc="In Title Case: Media size shown to user in print preview for media ``198 x 275 mm''"> + 198 x 275 mm </message> <message name="PRINT_PREVIEW_MEDIA_OM_LARGE_PHOTO_200X300" desc="In Title Case: Media size shown to user in print preview for media ``Large-Photo''"> Large-Photo </message> <message name="PRINT_PREVIEW_MEDIA_OM_PA_KAI_267X389MM" - desc="In Title Case: Media size shown to user in print preview for media ``Pa-Kai''"> - Pa-Kai + desc="In Title Case: Media size shown to user in print preview for media ``267 x 389 mm''"> + 267 x 389 mm </message> <message name="PRINT_PREVIEW_MEDIA_OM_POSTFIX_114X229MM" desc="In Title Case: Media size shown to user in print preview for media ``Envelope Postfix''"> @@ -490,8 +534,8 @@ Envelope Chinese #10 </message> <message name="PRINT_PREVIEW_MEDIA_PRC_16K_146X215MM" - desc="In Title Case: Media size shown to user in print preview for media ``Prc-16K''"> - Prc-16K + desc="In ALL CAPS: Media size shown to user in print preview for media ``PRC 16K''. PRC is an acronym and 16K is a paper size."> + PRC 16K </message> <message name="PRINT_PREVIEW_MEDIA_PRC_1_102X165MM" desc="In Title Case: Media size shown to user in print preview for media ``Envelope Chinese #1''"> @@ -502,8 +546,8 @@ Envelope Chinese #2 </message> <message name="PRINT_PREVIEW_MEDIA_PRC_32K_97X151MM" - desc="In Title Case: Media size shown to user in print preview for media ``Prc-32K''"> - Prc-32K + desc="In ALL CAPS: Media size shown to user in print preview for media ``PRC 32K''. PRC is an acronym and 32K is a paper size."> + PRC 32K </message> <message name="PRINT_PREVIEW_MEDIA_PRC_3_125X176MM" desc="In Title Case: Media size shown to user in print preview for media ``Envelope Chinese #3''"> @@ -530,60 +574,12 @@ Envelope Chinese #8 </message> <message name="PRINT_PREVIEW_MEDIA_ROC_16K_7_75X10_75IN" - desc="In Title Case: Media size shown to user in print preview for media ``Roc-16K''"> - Roc-16K + desc="In ALL CAPS: Media size shown to user in print preview for media ``ROC 16K''. ROC is an acronym and 16K is a paper size."> + ROC 16K </message> <message name="PRINT_PREVIEW_MEDIA_ROC_8K_10_75X15_5IN" - desc="In Title Case: Media size shown to user in print preview for media ``Roc-8K''"> - Roc-8K - </message> - - <!-- Manually curated media names (not specified by PWG 5101.1-2002) --> - - <!-- JIS B* --> - <message name="PRINT_PREVIEW_MEDIA_JIS_B0_1030X1456MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B0''"> - JIS B0 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B1_728X1030MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B1''"> - JIS B1 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B2_515X728MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B2''"> - JIS B2 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B3_364X515MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B3''"> - JIS B3 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B4_257X364MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B4''"> - JIS B4 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B5_182X257MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B5''"> - JIS B5 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B6_128X182MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B6''"> - JIS B6 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B7_91X128MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B7''"> - JIS B7 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B8_64X91MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B8''"> - JIS B8 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B9_45X64MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B9''"> - JIS B9 - </message> - <message name="PRINT_PREVIEW_MEDIA_JIS_B10_32X45MM" - desc="In ALL CAPS: Media size shown to user in print preview for media ``JIS B10''"> - JIS B10 + desc="In ALL CAPS: Media size shown to user in print preview for media ``ROC 8K''. ROC is an acronym and 8K is a paper size."> + ROC 8K </message> </if> </grit-part>
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B0_1030X1456MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B0_1030X1456MM.png.sha1 new file mode 100644 index 0000000..5e32520e --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B0_1030X1456MM.png.sha1
@@ -0,0 +1 @@ +f40e6fb4adf72199c93ddf1f68b12cd4407361c7 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B10_32X45MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B10_32X45MM.png.sha1 new file mode 100644 index 0000000..50ead57 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B10_32X45MM.png.sha1
@@ -0,0 +1 @@ +1eabfa0a896cec8b4e8e7daadda1d325881d3d92 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B1_728X1030MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B1_728X1030MM.png.sha1 new file mode 100644 index 0000000..677bbe9 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B1_728X1030MM.png.sha1
@@ -0,0 +1 @@ +e19541d9457737b16653c8d1cd1704a8e039706a \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B2_515X728MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B2_515X728MM.png.sha1 new file mode 100644 index 0000000..e8e3080 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B2_515X728MM.png.sha1
@@ -0,0 +1 @@ +97f19ec984aef172b6901e6be385aa0b1d1d80a5 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B3_364X515MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B3_364X515MM.png.sha1 new file mode 100644 index 0000000..5fb8cc5 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B3_364X515MM.png.sha1
@@ -0,0 +1 @@ +632c305d5a445611826b72e839918ecca798c1d1 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B4_257X364MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B4_257X364MM.png.sha1 new file mode 100644 index 0000000..e30482f --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B4_257X364MM.png.sha1
@@ -0,0 +1 @@ +504721629867f1201f46df33ce1be5e366693b68 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B5_182X257MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B5_182X257MM.png.sha1 new file mode 100644 index 0000000..12f28bc --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B5_182X257MM.png.sha1
@@ -0,0 +1 @@ +f8de7738e9b18adc2ef98018bb8d29a6c8c92037 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B6_128X182MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B6_128X182MM.png.sha1 new file mode 100644 index 0000000..fd60d842 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B6_128X182MM.png.sha1
@@ -0,0 +1 @@ +46d99d732670ab60f4cef9644d456973203893f6 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B7_91X128MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B7_91X128MM.png.sha1 new file mode 100644 index 0000000..4fa416a --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B7_91X128MM.png.sha1
@@ -0,0 +1 @@ +8df3c703d2f82e6bfabfe351bcbc3bb6dd3116ee \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B8_64X91MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B8_64X91MM.png.sha1 new file mode 100644 index 0000000..7617293 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B8_64X91MM.png.sha1
@@ -0,0 +1 @@ +568bc56ecacac4f4459fadadc4c4d668ea425e3c \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B9_45X64MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B9_45X64MM.png.sha1 new file mode 100644 index 0000000..c7d5373 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_B9_45X64MM.png.sha1
@@ -0,0 +1 @@ +6c14891e8beb518fc1200f329156a906772dc236 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_EXEC_216X330MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_EXEC_216X330MM.png.sha1 new file mode 100644 index 0000000..d905ad0 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JIS_EXEC_216X330MM.png.sha1
@@ -0,0 +1 @@ +eb09461c31bc24c7dd2f9440647ca03b64a9933a \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_HAGAKI_100X148MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_HAGAKI_100X148MM.png.sha1 new file mode 100644 index 0000000..91e7fec7 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_HAGAKI_100X148MM.png.sha1
@@ -0,0 +1 @@ +51ffd53e4fb5777687687100c024ebe611fd849d \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_OUFUKU_148X200MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_OUFUKU_148X200MM.png.sha1 index aa7dc3bd..fb79af5 100644 --- a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_OUFUKU_148X200MM.png.sha1 +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_JPN_OUFUKU_148X200MM.png.sha1
@@ -1 +1 @@ -431a4a25bd762d2a02106ed0fbc2f688f66d9f31 \ No newline at end of file +b78e5ad61b49817957207757c1b6204b431fa8d4 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_DAI_PA_KAI_275X395MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_DAI_PA_KAI_275X395MM.png.sha1 new file mode 100644 index 0000000..16bf2037 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_DAI_PA_KAI_275X395MM.png.sha1
@@ -0,0 +1 @@ +5cd3d89f928d3c1fbe2b1941eeec2f60acb3b992 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_JUURO_KU_KAI_198X275MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_JUURO_KU_KAI_198X275MM.png.sha1 new file mode 100644 index 0000000..1b45c6c --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_JUURO_KU_KAI_198X275MM.png.sha1
@@ -0,0 +1 @@ +bdc27a27f2f6eb86f13fa77baa96298b9073eb42 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_PA_KAI_267X389MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_PA_KAI_267X389MM.png.sha1 new file mode 100644 index 0000000..2dd3bbaf --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_OM_PA_KAI_267X389MM.png.sha1
@@ -0,0 +1 @@ +b83ae550cfcf08b29fab0994c4245a46371de035 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_PRC_16K_146X215MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_PRC_16K_146X215MM.png.sha1 new file mode 100644 index 0000000..5f7a504 --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_PRC_16K_146X215MM.png.sha1
@@ -0,0 +1 @@ +28a9e1aa94269964728c26332589bc02efe85985 \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_PRC_32K_97X151MM.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_PRC_32K_97X151MM.png.sha1 new file mode 100644 index 0000000..603ef50bf --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_PRC_32K_97X151MM.png.sha1
@@ -0,0 +1 @@ +60776f3d0689fb3935f79b704034d9dd46daa74e \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_ROC_16K_7_75X10_75IN.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_ROC_16K_7_75X10_75IN.png.sha1 new file mode 100644 index 0000000..409604c --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_ROC_16K_7_75X10_75IN.png.sha1
@@ -0,0 +1 @@ +b8a8c2ffa672f2432f4bfe112152e16e465920df \ No newline at end of file
diff --git a/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_ROC_8K_10_75X15_5IN.png.sha1 b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_ROC_8K_10_75X15_5IN.png.sha1 new file mode 100644 index 0000000..71cc5ac --- /dev/null +++ b/components/print_media_strings_grdp/PRINT_PREVIEW_MEDIA_ROC_8K_10_75X15_5IN.png.sha1
@@ -0,0 +1 @@ +d2add83d408d37cd29f29defbd6b509e966d217c \ No newline at end of file
diff --git a/components/reporting/client/report_queue_impl.cc b/components/reporting/client/report_queue_impl.cc index 2b8041ab..a3ed597 100644 --- a/components/reporting/client/report_queue_impl.cc +++ b/components/reporting/client/report_queue_impl.cc
@@ -167,12 +167,8 @@ SpeculativeReportQueueImpl::~SpeculativeReportQueueImpl() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - while (!pending_record_producers_.empty()) { - auto head = std::move(pending_record_producers_.front()); - pending_record_producers_.pop(); - std::move(head.record_callback) - .Run(Status(error::DATA_LOSS, "The queue is being destructed")); - } + PurgePendingProducers( + Status(error::DATA_LOSS, "The queue is being destructed")); } void SpeculativeReportQueueImpl::Flush(Priority priority, @@ -188,17 +184,13 @@ return; } DCHECK_CALLED_ON_VALID_SEQUENCE(self->sequence_checker_); - if (!self->status_or_report_queue_.has_value()) { + if (!self->actual_report_queue_.has_value()) { std::move(callback).Run(Status(error::FAILED_PRECONDITION, "ReportQueue is not ready yet.")); return; } - if (!self->status_or_report_queue_->ok()) { - std::move(callback).Run(self->status_or_report_queue_->status()); - return; - } const std::unique_ptr<ReportQueue>& report_queue = - self->status_or_report_queue_->ValueOrDie(); + self->actual_report_queue_.value(); report_queue->Flush(priority, std::move(callback)); }, priority, std::move(callback), weak_ptr_factory_.GetWeakPtr())); @@ -222,22 +214,16 @@ EnqueueCallback callback, RecordProducer record_producer) const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!status_or_report_queue_.has_value()) { + if (!actual_report_queue_.has_value()) { // Queue is not ready yet, store the record in the memory queue. pending_record_producers_.emplace(std::move(record_producer), std::move(callback), priority); return; } - if (!status_or_report_queue_->ok()) { - // Queue creation failed, leave it for another attempt. - pending_record_producers_.emplace(std::move(record_producer), - std::move(callback), priority); - return; - } // Queue is ready. If memory queue is empty, just forward the record. if (pending_record_producers_.empty()) { const std::unique_ptr<ReportQueue>& report_queue = - status_or_report_queue_->ValueOrDie(); + actual_report_queue_.value(); report_queue->AddProducedRecord(std::move(record_producer), priority, std::move(callback)); return; @@ -251,14 +237,12 @@ void SpeculativeReportQueueImpl::EnqueuePendingRecordProducers() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - DCHECK(status_or_report_queue_.has_value()); - DCHECK(status_or_report_queue_->ok()); + DCHECK(actual_report_queue_.has_value()); if (pending_record_producers_.empty()) { return; } const std::unique_ptr<ReportQueue>& report_queue = - status_or_report_queue_->ValueOrDie(); - + actual_report_queue_.value(); auto head = std::move(pending_record_producers_.front()); pending_record_producers_.pop(); if (pending_record_producers_.empty()) { @@ -320,20 +304,30 @@ return; } DCHECK_CALLED_ON_VALID_SEQUENCE(self->sequence_checker_); - if (self->status_or_report_queue_.has_value()) { + if (self->actual_report_queue_.has_value()) { // Already attached, do nothing. return; } - self->status_or_report_queue_ = std::move(status_or_actual_queue); - // TODO(b/239583016): remove the ok status check once the enqueue - // callbacks are stored along with the records in a pending queue - // instead of only the records, and run the callbacks with the - // failure status if creation failed. - if (self->status_or_report_queue_->ok() && - !self->pending_record_producers_.empty()) { - self->EnqueuePendingRecordProducers(); + if (!status_or_actual_queue.ok()) { + // Failed to create actual queue. + // Flush all pending records with this status. + self->PurgePendingProducers(status_or_actual_queue.status()); + return; } + // Actual report queue succeeded, store it (never to change later). + self->actual_report_queue_ = + std::move(status_or_actual_queue.ValueOrDie()); + self->EnqueuePendingRecordProducers(); }, weak_ptr_factory_.GetWeakPtr(), std::move(status_or_actual_queue))); } + +void SpeculativeReportQueueImpl::PurgePendingProducers(Status status) const { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + while (!pending_record_producers_.empty()) { + auto head = std::move(pending_record_producers_.front()); + pending_record_producers_.pop(); + std::move(head.record_callback).Run(status); + } +} } // namespace reporting
diff --git a/components/reporting/client/report_queue_impl.h b/components/reporting/client/report_queue_impl.h index fd96f989..81244c4c 100644 --- a/components/reporting/client/report_queue_impl.h +++ b/components/reporting/client/report_queue_impl.h
@@ -123,6 +123,9 @@ // of it. void EnqueuePendingRecordProducers() const; + // Purges all |pending_record_producers_| with error. + void PurgePendingProducers(Status status) const; + // Optionally enqueues |record_producer| (owned) to actual queue, if ready. // Otherwise adds it to the end of |pending_record_producers_|. void MaybeEnqueueRecordProducer(Priority priority, @@ -134,9 +137,8 @@ const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_; SEQUENCE_CHECKER(sequence_checker_); - // Creation status of |ReportQueue| and actual |ReportQueue| if successfully - // created. - absl::optional<StatusOr<std::unique_ptr<ReportQueue>>> status_or_report_queue_ + // Actual |ReportQueue| once successfully created (immutable after that). + absl::optional<std::unique_ptr<ReportQueue>> actual_report_queue_ GUARDED_BY_CONTEXT(sequence_checker_); // Queue of the pending record producers, collected before actual queue has
diff --git a/components/reporting/client/report_queue_impl_unittest.cc b/components/reporting/client/report_queue_impl_unittest.cc index 464d5942..3a5d1fe 100644 --- a/components/reporting/client/report_queue_impl_unittest.cc +++ b/components/reporting/client/report_queue_impl_unittest.cc
@@ -34,7 +34,7 @@ using ::testing::MockFunction; using ::testing::NiceMock; using ::testing::Return; -using ::testing::SizeIs; +using ::testing::StrEq; using ::testing::WithArg; using ::reporting::test::TestStorageModule; @@ -66,13 +66,13 @@ ReportQueueConfiguration::Create(dm_token_, destination_, policy_check_callback_); - ASSERT_TRUE(config_result.ok()); + ASSERT_OK(config_result) << config_result.status(); test::TestEvent<StatusOr<std::unique_ptr<ReportQueue>>> report_queue_event; ReportQueueImpl::Create(std::move(config_result.ValueOrDie()), storage_module_, report_queue_event.cb()); auto report_queue_result = report_queue_event.result(); - ASSERT_TRUE(report_queue_result.ok()); + ASSERT_OK(report_queue_result) << report_queue_result.status(); report_queue_ = std::move(report_queue_result.ValueOrDie()); } @@ -107,9 +107,10 @@ static constexpr char kTestString[] = "El-Chupacabra"; test::TestEvent<Status> a; report_queue_->Enqueue(kTestString, priority_, a.cb()); - EXPECT_OK(a.result()); - EXPECT_EQ(test_storage_module()->priority(), priority_); - EXPECT_EQ(test_storage_module()->record().data(), kTestString); + const auto a_result = a.result(); + EXPECT_OK(a_result) << a_result; + EXPECT_THAT(test_storage_module()->priority(), Eq(priority_)); + EXPECT_THAT(test_storage_module()->record().data(), StrEq(kTestString)); } // Enqueues a |base::Value| dictionary and ensures it arrives unaltered in the @@ -121,13 +122,14 @@ test_dict.Set(kTestKey, kTestValue); test::TestEvent<Status> a; report_queue_->Enqueue(test_dict.Clone(), priority_, a.cb()); - EXPECT_OK(a.result()); + const auto a_result = a.result(); + EXPECT_OK(a_result) << a_result; - EXPECT_EQ(test_storage_module()->priority(), priority_); + EXPECT_THAT(test_storage_module()->priority(), priority_); absl::optional<base::Value> value_result = base::JSONReader::Read(test_storage_module()->record().data()); - ASSERT_TRUE(value_result); + ASSERT_TRUE(value_result.has_value()); EXPECT_EQ(value_result.value().GetDict(), test_dict); } @@ -139,9 +141,10 @@ test::TestEvent<Status> a; report_queue_->Enqueue(std::make_unique<test::TestMessage>(test_message), priority_, a.cb()); - EXPECT_OK(a.result()); + const auto a_result = a.result(); + EXPECT_OK(a_result) << a_result; - EXPECT_EQ(test_storage_module()->priority(), priority_); + EXPECT_THAT(test_storage_module()->priority(), Eq(priority_)); test::TestMessage result_message; ASSERT_TRUE( @@ -166,7 +169,7 @@ priority_, a.cb()); const auto result = a.result(); EXPECT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::UNKNOWN); + EXPECT_THAT(result.error_code(), Eq(error::UNKNOWN)); } TEST_F(ReportQueueImplTest, EnqueueStringFailsOnPolicy) { @@ -177,7 +180,7 @@ report_queue_->Enqueue(std::string(kTestString), priority_, a.cb()); const auto result = a.result(); EXPECT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::UNAUTHENTICATED); + EXPECT_THAT(result.error_code(), Eq(error::UNAUTHENTICATED)); } TEST_F(ReportQueueImplTest, EnqueueProtoFailsOnPolicy) { @@ -190,7 +193,7 @@ priority_, a.cb()); const auto result = a.result(); EXPECT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::UNAUTHENTICATED); + EXPECT_THAT(result.error_code(), Eq(error::UNAUTHENTICATED)); } TEST_F(ReportQueueImplTest, EnqueueValueFailsOnPolicy) { @@ -204,7 +207,7 @@ report_queue_->Enqueue(test_dict.Clone(), priority_, a.cb()); const auto result = a.result(); EXPECT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::UNAUTHENTICATED); + EXPECT_THAT(result.error_code(), Eq(error::UNAUTHENTICATED)); } TEST_F(ReportQueueImplTest, EnqueueAndFlushSuccess) { @@ -213,10 +216,12 @@ test::TestEvent<Status> a; report_queue_->Enqueue(std::make_unique<test::TestMessage>(test_message), priority_, a.cb()); - EXPECT_OK(a.result()); + const auto a_result = a.result(); + EXPECT_OK(a_result) << a_result; test::TestEvent<Status> f; report_queue_->Flush(priority_, f.cb()); - EXPECT_OK(f.result()); + const auto f_result = f.result(); + EXPECT_OK(f_result) << f_result; } TEST_F(ReportQueueImplTest, EnqueueSuccessFlushFailure) { @@ -225,7 +230,8 @@ test::TestEvent<Status> a; report_queue_->Enqueue(std::make_unique<test::TestMessage>(test_message), priority_, a.cb()); - EXPECT_OK(a.result()); + const auto a_result = a.result(); + EXPECT_OK(a_result) << a_result; EXPECT_CALL(*test_storage_module(), Flush(Eq(priority_), _)) .WillOnce( @@ -236,7 +242,7 @@ report_queue_->Flush(priority_, f.cb()); const auto result = f.result(); EXPECT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::UNKNOWN); + EXPECT_THAT(result.error_code(), Eq(error::UNKNOWN)); } // Enqueues a random string into speculative queue, then enqueues a sting, @@ -251,13 +257,14 @@ // Enqueue would not end until actual queue is attached. speculative_report_queue->AttachActualQueue(std::move(report_queue_)); - EXPECT_OK(a.result()); + const auto a_result = a.result(); + EXPECT_OK(a_result) << a_result; // Let everything ongoing to finish. task_environment_.RunUntilIdle(); - EXPECT_EQ(test_storage_module()->priority(), priority_); - EXPECT_EQ(test_storage_module()->record().data(), kTestString); + EXPECT_THAT(test_storage_module()->priority(), Eq(priority_)); + EXPECT_THAT(test_storage_module()->record().data(), StrEq(kTestString)); } TEST_F(ReportQueueImplTest, SpeculativeQueueMultipleRecordsAfterCreation) { @@ -273,34 +280,54 @@ speculative_report_queue->Enqueue(kTestString1, Priority::IMMEDIATE, test_event1.cb()); const auto result1 = test_event1.result(); - ASSERT_TRUE(result1.ok()); - EXPECT_EQ(test_storage_module()->priority(), Priority::IMMEDIATE); - EXPECT_EQ(test_storage_module()->record().data(), kTestString1); + ASSERT_OK(result1) << result1; + EXPECT_THAT(test_storage_module()->priority(), Eq(Priority::IMMEDIATE)); + EXPECT_THAT(test_storage_module()->record().data(), StrEq(kTestString1)); test::TestEvent<Status> test_event2; speculative_report_queue->Enqueue(kTestString2, Priority::SLOW_BATCH, test_event2.cb()); const auto result2 = test_event2.result(); - ASSERT_TRUE(result2.ok()); - EXPECT_EQ(test_storage_module()->priority(), Priority::SLOW_BATCH); - EXPECT_EQ(test_storage_module()->record().data(), kTestString2); + ASSERT_OK(result2) << result2; + EXPECT_THAT(test_storage_module()->priority(), Eq(Priority::SLOW_BATCH)); + EXPECT_THAT(test_storage_module()->record().data(), StrEq(kTestString2)); } -TEST_F(ReportQueueImplTest, SpeculativeQueueCreationFailed) { +TEST_F(ReportQueueImplTest, SpeculativeQueueCreationFailedToCreate) { + constexpr char kTestString[] = "record"; + test::TestEvent<Status> test_event; + + auto speculative_report_queue = SpeculativeReportQueueImpl::Create(); + + auto attach_cb = speculative_report_queue->PrepareToAttachActualQueue(); + std::move(attach_cb).Run(Status(error::UNKNOWN, "Failed for Test")); + + speculative_report_queue->Enqueue(kTestString, Priority::IMMEDIATE, + test_event.cb()); + + // Unfulfilled pending Enqueue returns the queue failure status. + const auto result = test_event.result(); + ASSERT_FALSE(result.ok()); + EXPECT_THAT(result.code(), Eq(error::UNKNOWN)); +} + +TEST_F(ReportQueueImplTest, SpeculativeQueueDeletedAfterQneueue) { constexpr char kTestString[] = "record"; test::TestEvent<Status> test_event; { auto speculative_report_queue = SpeculativeReportQueueImpl::Create(); auto attach_cb = speculative_report_queue->PrepareToAttachActualQueue(); - std::move(attach_cb).Run(Status(error::UNKNOWN, "error msg")); + std::move(attach_cb).Run(Status(error::UNKNOWN, "Failed for Test")); speculative_report_queue->Enqueue(kTestString, Priority::IMMEDIATE, test_event.cb()); } + + // Queue destructed, unfulfilled pending Enqueue returns a data loss. const auto result = test_event.result(); ASSERT_FALSE(result.ok()); - EXPECT_EQ(result.code(), error::DATA_LOSS); + EXPECT_THAT(result.code(), Eq(error::DATA_LOSS)); } TEST_F(ReportQueueImplTest, EnqueueRecordWithInvalidPriority) { @@ -310,7 +337,7 @@ const auto result = event.result(); ASSERT_FALSE(result.ok()); - EXPECT_EQ(result.code(), error::INVALID_ARGUMENT); + EXPECT_THAT(result.code(), Eq(error::INVALID_ARGUMENT)); } TEST_F(ReportQueueImplTest, FlushSpeculativeReportQueue) { @@ -340,7 +367,7 @@ const auto result = event.result(); ASSERT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::FAILED_PRECONDITION); + EXPECT_THAT(result.error_code(), Eq(error::FAILED_PRECONDITION)); } TEST_F(ReportQueueImplTest, FlushFailedSpeculativeReportQueue) { @@ -348,14 +375,14 @@ auto speculative_report_queue = SpeculativeReportQueueImpl::Create(); auto attach_cb = speculative_report_queue->PrepareToAttachActualQueue(); - std::move(attach_cb).Run(Status(error::UNKNOWN, "error msg")); + std::move(attach_cb).Run(Status(error::UNKNOWN, "Failing for Test")); task_environment_.RunUntilIdle(); speculative_report_queue->Flush(priority_, event.cb()); const auto result = event.result(); ASSERT_FALSE(result.ok()); - EXPECT_EQ(result.error_code(), error::UNKNOWN); + EXPECT_THAT(result.error_code(), Eq(error::FAILED_PRECONDITION)); } TEST_F(ReportQueueImplTest, AsyncProcessingReportQueue) { @@ -384,9 +411,12 @@ test_dict.Set(kTestKey, kTestValue); mock_queue->Enqueue(std::move(test_dict), priority_, a_json.cb()); - EXPECT_OK(a_string.result()); - EXPECT_OK(a_proto.result()); - EXPECT_OK(a_json.result()); + const auto a_string_result = a_string.result(); + EXPECT_OK(a_string_result) << a_string_result; + const auto a_proto_result = a_proto.result(); + EXPECT_OK(a_proto_result) << a_proto_result; + const auto a_json_result = a_json.result(); + EXPECT_OK(a_json_result) << a_json_result; } TEST_F(ReportQueueImplTest, AsyncProcessingSpeculativeReportQueue) { @@ -421,9 +451,12 @@ }); speculative_report_queue->AttachActualQueue(std::move(mock_queue)); - EXPECT_OK(a_string.result()); - EXPECT_OK(a_proto.result()); - EXPECT_OK(a_json.result()); + const auto a_string_result = a_string.result(); + EXPECT_OK(a_string_result) << a_string_result; + const auto a_proto_result = a_proto.result(); + EXPECT_OK(a_proto_result) << a_proto_result; + const auto a_json_result = a_json.result(); + EXPECT_OK(a_json_result) << a_json_result; } } // namespace } // namespace reporting
diff --git a/components/services/storage/dom_storage/local_storage_impl.cc b/components/services/storage/dom_storage/local_storage_impl.cc index 9dd5070..b8ae1498 100644 --- a/components/services/storage/dom_storage/local_storage_impl.cc +++ b/components/services/storage/dom_storage/local_storage_impl.cc
@@ -689,10 +689,10 @@ if (!database_) { // If for whatever reason no leveldb database is available, no storage is // used, so return an array only containing the current areas. - std::vector<mojom::StorageUsageInfoV2Ptr> result; + std::vector<mojom::StorageUsageInfoPtr> result; base::Time now = base::Time::Now(); for (const auto& it : areas_) { - result.emplace_back(mojom::StorageUsageInfoV2::New(it.first, 0, now)); + result.emplace_back(mojom::StorageUsageInfo::New(it.first, 0, now)); } std::move(callback).Run(std::move(result)); } else { @@ -710,7 +710,7 @@ void LocalStorageImpl::OnGotMetaData( GetUsageCallback callback, std::vector<DomStorageDatabase::KeyValuePair> data) { - std::vector<mojom::StorageUsageInfoV2Ptr> result; + std::vector<mojom::StorageUsageInfoPtr> result; std::set<blink::StorageKey> storage_keys; for (const auto& row : data) { absl::optional<blink::StorageKey> storage_key = @@ -727,7 +727,7 @@ continue; } - result.emplace_back(mojom::StorageUsageInfoV2::New( + result.emplace_back(mojom::StorageUsageInfo::New( storage_key.value(), row_data.size_bytes(), base::Time::FromInternalValue(row_data.last_modified()))); } @@ -742,13 +742,13 @@ it.second->storage_area()->empty()) { continue; } - result.emplace_back(mojom::StorageUsageInfoV2::New(it.first, 0, now)); + result.emplace_back(mojom::StorageUsageInfo::New(it.first, 0, now)); } std::move(callback).Run(std::move(result)); } void LocalStorageImpl::OnGotStorageUsageForShutdown( - std::vector<mojom::StorageUsageInfoV2Ptr> usage) { + std::vector<mojom::StorageUsageInfoPtr> usage) { std::vector<blink::StorageKey> storage_keys_to_delete; for (const auto& info : usage) { if (base::Contains(storage_keys_to_purge_on_shutdown_, info->storage_key))
diff --git a/components/services/storage/dom_storage/local_storage_impl.h b/components/services/storage/dom_storage/local_storage_impl.h index 464fef8..6c35fa9 100644 --- a/components/services/storage/dom_storage/local_storage_impl.h +++ b/components/services/storage/dom_storage/local_storage_impl.h
@@ -131,7 +131,7 @@ std::vector<DomStorageDatabase::KeyValuePair> data); void OnGotStorageUsageForShutdown( - std::vector<mojom::StorageUsageInfoV2Ptr> usage); + std::vector<mojom::StorageUsageInfoPtr> usage); void OnStorageKeysDeleted(leveldb::Status status); void OnShutdownComplete();
diff --git a/components/services/storage/dom_storage/local_storage_impl_unittest.cc b/components/services/storage/dom_storage/local_storage_impl_unittest.cc index cf39b96..01b34d1c 100644 --- a/components/services/storage/dom_storage/local_storage_impl_unittest.cc +++ b/components/services/storage/dom_storage/local_storage_impl_unittest.cc
@@ -44,8 +44,8 @@ void GetStorageUsageCallback( const base::RepeatingClosure& callback, - std::vector<mojom::StorageUsageInfoV2Ptr>* out_result, - std::vector<mojom::StorageUsageInfoV2Ptr> result) { + std::vector<mojom::StorageUsageInfoPtr>* out_result, + std::vector<mojom::StorageUsageInfoPtr> result) { *out_result = std::move(result); callback.Run(); } @@ -202,9 +202,9 @@ return contents; } - std::vector<mojom::StorageUsageInfoV2Ptr> GetStorageUsageSync() { + std::vector<mojom::StorageUsageInfoPtr> GetStorageUsageSync() { base::RunLoop run_loop; - std::vector<mojom::StorageUsageInfoV2Ptr> result; + std::vector<mojom::StorageUsageInfoPtr> result; context()->GetUsage(base::BindOnce(&GetStorageUsageCallback, run_loop.QuitClosure(), &result)); run_loop.Run(); @@ -433,7 +433,7 @@ } TEST_F(LocalStorageImplTest, GetStorageUsage_NoData) { - std::vector<mojom::StorageUsageInfoV2Ptr> info = GetStorageUsageSync(); + std::vector<mojom::StorageUsageInfoPtr> info = GetStorageUsageSync(); EXPECT_EQ(0u, info.size()); } @@ -464,7 +464,7 @@ base::Time after_write = base::Time::Now(); - std::vector<mojom::StorageUsageInfoV2Ptr> info = GetStorageUsageSync(); + std::vector<mojom::StorageUsageInfoPtr> info = GetStorageUsageSync(); ASSERT_EQ(2u, info.size()); if (info[0]->storage_key == storage_key2) std::swap(info[0], info[1]);
diff --git a/components/services/storage/privileged/mojom/indexed_db_control.mojom b/components/services/storage/privileged/mojom/indexed_db_control.mojom index f4a081c..706b4da 100644 --- a/components/services/storage/privileged/mojom/indexed_db_control.mojom +++ b/components/services/storage/privileged/mojom/indexed_db_control.mojom
@@ -57,9 +57,9 @@ pending_receiver<blink.mojom.IDBFactory> receiver); // Retrieves some basic usage information about the IndexedDB state. The - // returned array has one StorageUsageInfoV2 per `storage_key` in the + // returned array has one StorageUsageInfo per `storage_key` in the // partition that has IndexedDB usage data. - GetUsage() => (array<StorageUsageInfoV2> info); + GetUsage() => (array<StorageUsageInfo> info); // Deletes all indexed db files (across all buckets) for the given // `storage_key`.
diff --git a/components/services/storage/public/mojom/cache_storage_control.mojom b/components/services/storage/public/mojom/cache_storage_control.mojom index b31be2c..a0035c5f 100644 --- a/components/services/storage/public/mojom/cache_storage_control.mojom +++ b/components/services/storage/public/mojom/cache_storage_control.mojom
@@ -53,7 +53,7 @@ // Used in response to browsing data and quota manager requests to get // the per-StorageKey size and last time used data. - GetAllStorageKeysInfo() => (array<StorageUsageInfoV2> usage_info); + GetAllStorageKeysInfo() => (array<StorageUsageInfo> usage_info); // Adds an observer that will receive cache change callbacks. AddObserver(pending_remote<CacheStorageObserver> observer);
diff --git a/components/services/storage/public/mojom/local_storage_control.mojom b/components/services/storage/public/mojom/local_storage_control.mojom index fe533ec..282e816b 100644 --- a/components/services/storage/public/mojom/local_storage_control.mojom +++ b/components/services/storage/public/mojom/local_storage_control.mojom
@@ -21,7 +21,7 @@ pending_receiver<blink.mojom.StorageArea> receiver); // Retrieves some basic usage information about the Local Storage state. - GetUsage() => (array<StorageUsageInfoV2> info); + GetUsage() => (array<StorageUsageInfo> info); // Deletes all Local State state for the given `storage_key`. Responds when // the deletion is complete.
diff --git a/components/services/storage/public/mojom/storage_usage_info.mojom b/components/services/storage/public/mojom/storage_usage_info.mojom index 161177e0..c97bd484 100644 --- a/components/services/storage/public/mojom/storage_usage_info.mojom +++ b/components/services/storage/public/mojom/storage_usage_info.mojom
@@ -8,7 +8,7 @@ import "third_party/blink/public/mojom/storage_key/storage_key.mojom"; // A mojo interface for content::StorageUsageInfo. -struct StorageUsageInfoV2 { +struct StorageUsageInfo { // The storage key for this usage information. blink.mojom.StorageKey storage_key;
diff --git a/components/services/storage/shared_storage/async_shared_storage_database.h b/components/services/storage/shared_storage/async_shared_storage_database.h index 7a34f37..fadbc3f 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database.h +++ b/components/services/storage/shared_storage/async_shared_storage_database.h
@@ -193,12 +193,12 @@ virtual void PurgeStaleOrigins( base::OnceCallback<void(OperationResult)> callback) = 0; - // Fetches a vector of `mojom::StorageUsageInfoV2Ptr`, with one - // `mojom::StorageUsageInfoV2Ptr` for each origin currently using shared + // Fetches a vector of `mojom::StorageUsageInfoPtr`, with one + // `mojom::StorageUsageInfoPtr` for each origin currently using shared // storage in this profile. If `exclude_empty_origins` is true, then only // those with positive `length` are included in the vector. virtual void FetchOrigins( - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> callback, bool exclude_empty_origins = true) = 0;
diff --git a/components/services/storage/shared_storage/async_shared_storage_database_impl.cc b/components/services/storage/shared_storage/async_shared_storage_database_impl.cc index 05c0ebbc..b5a2d851 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database_impl.cc +++ b/components/services/storage/shared_storage/async_shared_storage_database_impl.cc
@@ -178,8 +178,7 @@ } void AsyncSharedStorageDatabaseImpl::FetchOrigins( - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> - callback, + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> callback, bool exclude_empty_origins) { DCHECK(callback); DCHECK(database_);
diff --git a/components/services/storage/shared_storage/async_shared_storage_database_impl.h b/components/services/storage/shared_storage/async_shared_storage_database_impl.h index b954ab7da..a11b5c0 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database_impl.h +++ b/components/services/storage/shared_storage/async_shared_storage_database_impl.h
@@ -113,10 +113,9 @@ bool perform_storage_cleanup = false) override; void PurgeStaleOrigins( base::OnceCallback<void(OperationResult)> callback) override; - void FetchOrigins( - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> - callback, - bool exclude_empty_origins = true) override; + void FetchOrigins(base::OnceCallback< + void(std::vector<mojom::StorageUsageInfoPtr>)> callback, + bool exclude_empty_origins = true) override; void MakeBudgetWithdrawal( url::Origin context_origin, double bits_debit,
diff --git a/components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc b/components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc index 4be3c7f..5c56ce1 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc +++ b/components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc
@@ -526,7 +526,7 @@ return future.Get(); } - void FetchOrigins(std::vector<mojom::StorageUsageInfoV2Ptr>* out_result, + void FetchOrigins(std::vector<mojom::StorageUsageInfoPtr>* out_result, bool exclude_empty_origins = true) { DCHECK(out_result); DCHECK(async_database_); @@ -540,11 +540,11 @@ async_database_->FetchOrigins(std::move(callback), exclude_empty_origins); } - std::vector<mojom::StorageUsageInfoV2Ptr> FetchOriginsSync( + std::vector<mojom::StorageUsageInfoPtr> FetchOriginsSync( bool exclude_empty_origins = true) { DCHECK(async_database_); - base::test::TestFuture<std::vector<mojom::StorageUsageInfoV2Ptr>> future; + base::test::TestFuture<std::vector<mojom::StorageUsageInfoPtr>> future; async_database_->FetchOrigins(future.GetCallback(), exclude_empty_origins); return future.Take(); } @@ -1803,7 +1803,7 @@ // Check that origin list is initially empty due to the database not being // initialized. - std::vector<mojom::StorageUsageInfoV2Ptr> infos1; + std::vector<mojom::StorageUsageInfoPtr> infos1; FetchOrigins(&infos1); // Check that calling `PurgeStaleOrigins()` on the uninitialized database @@ -1854,7 +1854,7 @@ int length4 = -1; Length(kOrigin4, &length4); - std::vector<mojom::StorageUsageInfoV2Ptr> infos2; + std::vector<mojom::StorageUsageInfoPtr> infos2; FetchOrigins(&infos2); bool success1 = false; @@ -1875,9 +1875,9 @@ int length8 = -1; Length(kOrigin4, &length8); - std::vector<mojom::StorageUsageInfoV2Ptr> infos3; + std::vector<mojom::StorageUsageInfoPtr> infos3; FetchOrigins(&infos3); - std::vector<mojom::StorageUsageInfoV2Ptr> infos4; + std::vector<mojom::StorageUsageInfoPtr> infos4; FetchOrigins(&infos4, /*exclude_empty_origins=*/false); bool success2 = false; @@ -1900,9 +1900,9 @@ TrimMemory(); - std::vector<mojom::StorageUsageInfoV2Ptr> infos5; + std::vector<mojom::StorageUsageInfoPtr> infos5; FetchOrigins(&infos5); - std::vector<mojom::StorageUsageInfoV2Ptr> infos6; + std::vector<mojom::StorageUsageInfoPtr> infos6; FetchOrigins(&infos6, /*exclude_empty_origins=*/false); OperationResult result14 = OperationResult::kSqlError; @@ -2208,7 +2208,7 @@ // Check that origin list is initially empty due to the database not being // initialized. - std::vector<mojom::StorageUsageInfoV2Ptr> infos1; + std::vector<mojom::StorageUsageInfoPtr> infos1; FetchOrigins(&infos1); // Check that calling `PurgeMatchingOrigins()` on the uninitialized database @@ -2266,7 +2266,7 @@ int length5 = -1; Length(kOrigin5, &length5); - std::vector<mojom::StorageUsageInfoV2Ptr> infos2; + std::vector<mojom::StorageUsageInfoPtr> infos2; FetchOrigins(&infos2); bool success1 = false; @@ -2290,9 +2290,9 @@ int length10 = -1; Length(kOrigin5, &length10); - std::vector<mojom::StorageUsageInfoV2Ptr> infos3; + std::vector<mojom::StorageUsageInfoPtr> infos3; FetchOrigins(&infos3); - std::vector<mojom::StorageUsageInfoV2Ptr> infos4; + std::vector<mojom::StorageUsageInfoPtr> infos4; FetchOrigins(&infos4, /*exclude_empty_origins=*/false); bool success2 = false; @@ -2320,9 +2320,9 @@ TrimMemory(); - std::vector<mojom::StorageUsageInfoV2Ptr> infos5; + std::vector<mojom::StorageUsageInfoPtr> infos5; FetchOrigins(&infos5); - std::vector<mojom::StorageUsageInfoV2Ptr> infos6; + std::vector<mojom::StorageUsageInfoPtr> infos6; FetchOrigins(&infos6, /*exclude_empty_origins=*/false); GetResult value1;
diff --git a/components/services/storage/shared_storage/shared_storage_database.cc b/components/services/storage/shared_storage/shared_storage_database.cc index 7adce84..b39fb4e 100644 --- a/components/services/storage/shared_storage/shared_storage_database.cc +++ b/components/services/storage/shared_storage/shared_storage_database.cc
@@ -762,7 +762,7 @@ return OperationResult::kSuccess; } -std::vector<mojom::StorageUsageInfoV2Ptr> SharedStorageDatabase::FetchOrigins( +std::vector<mojom::StorageUsageInfoPtr> SharedStorageDatabase::FetchOrigins( bool exclude_empty_origins) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -778,10 +778,10 @@ "ORDER BY context_origin"; sql::Statement statement(db_.GetUniqueStatement(kSelectSql)); - std::vector<mojom::StorageUsageInfoV2Ptr> fetched_origin_infos; + std::vector<mojom::StorageUsageInfoPtr> fetched_origin_infos; while (statement.Step()) { - fetched_origin_infos.emplace_back(mojom::StorageUsageInfoV2::New( + fetched_origin_infos.emplace_back(mojom::StorageUsageInfo::New( blink::StorageKey(url::Origin::Create(GURL(statement.ColumnString(0)))), statement.ColumnInt64(2) * kSharedStorageEntryTotalBytesMultiplier * max_string_length_,
diff --git a/components/services/storage/shared_storage/shared_storage_database.h b/components/services/storage/shared_storage/shared_storage_database.h index 5c5db41d..fcd0eb0e 100644 --- a/components/services/storage/shared_storage/shared_storage_database.h +++ b/components/services/storage/shared_storage/shared_storage_database.h
@@ -288,11 +288,11 @@ // `time_stamps` older than `clock_->Now() - budget_interval_`. [[nodiscard]] OperationResult PurgeStaleOrigins(); - // Fetches a vector of `mojom::StorageUsageInfoV2Ptr`, with one - // `mojom::StorageUsageInfoV2Ptr` for each origin currently using shared + // Fetches a vector of `mojom::StorageUsageInfoPtr`, with one + // `mojom::StorageUsageInfoPtr` for each origin currently using shared // storage in this profile. If `exclude_empty_origins` is true, then only // those with positive `length` are included in the vector. - [[nodiscard]] std::vector<mojom::StorageUsageInfoV2Ptr> FetchOrigins( + [[nodiscard]] std::vector<mojom::StorageUsageInfoPtr> FetchOrigins( bool exclude_empty_origins = true); // Makes a withdrawal of `bits_debit` stamped with the current time from the
diff --git a/components/services/storage/shared_storage/shared_storage_manager.cc b/components/services/storage/shared_storage/shared_storage_manager.cc index 62ed8b9..14b54dbf 100644 --- a/components/services/storage/shared_storage/shared_storage_manager.cc +++ b/components/services/storage/shared_storage/shared_storage_manager.cc
@@ -210,8 +210,7 @@ } void SharedStorageManager::FetchOrigins( - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> - callback, + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> callback, bool exclude_empty_origins) { DCHECK(database_); database_->FetchOrigins(std::move(callback), exclude_empty_origins);
diff --git a/components/services/storage/shared_storage/shared_storage_manager.h b/components/services/storage/shared_storage/shared_storage_manager.h index 764107f..d8407d7 100644 --- a/components/services/storage/shared_storage/shared_storage_manager.h +++ b/components/services/storage/shared_storage/shared_storage_manager.h
@@ -208,16 +208,15 @@ base::OnceCallback<void(OperationResult)> callback, bool perform_storage_cleanup = false); - // Fetches a vector of `mojom::StorageUsageInfoV2Ptr`, with one - // `mojom::StorageUsageInfoV2Ptr` for each origin currently using shared + // Fetches a vector of `mojom::StorageUsageInfoPtr`, with one + // `mojom::StorageUsageInfoPtr` for each origin currently using shared // storage in this profile. Called by // `browsing_data::SharedStorageHelper::StartFetching`. If // `exclude_empty_origins` is true, then only those with positive `length` are // included in the vector. - void FetchOrigins( - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> - callback, - bool exclude_empty_origins = true); + void FetchOrigins(base::OnceCallback< + void(std::vector<mojom::StorageUsageInfoPtr>)> callback, + bool exclude_empty_origins = true); // Makes a withdrawal of `bits_debit` stamped with the current time from the // privacy budget of `context_origin`.
diff --git a/components/services/storage/shared_storage/shared_storage_manager_unittest.cc b/components/services/storage/shared_storage/shared_storage_manager_unittest.cc index 2e22791..9c738c7 100644 --- a/components/services/storage/shared_storage/shared_storage_manager_unittest.cc +++ b/components/services/storage/shared_storage/shared_storage_manager_unittest.cc
@@ -118,10 +118,10 @@ return next_length; } - std::vector<mojom::StorageUsageInfoV2Ptr> NextInfos() { + std::vector<mojom::StorageUsageInfoPtr> NextInfos() { DCHECK(!result_queue_.empty()); result_queue_.pop(); - return std::vector<mojom::StorageUsageInfoV2Ptr>(); + return std::vector<mojom::StorageUsageInfoPtr>(); } private: @@ -205,10 +205,9 @@ base::OnceCallback<void(OperationResult)> callback) override { Run(std::move(callback)); } - void FetchOrigins( - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> - callback, - bool exclude_empty_origins = true) override { + void FetchOrigins(base::OnceCallback< + void(std::vector<mojom::StorageUsageInfoPtr>)> callback, + bool exclude_empty_origins = true) override { Run(std::move(callback)); } void MakeBudgetWithdrawal( @@ -288,7 +287,7 @@ .Then(std::move(callback)); } - void Run(base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> + void Run(base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> callback) { DCHECK(callback); mock_result_queue_.AsyncCall(&MockResultQueue::NextInfos) @@ -639,7 +638,7 @@ return future.Get(); } - void FetchOrigins(std::vector<mojom::StorageUsageInfoV2Ptr>* out_result, + void FetchOrigins(std::vector<mojom::StorageUsageInfoPtr>* out_result, bool exclude_empty_origins = true) { DCHECK(out_result); DCHECK(GetManager()); @@ -653,10 +652,10 @@ GetManager()->FetchOrigins(std::move(callback), exclude_empty_origins); } - std::vector<mojom::StorageUsageInfoV2Ptr> FetchOriginsSync( + std::vector<mojom::StorageUsageInfoPtr> FetchOriginsSync( bool exclude_empty_origins = true) { DCHECK(GetManager()); - base::test::TestFuture<std::vector<mojom::StorageUsageInfoV2Ptr>> future; + base::test::TestFuture<std::vector<mojom::StorageUsageInfoPtr>> future; GetManager()->FetchOrigins(future.GetCallback(), exclude_empty_origins); return future.Take(); } @@ -874,7 +873,7 @@ .time.ToDeltaSinceWindowsEpoch() .InMicroseconds()); - std::vector<mojom::StorageUsageInfoV2Ptr> infos = FetchOriginsSync(); + std::vector<mojom::StorageUsageInfoPtr> infos = FetchOriginsSync(); std::vector<url::Origin> origins; for (const auto& info : infos) origins.push_back(info->storage_key.origin()); @@ -972,7 +971,7 @@ .data, u"k"); - std::vector<mojom::StorageUsageInfoV2Ptr> infos = FetchOriginsSync(); + std::vector<mojom::StorageUsageInfoPtr> infos = FetchOriginsSync(); std::vector<url::Origin> origins; for (const auto& info : infos) origins.push_back(info->storage_key.origin()); @@ -1916,7 +1915,7 @@ // Check that origin list is initially empty due to the database not being // initialized. - std::vector<mojom::StorageUsageInfoV2Ptr> infos1; + std::vector<mojom::StorageUsageInfoPtr> infos1; FetchOrigins(&infos1); OperationResult result1 = OperationResult::kSqlError; @@ -1962,7 +1961,7 @@ int length5 = -1; Length(kOrigin5, &length5); - std::vector<mojom::StorageUsageInfoV2Ptr> infos2; + std::vector<mojom::StorageUsageInfoPtr> infos2; FetchOrigins(&infos2); bool success1 = false; @@ -1986,7 +1985,7 @@ int length10 = -1; Length(kOrigin5, &length10); - std::vector<mojom::StorageUsageInfoV2Ptr> infos3; + std::vector<mojom::StorageUsageInfoPtr> infos3; FetchOrigins(&infos3); bool success2 = false; @@ -2015,7 +2014,7 @@ EXPECT_FALSE(memory_trimmed_); OnMemoryPressure(MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_CRITICAL); - std::vector<mojom::StorageUsageInfoV2Ptr> infos4; + std::vector<mojom::StorageUsageInfoPtr> infos4; FetchOrigins(&infos4); GetResult value1;
diff --git a/components/services/storage/shared_storage/shared_storage_test_utils.cc b/components/services/storage/shared_storage/shared_storage_test_utils.cc index f68f06a..769b767 100644 --- a/components/services/storage/shared_storage/shared_storage_test_utils.cc +++ b/components/services/storage/shared_storage/shared_storage_test_utils.cc
@@ -277,8 +277,8 @@ void TestDatabaseOperationReceiver::InfosCallbackBase( const DBOperation& current_operation, - std::vector<mojom::StorageUsageInfoV2Ptr>* out_infos, - std::vector<mojom::StorageUsageInfoV2Ptr> infos) { + std::vector<mojom::StorageUsageInfoPtr>* out_infos, + std::vector<mojom::StorageUsageInfoPtr> infos) { DCHECK(out_infos); *out_infos = std::move(infos); @@ -286,10 +286,10 @@ Finish(); } -base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> +base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> TestDatabaseOperationReceiver::MakeInfosCallback( const DBOperation& current_operation, - std::vector<mojom::StorageUsageInfoV2Ptr>* out_infos) { + std::vector<mojom::StorageUsageInfoPtr>* out_infos) { return base::BindOnce(&TestDatabaseOperationReceiver::InfosCallbackBase, base::Unretained(this), current_operation, out_infos); }
diff --git a/components/services/storage/shared_storage/shared_storage_test_utils.h b/components/services/storage/shared_storage/shared_storage_test_utils.h index 00dfdee..42088b3 100644 --- a/components/services/storage/shared_storage/shared_storage_test_utils.h +++ b/components/services/storage/shared_storage/shared_storage_test_utils.h
@@ -161,11 +161,11 @@ InitStatus* out_status); void InfosCallbackBase(const DBOperation& current_operation, - std::vector<mojom::StorageUsageInfoV2Ptr>* out_infos, - std::vector<mojom::StorageUsageInfoV2Ptr> infos); - base::OnceCallback<void(std::vector<mojom::StorageUsageInfoV2Ptr>)> + std::vector<mojom::StorageUsageInfoPtr>* out_infos, + std::vector<mojom::StorageUsageInfoPtr> infos); + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> MakeInfosCallback(const DBOperation& current_operation, - std::vector<mojom::StorageUsageInfoV2Ptr>* out_infos); + std::vector<mojom::StorageUsageInfoPtr>* out_infos); void OnceClosureBase(const DBOperation& current_operation); base::OnceClosure MakeOnceClosure(const DBOperation& current_operation);
diff --git a/components/viz/host/hit_test/hit_test_query_unittest.cc b/components/viz/host/hit_test/hit_test_query_unittest.cc index 67b72e4..d290f073 100644 --- a/components/viz/host/hit_test/hit_test_query_unittest.cc +++ b/components/viz/host/hit_test/hit_test_query_unittest.cc
@@ -1194,7 +1194,7 @@ gfx::Transform transform_to_b; gfx::Transform expected_transform_to_b; expected_transform_to_b.Translate(-200, -150); - expected_transform_to_b.ConcatTransform(transform_c_to_b); + expected_transform_to_b.PostConcat(transform_c_to_b); EXPECT_TRUE(hit_test_query().GetTransformToTarget(b_id, &transform_to_b)); // Use ToString so that we can compare float. EXPECT_EQ(transform_to_b.ToString(), expected_transform_to_b.ToString());
diff --git a/components/viz/service/display/dc_layer_overlay.cc b/components/viz/service/display/dc_layer_overlay.cc index 8e46503..cffe74d 100644 --- a/components/viz/service/display/dc_layer_overlay.cc +++ b/components/viz/service/display/dc_layer_overlay.cc
@@ -142,7 +142,7 @@ // root transforms must be applied to it. gfx::Transform quad_to_root_transform( quad->shared_quad_state->quad_to_target_transform); - quad_to_root_transform.ConcatTransform(transform_to_root_target); + quad_to_root_transform.PostConcat(transform_to_root_target); // Flatten transform to 2D since DirectComposition doesn't support 3D // transforms. This only applies when non axis aligned overlays are enabled. quad_to_root_transform.FlattenTo2d(); @@ -202,9 +202,9 @@ quad_to_root_transform.Scale(1.0, -1.0); quad_to_root_transform.PostTranslate(0.0, dc_layer->content_rect.height()); } - quad_to_root_transform.ConcatTransform( + quad_to_root_transform.PostConcat( quad->shared_quad_state->quad_to_target_transform); - quad_to_root_transform.ConcatTransform(transform_to_root_target); + quad_to_root_transform.PostConcat(transform_to_root_target); // Flatten transform to 2D since DirectComposition doesn't support 3D // transforms. This only applies when non axis aligned overlays are enabled. quad_to_root_transform.FlattenTo2d();
diff --git a/components/viz/service/display/direct_renderer.cc b/components/viz/service/display/direct_renderer.cc index 7bd5729..b71d40d 100644 --- a/components/viz/service/display/direct_renderer.cc +++ b/components/viz/service/display/direct_renderer.cc
@@ -131,19 +131,19 @@ DCHECK_LE(viewport_rect.bottom(), surface_size.height()); bool flip_y = FlippedFramebuffer(); if (flip_y) { - frame->projection_matrix = gfx::OrthoProjectionMatrix( + frame->target_to_device_transform = gfx::OrthoProjectionTransform( draw_rect.x(), draw_rect.right(), draw_rect.bottom(), draw_rect.y()); } else { - frame->projection_matrix = gfx::OrthoProjectionMatrix( + frame->target_to_device_transform = gfx::OrthoProjectionTransform( draw_rect.x(), draw_rect.right(), draw_rect.y(), draw_rect.bottom()); } gfx::Rect window_rect = viewport_rect; if (flip_y) window_rect.set_y(surface_size.height() - viewport_rect.bottom()); - frame->window_matrix = - gfx::WindowMatrix(window_rect.x(), window_rect.y(), window_rect.width(), - window_rect.height()); + frame->target_to_device_transform.PostConcat( + gfx::WindowTransform(window_rect.x(), window_rect.y(), + window_rect.width(), window_rect.height())); current_draw_rect_ = draw_rect; current_viewport_rect_ = viewport_rect; current_surface_size_ = surface_size;
diff --git a/components/viz/service/display/direct_renderer.h b/components/viz/service/display/direct_renderer.h index 759ccab..5b47646 100644 --- a/components/viz/service/display/direct_renderer.h +++ b/components/viz/service/display/direct_renderer.h
@@ -27,6 +27,7 @@ #include "ui/gfx/ca_layer_result.h" #include "ui/gfx/delegated_ink_metadata.h" #include "ui/gfx/display_color_spaces.h" +#include "ui/gfx/geometry/axis_transform2d.h" #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gpu_fence_handle.h" @@ -128,8 +129,7 @@ gfx::Size device_viewport_size; gfx::DisplayColorSpaces display_color_spaces; - gfx::Transform projection_matrix; - gfx::Transform window_matrix; + gfx::AxisTransform2d target_to_device_transform; OverlayProcessorInterface::CandidateList overlay_list; // When we have a buffer queue, the output surface could be treated as an
diff --git a/components/viz/service/display/overlay_candidate_factory.cc b/components/viz/service/display/overlay_candidate_factory.cc index f3939737..249e81ec 100644 --- a/components/viz/service/display/overlay_candidate_factory.cc +++ b/components/viz/service/display/overlay_candidate_factory.cc
@@ -351,7 +351,7 @@ if (supports_arbitrary_transform_) { gfx::Transform transform = sqs->quad_to_target_transform; if (y_flipped) { - transform.PreconcatTransform(gfx::OverlayTransformToTransform( + transform.PreConcat(gfx::OverlayTransformToTransform( gfx::OVERLAY_TRANSFORM_FLIP_VERTICAL, candidate.display_rect.size())); } candidate.transform = transform;
diff --git a/components/viz/service/display/renderer_perftest.cc b/components/viz/service/display/renderer_perftest.cc index 051f5be..e289be0 100644 --- a/components/viz/service/display/renderer_perftest.cc +++ b/components/viz/service/display/renderer_perftest.cc
@@ -567,7 +567,7 @@ /*premultiplied_alpha=*/false, shared_state, pass.get()); - current_transform.ConcatTransform(transform_step); + current_transform.PostConcat(transform_step); } CompositorRenderPassList pass_list;
diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc index 153bc1e..d040c82a 100644 --- a/components/viz/service/display/skia_renderer.cc +++ b/components/viz/service/display/skia_renderer.cc
@@ -483,9 +483,9 @@ const SkSamplingOptions& sampling, const gfx::QuadF* draw_region); - // window_matrix * projection_matrix * quad_to_target_transform normally, - // or quad_to_target_transform if the remaining device transform is held in - // the DrawRPDQParams for a bypass quad. + // target_to_device_transform * quad_to_target_transform normally, or + // quad_to_target_transform if the remaining device transform is held in the + // DrawRPDQParams for a bypass quad. gfx::Transform content_device_transform; // The DrawQuad's rect. gfx::RectF rect; @@ -1167,11 +1167,9 @@ if (!current_canvas_) return; TRACE_EVENT0("viz", "SkiaRenderer::DoDrawQuad"); - gfx::Transform target_to_device = - current_frame()->window_matrix * current_frame()->projection_matrix; const gfx::Rect* scissor = is_scissor_enabled_ ? &scissor_rect_ : nullptr; - DrawQuadParams params = - CalculateDrawQuadParams(target_to_device, scissor, quad, draw_region); + DrawQuadParams params = CalculateDrawQuadParams( + current_frame()->target_to_device_transform, scissor, quad, draw_region); // The outer DrawQuad will never have RPDQ params DrawQuadInternal(quad, /* rpdq */ nullptr, ¶ms); } @@ -1550,16 +1548,17 @@ } SkiaRenderer::DrawQuadParams SkiaRenderer::CalculateDrawQuadParams( - const gfx::Transform& target_to_device, + const gfx::AxisTransform2d& target_to_device, const gfx::Rect* scissor_rect, const DrawQuad* quad, const gfx::QuadF* draw_region) const { DrawQuadParams params( - target_to_device * quad->shared_quad_state->quad_to_target_transform, - gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect), - SkCanvas::kNone_QuadAAFlags, quad->shared_quad_state->blend_mode, - quad->shared_quad_state->opacity, GetSampling(quad), draw_region); + quad->shared_quad_state->quad_to_target_transform, gfx::RectF(quad->rect), + gfx::RectF(quad->visible_rect), SkCanvas::kNone_QuadAAFlags, + quad->shared_quad_state->blend_mode, quad->shared_quad_state->opacity, + GetSampling(quad), draw_region); + params.content_device_transform.PostConcat(target_to_device); params.content_device_transform.FlattenTo2d(); // Respect per-quad setting overrides as highest priority setting @@ -1602,7 +1601,7 @@ // device space, which should always be a scale+translate. SkRRect corner_bounds = static_cast<SkRRect>( quad->shared_quad_state->mask_filter_info.rounded_corner_bounds()); - SkMatrix to_device = gfx::TransformToFlattenedSkMatrix(target_to_device); + SkMatrix to_device = gfx::AxisTransform2dToSkMatrix(target_to_device); // SkRRect::transform should always succeed here, since we know // corner_bounds is not empty and 'to_device' should just be scale+translate @@ -1858,7 +1857,7 @@ // include the RP's output rect as part of the scissor rect, since it would // have been clipped to the edges of the RP's offscreen buffer normally. DrawQuadParams bypass_params = CalculateDrawQuadParams( - gfx::Transform() /* identity */, nullptr, bypass_quad, nullptr); + gfx::AxisTransform2d() /* identity */, nullptr, bypass_quad, nullptr); // |params| already holds the correct |draw_region|, but must be updated to // use the bypassed transform and geometry. @@ -3405,14 +3404,12 @@ } const auto& viewport_size = current_frame()->device_viewport_size; - auto projection_matrix = gfx::OrthoProjectionMatrix( + gfx::AxisTransform2d target_to_device = gfx::OrthoProjectionTransform( /*left=*/0, /*right=*/viewport_size.width(), /*bottom=*/0, /*top=*/viewport_size.height()); - auto window_matrix = - gfx::WindowMatrix(/*x=*/0, /*y=*/0, /*width=*/viewport_size.width(), - /*height=*/viewport_size.height()); - - gfx::Transform target_to_device = window_matrix * projection_matrix; + target_to_device.PostConcat( + gfx::WindowTransform(/*x=*/0, /*y=*/0, /*width=*/viewport_size.width(), + /*height=*/viewport_size.height())); DrawQuadParams params; DrawRPDQParams rpdq_params{gfx::RectF()};
diff --git a/components/viz/service/display/skia_renderer.h b/components/viz/service/display/skia_renderer.h index 43df679..a427eb7 100644 --- a/components/viz/service/display/skia_renderer.h +++ b/components/viz/service/display/skia_renderer.h
@@ -152,10 +152,11 @@ // The returned DrawQuadParams can be modified by the DrawX calls that accept // params so that they can apply explicit data transforms before sending to // Skia in a consistent manner. - DrawQuadParams CalculateDrawQuadParams(const gfx::Transform& target_to_device, - const gfx::Rect* scissor_rect, - const DrawQuad* quad, - const gfx::QuadF* draw_region) const; + DrawQuadParams CalculateDrawQuadParams( + const gfx::AxisTransform2d& target_to_device, + const gfx::Rect* scissor_rect, + const DrawQuad* quad, + const gfx::QuadF* draw_region) const; DrawRPDQParams CalculateRPDQParams(const AggregatedRenderPassDrawQuad* quad, DrawQuadParams* params);
diff --git a/components/viz/service/display/software_renderer.cc b/components/viz/service/display/software_renderer.cc index 79bab80..1bce53ab 100644 --- a/components/viz/service/display/software_renderer.cc +++ b/components/viz/service/display/software_renderer.cc
@@ -185,11 +185,10 @@ if (!current_canvas_) return; - gfx::Transform screen_transform = - current_frame()->window_matrix * current_frame()->projection_matrix; SkRRect result; - if (SkRRect(rrect).transform( - gfx::TransformToFlattenedSkMatrix(screen_transform), &result)) { + if (SkRRect(rrect).transform(gfx::AxisTransform2dToSkMatrix( + current_frame()->target_to_device_transform), + &result)) { // Skia applies the current matrix to clip rects so we reset it temporarily. SkMatrix current_matrix = current_canvas_->getTotalMatrix(); current_canvas_->resetMatrix(); @@ -269,9 +268,9 @@ QuadRectTransform(&quad_rect_matrix, quad->shared_quad_state->quad_to_target_transform, gfx::RectF(quad->rect)); - gfx::Transform contents_device_transform = - current_frame()->window_matrix * current_frame()->projection_matrix * - quad_rect_matrix; + gfx::Transform contents_device_transform = quad_rect_matrix; + contents_device_transform.PostConcat( + current_frame()->target_to_device_transform); contents_device_transform.FlattenTo2d(); SkMatrix sk_device_matrix = gfx::TransformToFlattenedSkMatrix(contents_device_transform); @@ -801,9 +800,9 @@ QuadRectTransform(&quad_rect_matrix, quad->shared_quad_state->quad_to_target_transform, gfx::RectF(quad->rect)); - gfx::Transform contents_device_transform = - current_frame()->window_matrix * current_frame()->projection_matrix * - quad_rect_matrix; + gfx::Transform contents_device_transform = quad_rect_matrix; + contents_device_transform.PostConcat( + current_frame()->target_to_device_transform); contents_device_transform.FlattenTo2d(); absl::optional<gfx::RRectF> backdrop_filter_bounds;
diff --git a/components/viz/service/display/surface_aggregator.cc b/components/viz/service/display/surface_aggregator.cc index 5c2e883..032e15c 100644 --- a/components/viz/service/display/surface_aggregator.cc +++ b/components/viz/service/display/surface_aggregator.cc
@@ -183,7 +183,7 @@ // root draw pass from a surface into a pass when the surface draw quad's // transform is not identity. gfx::Transform new_transform = quad_to_target_transform; - new_transform.ConcatTransform(target_transform); + new_transform.PostConcat(target_transform); shared_quad_state->SetAll( new_transform, quad_layer_rect, visible_quad_layer_rect, @@ -739,7 +739,7 @@ referenced_surfaces_.insert(surface_id); gfx::Transform combined_transform = scaled_quad_to_target_transform; - combined_transform.ConcatTransform(target_transform); + combined_transform.PostConcat(target_transform); // If the SurfaceDrawQuad is marked as being reflected and surface contents // are going to be scaled then keep the RenderPass. This allows the reflected @@ -818,8 +818,8 @@ // Contributing passes aggregated in to the pass list need to take the // transform of the surface quad into account to update their transform to // the root surface. - copy_pass->transform_to_root_target.ConcatTransform(combined_transform); - copy_pass->transform_to_root_target.ConcatTransform( + copy_pass->transform_to_root_target.PostConcat(combined_transform); + copy_pass->transform_to_root_target.PostConcat( dest_pass->transform_to_root_target); CopyQuadsToPass(resolved_frame, resolved_pass, copy_pass.get(),
diff --git a/components/viz/service/hit_test/hit_test_aggregator.cc b/components/viz/service/hit_test/hit_test_aggregator.cc index 5d0dc478..0bc3439 100644 --- a/components/viz/service/hit_test/hit_test_aggregator.cc +++ b/components/viz/service/hit_test/hit_test_aggregator.cc
@@ -153,7 +153,7 @@ // element we can simplify the tree by merging the flags and transform // into the kHitTestChildSurface element. if (!hit_test_region_list->transform.IsIdentity()) - transform.PreconcatTransform(hit_test_region_list->transform); + transform.PreConcat(hit_test_region_list->transform); flags |= hit_test_region_list->flags; reasons |= hit_test_region_list->async_hit_test_reasons;
diff --git a/components/viz/service/transitions/surface_animation_manager.cc b/components/viz/service/transitions/surface_animation_manager.cc index 7ea3cb56..54cab0aa 100644 --- a/components/viz/service/transitions/surface_animation_manager.cc +++ b/components/viz/service/transitions/surface_animation_manager.cc
@@ -180,7 +180,7 @@ transform.Translate(-shared_pass_output_rect.x(), -shared_pass_output_rect.y()); - copied_quad_state->quad_to_target_transform.PreconcatTransform(transform); + copied_quad_state->quad_to_target_transform.PreConcat(transform); auto* render_pass_quad = target_render_pass @@ -811,7 +811,7 @@ auto* pass_for_draw = transition_pass.get(); if (!pass_for_draw) { pass_for_draw = animation_pass; - src_transform.ConcatTransform(combined_transform); + src_transform.PostConcat(combined_transform); src_opacity *= combined_opacity; blend_mode = SkBlendMode::kSrcOver; } @@ -850,7 +850,7 @@ SkBlendMode blend_mode = SkBlendMode::kSrc; if (!pass_for_draw) { pass_for_draw = animation_pass; - dest_transform.ConcatTransform(combined_transform); + dest_transform.PostConcat(combined_transform); dest_opacity *= combined_opacity; blend_mode = SkBlendMode::kSrcOver; }
diff --git a/content/browser/browsing_data/shared_storage_clear_site_data_tester.cc b/content/browser/browsing_data/shared_storage_clear_site_data_tester.cc index 9e5b2e1..564eca43 100644 --- a/content/browser/browsing_data/shared_storage_clear_site_data_tester.cc +++ b/content/browser/browsing_data/shared_storage_clear_site_data_tester.cc
@@ -75,7 +75,7 @@ storage_partition_impl_->GetSharedStorageManager(); DCHECK(shared_storage_manager); - base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoV2Ptr>> + base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoPtr>> future; shared_storage_manager->FetchOrigins(future.GetCallback()); auto infos = future.Take(); @@ -95,7 +95,7 @@ storage_partition_impl_->GetSharedStorageManager(); DCHECK(shared_storage_manager); - base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoV2Ptr>> + base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoPtr>> future; shared_storage_manager->FetchOrigins(future.GetCallback()); auto infos = future.Take(); @@ -115,7 +115,7 @@ storage_partition_impl_->GetSharedStorageManager(); DCHECK(shared_storage_manager); - base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoV2Ptr>> + base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoPtr>> future; shared_storage_manager->FetchOrigins(future.GetCallback()); auto infos = future.Take();
diff --git a/content/browser/cache_storage/cache_storage_context_unittest.cc b/content/browser/cache_storage/cache_storage_context_unittest.cc index 67c6333..d7eb790 100644 --- a/content/browser/cache_storage/cache_storage_context_unittest.cc +++ b/content/browser/cache_storage/cache_storage_context_unittest.cc
@@ -106,7 +106,7 @@ // completed. base::RunLoop loop; cache_storage_context_->GetAllStorageKeysInfo(base::BindLambdaForTesting( - [&](std::vector<storage::mojom::StorageUsageInfoV2Ptr> inner) { + [&](std::vector<storage::mojom::StorageUsageInfoPtr> inner) { loop.Quit(); })); loop.Run();
diff --git a/content/browser/cache_storage/cache_storage_manager.cc b/content/browser/cache_storage/cache_storage_manager.cc index a80e3fc..6a7eda4 100644 --- a/content/browser/cache_storage/cache_storage_manager.cc +++ b/content/browser/cache_storage/cache_storage_manager.cc
@@ -175,8 +175,7 @@ storage::mojom::CacheStorageOwner owner, const base::FilePath& profile_path, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>>& - usage_tuples, + storage::mojom::StorageUsageInfoPtr>>& usage_tuples, bool is_origin_path = false) { if (!base::PathExists(index_file_directory_path)) { return; @@ -279,15 +278,15 @@ index_last_modified, index); usage_tuples.emplace_back( - bucket_locator, storage::mojom::StorageUsageInfoV2::New( + bucket_locator, storage::mojom::StorageUsageInfo::New( storage_key, storage_size, file_info.last_modified)); RecordIndexValidationResult(IndexResult::kOk); } void GetStorageKeyAndLastModifiedGotBucket( - storage::mojom::StorageUsageInfoV2Ptr info, + storage::mojom::StorageUsageInfoPtr info, base::OnceCallback<void(std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>)> + storage::mojom::StorageUsageInfoPtr>)> callback, storage::QuotaErrorOr<storage::BucketInfo> result) { storage::BucketLocator bucket_locator{}; @@ -299,7 +298,7 @@ base::BindOnce( std::move(callback), std::make_tuple(bucket_locator, - storage::mojom::StorageUsageInfoV2::New( + storage::mojom::StorageUsageInfo::New( info->storage_key, info->total_size_bytes, info->last_modified)))); } @@ -310,13 +309,13 @@ scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy, scoped_refptr<base::SequencedTaskRunner> scheduler_task_runner, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> usage_tuples, + storage::mojom::StorageUsageInfoPtr>> usage_tuples, base::FilePath profile_path, storage::mojom::CacheStorageOwner owner, base::OnceCallback< void(std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>>)> + storage::mojom::StorageUsageInfoPtr>>)> callback) { // Add entries to `usage_tuples` from the directory for default buckets // corresponding to first-party contexts. @@ -380,15 +379,13 @@ // that our CacheStorageCache instance map could get populated with entries // that map to the same file path (for instances where the bucket ID isn't a // part of the directory path), triggering an infinite hang. - const auto barrier_callback = - base::BarrierCallback<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>>( - usage_tuples.size(), std::move(callback)); + const auto barrier_callback = base::BarrierCallback< + std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoPtr>>( + usage_tuples.size(), std::move(callback)); for (const auto& usage_tuple : usage_tuples) { const storage::BucketLocator& bucket_locator = std::get<0>(usage_tuple); - const storage::mojom::StorageUsageInfoV2Ptr& info = - std::get<1>(usage_tuple); + const storage::mojom::StorageUsageInfoPtr& info = std::get<1>(usage_tuple); // TODO(https://crbug.com/1218097): To support named buckets, we'll need to // store the bucket name in the index file and use that in the // `QuotaManagerProxy::UpdateOrCreateBucket()` call below. @@ -397,7 +394,7 @@ scheduler_task_runner, base::BindOnce( &GetStorageKeyAndLastModifiedGotBucket, - storage::mojom::StorageUsageInfoV2::New( + storage::mojom::StorageUsageInfo::New( info->storage_key, info->total_size_bytes, info->last_modified), barrier_callback)); } @@ -405,7 +402,7 @@ void AllStorageKeySizesReported( storage::mojom::CacheStorageControl::GetAllStorageKeysInfoCallback callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usages) { + std::vector<storage::mojom::StorageUsageInfoPtr> usages) { // We should return only one entry per StorageKey, so condense down all // results before passing them to the callback. We condense by adding total // size bytes and using the latest last_modified value. @@ -424,11 +421,11 @@ } } - std::vector<storage::mojom::StorageUsageInfoV2Ptr> new_usages; + std::vector<storage::mojom::StorageUsageInfoPtr> new_usages; new_usages.reserve(storage_key_to_total_size_bytes.size()); for (const auto& storage_key_usage_info : storage_key_to_total_size_bytes) { - new_usages.emplace_back(storage::mojom::StorageUsageInfoV2::New( + new_usages.emplace_back(storage::mojom::StorageUsageInfo::New( storage_key_usage_info.first, storage_key_usage_info.second, storage_key_to_last_modified[storage_key_usage_info.first])); } @@ -439,7 +436,7 @@ } void OneStorageKeySizeReported( - base::OnceCallback<void(storage::mojom::StorageUsageInfoV2Ptr)> callback, + base::OnceCallback<void(storage::mojom::StorageUsageInfoPtr)> callback, const blink::StorageKey storage_key, const base::Time last_modified, int64_t size) { @@ -447,7 +444,7 @@ DCHECK_NE(size, CacheStorage::kSizeUnknown); base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(std::move(callback), - storage::mojom::StorageUsageInfoV2::New( + storage::mojom::StorageUsageInfo::New( storage_key, size, last_modified))); } @@ -587,7 +584,7 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); std::vector< - std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoV2Ptr>> + std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoPtr>> usages; if (IsMemoryBacked()) { @@ -595,11 +592,10 @@ if (bucket_details.first.second != owner) continue; const storage::BucketLocator& bucket_locator = bucket_details.first.first; - usages.emplace_back(bucket_locator, - storage::mojom::StorageUsageInfoV2::New( - bucket_locator.storage_key, - /*total_size_bytes=*/0, - /*last_modified=*/base::Time())); + usages.emplace_back(bucket_locator, storage::mojom::StorageUsageInfo::New( + bucket_locator.storage_key, + /*total_size_bytes=*/0, + /*last_modified=*/base::Time())); } GetAllStorageKeysUsageGetSizes(owner, std::move(callback), std::move(usages)); @@ -622,13 +618,12 @@ storage::mojom::CacheStorageOwner owner, storage::mojom::CacheStorageControl::GetAllStorageKeysInfoCallback callback, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> - usage_tuples) { + storage::mojom::StorageUsageInfoPtr>> usage_tuples) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); // The origin GURL and last modified times are set in |usages| but not the // size in bytes. Call each CacheStorage's Size() function to fill that out. - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usages; + std::vector<storage::mojom::StorageUsageInfoPtr> usages; if (usage_tuples.empty()) { scheduler_task_runner_->PostTask( FROM_HERE, base::BindOnce(std::move(callback), std::move(usages))); @@ -636,20 +631,19 @@ } const auto barrier_callback = - base::BarrierCallback<storage::mojom::StorageUsageInfoV2Ptr>( + base::BarrierCallback<storage::mojom::StorageUsageInfoPtr>( usage_tuples.size(), base::BindOnce(&AllStorageKeySizesReported, std::move(callback))); for (const auto& usage_tuple : usage_tuples) { const storage::BucketLocator& bucket_locator = std::get<0>(usage_tuple); - const storage::mojom::StorageUsageInfoV2Ptr& info = - std::get<1>(usage_tuple); + const storage::mojom::StorageUsageInfoPtr& info = std::get<1>(usage_tuple); if (info->total_size_bytes != CacheStorage::kSizeUnknown || !IsValidQuotaStorageKey(bucket_locator.storage_key)) { scheduler_task_runner_->PostTask( FROM_HERE, base::BindOnce(barrier_callback, - storage::mojom::StorageUsageInfoV2::New( + storage::mojom::StorageUsageInfo::New( info->storage_key, info->total_size_bytes, info->last_modified))); continue; @@ -731,7 +725,7 @@ } std::vector< - std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoV2Ptr>> + std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoPtr>> usage_tuples; cache_task_runner_->PostTask( @@ -751,8 +745,7 @@ base::OnceCallback<void(std::vector<blink::mojom::QuotaStatusCode>)> callback, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> - usage_tuples) { + storage::mojom::StorageUsageInfoPtr>> usage_tuples) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (usage_tuples.empty()) { std::vector<blink::mojom::QuotaStatusCode> results{ @@ -764,7 +757,7 @@ int instance_count = 0; for (const std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>& usage_tuple : + storage::mojom::StorageUsageInfoPtr>& usage_tuple : usage_tuples) { const storage::BucketLocator bucket_locator = std::get<0>(usage_tuple); if (!bucket_locator.is_default || @@ -779,7 +772,7 @@ std::move(callback)); for (const std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>& usage_tuple : + storage::mojom::StorageUsageInfoPtr>& usage_tuple : usage_tuples) { const storage::BucketLocator bucket_locator = std::get<0>(usage_tuple); if (!bucket_locator.is_default || @@ -836,7 +829,7 @@ // and either use the bucket locators from index files or directly delete any // unmigrated cache storage origin paths. std::vector< - std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoV2Ptr>> + std::tuple<storage::BucketLocator, storage::mojom::StorageUsageInfoPtr>> usage_tuples; cache_task_runner_->PostTask( FROM_HERE, @@ -1052,11 +1045,10 @@ void CacheStorageManager::ListStorageKeysOnTaskRunner( storage::mojom::QuotaClient::GetStorageKeysForTypeCallback callback, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> - usage_tuples) { + storage::mojom::StorageUsageInfoPtr>> usage_tuples) { std::vector<blink::StorageKey> out_storage_keys; for (const std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>& usage_tuple : + storage::mojom::StorageUsageInfoPtr>& usage_tuple : usage_tuples) { const storage::BucketLocator bucket_locator = std::get<0>(usage_tuple); if (!bucket_locator.id || !bucket_locator.is_default) {
diff --git a/content/browser/cache_storage/cache_storage_manager.h b/content/browser/cache_storage/cache_storage_manager.h index ccf90de..5282124d 100644 --- a/content/browser/cache_storage/cache_storage_manager.h +++ b/content/browser/cache_storage/cache_storage_manager.h
@@ -153,7 +153,7 @@ storage::mojom::CacheStorageControl::GetAllStorageKeysInfoCallback callback, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> + storage::mojom::StorageUsageInfoPtr>> usage_tuples); void DeleteStorageKeyDataGotAllBucketInfo( @@ -162,7 +162,7 @@ base::OnceCallback<void(std::vector<blink::mojom::QuotaStatusCode>)> callback, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> + storage::mojom::StorageUsageInfoPtr>> usage_tuples); void GetBucketUsageDidGetExists( @@ -195,7 +195,7 @@ void ListStorageKeysOnTaskRunner( storage::mojom::QuotaClient::GetStorageKeysForTypeCallback callback, std::vector<std::tuple<storage::BucketLocator, - storage::mojom::StorageUsageInfoV2Ptr>> + storage::mojom::StorageUsageInfoPtr>> usage_tuples); bool IsMemoryBacked() const { return profile_path_.empty(); }
diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc index bef93dd..394b0501 100644 --- a/content/browser/cache_storage/cache_storage_manager_unittest.cc +++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc
@@ -746,18 +746,17 @@ run_loop->Quit(); } - std::vector<storage::mojom::StorageUsageInfoV2Ptr> GetAllStorageKeysUsage( + std::vector<storage::mojom::StorageUsageInfoPtr> GetAllStorageKeysUsage( storage::mojom::CacheStorageOwner owner = storage::mojom::CacheStorageOwner::kCacheAPI) { base::RunLoop loop; - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage; + std::vector<storage::mojom::StorageUsageInfoPtr> usage; cache_manager_->GetAllStorageKeysUsage( - owner, - base::BindLambdaForTesting( - [&](std::vector<storage::mojom::StorageUsageInfoV2Ptr> inner) { - usage = std::move(inner); - loop.Quit(); - })); + owner, base::BindLambdaForTesting( + [&](std::vector<storage::mojom::StorageUsageInfoPtr> inner) { + usage = std::move(inner); + loop.Quit(); + })); loop.Run(); return usage; } @@ -1820,7 +1819,7 @@ EXPECT_TRUE( CachePut(callback_cache_handle_.value(), GURL("http://example.com/bar"))); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage = + std::vector<storage::mojom::StorageUsageInfoPtr> usage = GetAllStorageKeysUsage(); ASSERT_EQ(2ULL, usage.size()); @@ -1850,7 +1849,7 @@ EXPECT_TRUE( CachePut(callback_cache_handle_.value(), GURL("http://example.com/bar"))); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage = + std::vector<storage::mojom::StorageUsageInfoPtr> usage = GetAllStorageKeysUsage(); ASSERT_EQ(2ULL, usage.size()); @@ -1866,8 +1865,16 @@ EXPECT_FALSE(usage[storage_key2_index]->last_modified.is_null()); } +// TODO(crbug.com/1369300): Re-enable test for Windows. +#if BUILDFLAG(IS_WIN) +#define MAYBE_GetAllStorageKeysUsageWithPadding \ + DISABLED_GetAllStorageKeysUsageWithPadding +#else +#define MAYBE_GetAllStorageKeysUsageWithPadding \ + GetAllStorageKeysUsageWithPadding +#endif TEST_P(CacheStorageManagerStorageKeyAndBucketTestP, - GetAllStorageKeysUsageWithPadding) { + MAYBE_GetAllStorageKeysUsageWithPadding) { EXPECT_EQ(0ULL, GetAllStorageKeysUsage().size()); EXPECT_TRUE(Open(bucket_locator1_, "foo")); @@ -1934,10 +1941,10 @@ EXPECT_TRUE( CachePut(callback_cache_handle_.value(), GURL("http://example.com/bar"))); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_cache = + std::vector<storage::mojom::StorageUsageInfoPtr> usage_cache = GetAllStorageKeysUsage(storage::mojom::CacheStorageOwner::kCacheAPI); EXPECT_EQ(1ULL, usage_cache.size()); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage_bgf = + std::vector<storage::mojom::StorageUsageInfoPtr> usage_bgf = GetAllStorageKeysUsage( storage::mojom::CacheStorageOwner::kBackgroundFetch); ASSERT_EQ(2ULL, usage_bgf.size()); @@ -2001,7 +2008,7 @@ original_handle = CacheStorageCacheHandle(); // Capture the size before the index has necessarily flushed to disk. - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage = + std::vector<storage::mojom::StorageUsageInfoPtr> usage = GetAllStorageKeysUsage(); ASSERT_EQ(1ULL, usage.size()); int64_t usage_before_close = usage[0]->total_size_bytes; @@ -2060,7 +2067,7 @@ EXPECT_TRUE( CachePut(callback_cache_handle_.value(), GURL("http://example.com/foo"))); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> original_usage = + std::vector<storage::mojom::StorageUsageInfoPtr> original_usage = GetAllStorageKeysUsage(); ASSERT_EQ(2ULL, original_usage.size()); @@ -2095,7 +2102,7 @@ EXPECT_TRUE( CachePut(callback_cache_handle_.value(), GURL("http://example.com/foo"))); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> new_usage = + std::vector<storage::mojom::StorageUsageInfoPtr> new_usage = GetAllStorageKeysUsage(); ASSERT_EQ(2ULL, new_usage.size()); @@ -3113,7 +3120,7 @@ base::RepeatingCallback<void(const proto::CacheStorageIndex&, const proto::CacheStorageIndex&, int64_t)> test_logic) { - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usages = + std::vector<storage::mojom::StorageUsageInfoPtr> usages = GetAllStorageKeysUsage(); ASSERT_TRUE(usages.empty());
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.cc b/content/browser/dom_storage/dom_storage_context_wrapper.cc index 5829041..a95b792 100644 --- a/content/browser/dom_storage/dom_storage_context_wrapper.cc +++ b/content/browser/dom_storage/dom_storage_context_wrapper.cc
@@ -59,7 +59,7 @@ void AdaptStorageUsageInfo( DOMStorageContext::GetLocalStorageUsageCallback callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage) { + std::vector<storage::mojom::StorageUsageInfoPtr> usage) { std::vector<StorageUsageInfo> result; result.reserve(usage.size()); for (const auto& info : usage) { @@ -395,7 +395,7 @@ } void DOMStorageContextWrapper::OnStartupUsageRetrieved( - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage) { + std::vector<storage::mojom::StorageUsageInfoPtr> usage) { if (!storage_policy_observer_) return;
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.h b/content/browser/dom_storage/dom_storage_context_wrapper.h index c81dee0..9c656ed 100644 --- a/content/browser/dom_storage/dom_storage_context_wrapper.h +++ b/content/browser/dom_storage/dom_storage_context_wrapper.h
@@ -154,7 +154,7 @@ void PurgeMemory(PurgeOption purge_option); void OnStartupUsageRetrieved( - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage); + std::vector<storage::mojom::StorageUsageInfoPtr> usage); void ApplyPolicyUpdates( std::vector<storage::mojom::StoragePolicyUpdatePtr> policy_updates);
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 5d20e23..bd754d0 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc
@@ -220,7 +220,7 @@ int64_t size = 0; auto& control = GetControl(browser); control.GetUsage(base::BindLambdaForTesting( - [&](std::vector<storage::mojom::StorageUsageInfoV2Ptr> usages) { + [&](std::vector<storage::mojom::StorageUsageInfoPtr> usages) { for (auto& usage : usages) size += usage->total_size_bytes; loop.Quit();
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc index 7459834..93e5cfa0 100644 --- a/content/browser/indexed_db/indexed_db_context_impl.cc +++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -212,7 +212,7 @@ } void IndexedDBContextImpl::GetUsageImpl(GetUsageCallback usage_callback) { - std::map<blink::StorageKey, storage::mojom::StorageUsageInfoV2Ptr> usage_map; + std::map<blink::StorageKey, storage::mojom::StorageUsageInfoPtr> usage_map; for (const auto& bucket_locator : GetAllBuckets()) { const auto& it = usage_map.find(bucket_locator.storage_key); if (it != usage_map.end()) { @@ -223,12 +223,12 @@ } } else { usage_map[bucket_locator.storage_key] = - storage::mojom::StorageUsageInfoV2::New( + storage::mojom::StorageUsageInfo::New( bucket_locator.storage_key, GetBucketDiskUsage(bucket_locator), GetBucketLastModified(bucket_locator)); } } - std::vector<storage::mojom::StorageUsageInfoV2Ptr> result; + std::vector<storage::mojom::StorageUsageInfoPtr> result; for (const auto& it : usage_map) { result.emplace_back(it.second->Clone()); }
diff --git a/content/browser/indexed_db/indexed_db_factory_unittest.cc b/content/browser/indexed_db/indexed_db_factory_unittest.cc index 8e7bfda..ca844a9 100644 --- a/content/browser/indexed_db/indexed_db_factory_unittest.cc +++ b/content/browser/indexed_db/indexed_db_factory_unittest.cc
@@ -360,7 +360,7 @@ EXPECT_TRUE(bucket_state5_handle.IsHeld()) << s.ToString(); EXPECT_TRUE(s.ok()) << s.ToString(); - std::vector<storage::mojom::StorageUsageInfoV2Ptr> infos; + std::vector<storage::mojom::StorageUsageInfoPtr> infos; storage::mojom::IndexedDBControlAsyncWaiter sync_control(context()); sync_control.GetUsage(&infos);
diff --git a/content/browser/navigation_browsertest.cc b/content/browser/navigation_browsertest.cc index 27c1162..ba6d4b9 100644 --- a/content/browser/navigation_browsertest.cc +++ b/content/browser/navigation_browsertest.cc
@@ -183,7 +183,7 @@ frame_tree_node, routing_id, std::move(frame_remote), frame_token, document_token, renderer_initiated_creation, lifecycle_state, std::move(browsing_context_state), - frame_tree_node->frame_owner_element_type(), + frame_tree_node->frame_owner_element_type(), frame_tree_node->parent(), frame_tree_node->fenced_frame_status())); } };
diff --git a/content/browser/portal/portal_browsertest.cc b/content/browser/portal/portal_browsertest.cc index 5d00af6c..df89c528c 100644 --- a/content/browser/portal/portal_browsertest.cc +++ b/content/browser/portal/portal_browsertest.cc
@@ -1623,7 +1623,7 @@ frame_tree_node, routing_id, std::move(frame_remote), frame_token, document_token, renderer_initiated_creation, lifecycle_state, std::move(browsing_context_state), - frame_tree_node->frame_owner_element_type(), + frame_tree_node->frame_owner_element_type(), frame_tree_node->parent(), frame_tree_node->fenced_frame_status())); } };
diff --git a/content/browser/renderer_host/render_frame_host_factory.cc b/content/browser/renderer_host/render_frame_host_factory.cc index aa68f6ae..f33d53d8 100644 --- a/content/browser/renderer_host/render_frame_host_factory.cc +++ b/content/browser/renderer_host/render_frame_host_factory.cc
@@ -40,7 +40,7 @@ frame_tree_node, routing_id, std::move(frame_remote), frame_token, document_token, renderer_initiated_creation, lifecycle_state, std::move(browsing_context_state), - frame_tree_node->frame_owner_element_type(), + frame_tree_node->frame_owner_element_type(), frame_tree_node->parent(), frame_tree_node->fenced_frame_status())); }
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc index 1468c71e..3b727f55 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -1613,6 +1613,7 @@ LifecycleStateImpl lifecycle_state, scoped_refptr<BrowsingContextState> browsing_context_state, blink::FrameOwnerElementType frame_owner_element_type, + RenderFrameHostImpl* parent, FencedFrameStatus fenced_frame_status) : render_view_host_(std::move(render_view_host)), delegate_(delegate), @@ -1623,7 +1624,7 @@ frame_tree_node_(frame_tree_node), browsing_context_state_(std::move(browsing_context_state)), frame_owner_element_type_(frame_owner_element_type), - parent_(frame_tree_node_->parent()), + parent_(parent), depth_(parent_ ? parent_->GetFrameDepth() + 1 : 0), last_committed_site_info_(site_instance_->GetBrowserContext()), routing_id_(routing_id),
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h index b04b3a2..c3953ac 100644 --- a/content/browser/renderer_host/render_frame_host_impl.h +++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2635,6 +2635,7 @@ LifecycleStateImpl lifecycle_state, scoped_refptr<BrowsingContextState> browsing_context_state, blink::FrameOwnerElementType frame_owner_element_type, + RenderFrameHostImpl* parent, FencedFrameStatus fenced_frame_status); // The SendCommit* functions below are wrappers for commit calls @@ -3587,7 +3588,7 @@ // deletion, and GetParent() should never return a different value, even if // this RenderFrameHost is on the pending deletion list and the parent // FrameTreeNode has changed its current RenderFrameHost. - const raw_ptr<RenderFrameHostImpl> parent_; + const raw_ptr<RenderFrameHostImpl> parent_ = nullptr; // Number of times we need to iterate from a RenderFrameHost to its parent // until we reach main RenderFrameHost (i.e. one which doesn't have a parent).
diff --git a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc index 37845d5..4f0a8c43 100644 --- a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc +++ b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
@@ -624,7 +624,7 @@ frame_tree_node, routing_id, std::move(frame_remote), frame_token, document_token, renderer_initiated_creation, lifecycle_state, std::move(browsing_context_state), - frame_tree_node->frame_owner_element_type(), + frame_tree_node->frame_owner_element_type(), frame_tree_node->parent(), frame_tree_node->fenced_frame_status())); } };
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc index ea61c89..2696c9a 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -999,10 +999,10 @@ // concatenating an identity matrix, so we don't add those checks here. transform->MakeIdentity(); - transform->ConcatTransform(transform_to_pixel); - transform->ConcatTransform(transform_this_to_root); - transform->ConcatTransform(transform_root_to_target); - transform->ConcatTransform(transform_from_pixel); + transform->PostConcat(transform_to_pixel); + transform->PostConcat(transform_this_to_root); + transform->PostConcat(transform_root_to_target); + transform->PostConcat(transform_from_pixel); return true; }
diff --git a/content/browser/site_per_process_hit_test_browsertest.cc b/content/browser/site_per_process_hit_test_browsertest.cc index e1eb0061..5fe7c2b 100644 --- a/content/browser/site_per_process_hit_test_browsertest.cc +++ b/content/browser/site_per_process_hit_test_browsertest.cc
@@ -6974,7 +6974,7 @@ gfx::Transform translate; expected_transform.RotateAboutZAxis(-45); translate.Translate(-100 * device_scale_factor, -100 * device_scale_factor); - expected_transform.PreconcatTransform(translate); + expected_transform.PreConcat(translate); DCHECK(hit_test_data.size() >= 3); // The iframe element in main page is transformed and also clips the content
diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc index 908158ed..2dff8dc 100644 --- a/content/browser/storage_partition_impl_unittest.cc +++ b/content/browser/storage_partition_impl_unittest.cc
@@ -2450,10 +2450,10 @@ } private: - std::vector<storage::mojom::StorageUsageInfoV2Ptr> GetSharedStorageUsage() { + std::vector<storage::mojom::StorageUsageInfoPtr> GetSharedStorageUsage() { DCHECK(shared_storage_manager_); - base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoV2Ptr>> + base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoPtr>> future; shared_storage_manager_->FetchOrigins(future.GetCallback()); return future.Take();
diff --git a/content/browser/storage_service_restart_browsertest.cc b/content/browser/storage_service_restart_browsertest.cc index a225a0b9..f094ab2 100644 --- a/content/browser/storage_service_restart_browsertest.cc +++ b/content/browser/storage_service_restart_browsertest.cc
@@ -40,7 +40,7 @@ void WaitForAnyLocalStorageDataAsync(base::OnceClosure callback) { dom_storage()->GetLocalStorageControl()->GetUsage(base::BindOnce( [](StorageServiceRestartBrowserTest* test, base::OnceClosure callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage) { + std::vector<storage::mojom::StorageUsageInfoPtr> usage) { if (!usage.empty()) { std::move(callback).Run(); return;
diff --git a/content/browser/storage_service_sandbox_browsertest.cc b/content/browser/storage_service_sandbox_browsertest.cc index c51de4b..4e6b5d72 100644 --- a/content/browser/storage_service_sandbox_browsertest.cc +++ b/content/browser/storage_service_sandbox_browsertest.cc
@@ -41,7 +41,7 @@ void WaitForAnyLocalStorageDataAsync(base::OnceClosure callback) { dom_storage()->GetLocalStorageControl()->GetUsage(base::BindOnce( [](StorageServiceSandboxBrowserTest* test, base::OnceClosure callback, - std::vector<storage::mojom::StorageUsageInfoV2Ptr> usage) { + std::vector<storage::mojom::StorageUsageInfoPtr> usage) { if (!usage.empty()) { std::move(callback).Run(); return;
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc index 01ef93a..e833a4da 100644 --- a/content/test/test_render_frame_host.cc +++ b/content/test/test_render_frame_host.cc
@@ -87,6 +87,7 @@ lifecycle_state, browsing_context_state, frame_tree_node->frame_owner_element_type(), + frame_tree_node->parent(), frame_tree_node->fenced_frame_status()), child_creation_observer_( WebContents::FromRenderViewHost(render_view_host.get())),
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h index 13e29f05..da261b760 100644 --- a/extensions/browser/extension_function_histogram_value.h +++ b/extensions/browser/extension_function_histogram_value.h
@@ -1778,6 +1778,8 @@ PASSWORDSPRIVATE_GETINSECURECREDENTIALS = 1715, ACTION_ISENABLED = 1716, PASSWORDSPRIVATE_SWITCHBIOMETRICAUTHBEFOREFILLINGSTATE = 1717, + WMDESKSPRIVATE_GETACTIVEDESK = 1718, + WMDESKSPRIVATE_SWITCHDESK = 1719, // Last entry: Add new entries above, then run: // tools/metrics/histograms/update_extension_histograms.py ENUM_BOUNDARY
diff --git a/extensions/renderer/api/automation/automation_internal_custom_bindings.cc b/extensions/renderer/api/automation/automation_internal_custom_bindings.cc index bffb7c7b..cd446d7 100644 --- a/extensions/renderer/api/automation/automation_internal_custom_bindings.cc +++ b/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
@@ -30,7 +30,6 @@ #include "extensions/renderer/native_extension_bindings_system.h" #include "extensions/renderer/object_backed_native_handler.h" #include "extensions/renderer/script_context.h" -#include "gin/data_object_builder.h" #include "ipc/message_filter.h" #include "third_party/blink/public/strings/grit/blink_accessibility_strings.h" #include "third_party/blink/public/web/web_local_frame.h" @@ -122,33 +121,11 @@ AutomationInternalCustomBindings::~AutomationInternalCustomBindings() {} void AutomationInternalCustomBindings::AddRoutes() { -// It's safe to use base::Unretained(this) here because these bindings -// will only be called on a valid AutomationInternalCustomBindings instance -// and none of the functions have any side effects. -// TODO(crbug.com/1357889): Move ROUTE_FUNCTION functions into -// ui::AutomationV8Bindings if possible. -#define ROUTE_FUNCTION(FN) \ - ObjectBackedNativeHandler::RouteHandlerFunction( \ - #FN, "automation", \ - base::BindRepeating(&AutomationInternalCustomBindings::FN, \ - base::Unretained(this))) - ROUTE_FUNCTION(IsInteractPermitted); - ROUTE_FUNCTION(GetSchemaAdditions); - ROUTE_FUNCTION(StartCachingAccessibilityTrees); - ROUTE_FUNCTION(StopCachingAccessibilityTrees); - ROUTE_FUNCTION(GetState); -#undef ROUTE_FUNCTION - // This should only be called once. DCHECK(!automation_v8_bindings_); automation_v8_bindings_ = std::make_unique<ui::AutomationV8Bindings>(this, this); automation_v8_bindings_->AddV8Routes(); - - automation_v8_bindings_->RouteNodeIDFunction( - "GetImageAnnotation", - base::BindRepeating(&AutomationInternalCustomBindings::GetImageAnnotation, - base::Unretained(this))); } void AutomationInternalCustomBindings::Invalidate() { @@ -170,18 +147,15 @@ IPC_END_MESSAGE_MAP() } -void AutomationInternalCustomBindings::IsInteractPermitted( - const v8::FunctionCallbackInfo<v8::Value>& args) { +bool AutomationInternalCustomBindings::IsInteractPermitted() const { const Extension* extension = context()->extension(); CHECK(extension); const AutomationInfo* automation_info = AutomationInfo::Get(extension); CHECK(automation_info); - args.GetReturnValue().Set( - v8::Boolean::New(GetIsolate(), automation_info->interact)); + return automation_info->interact; } -void AutomationInternalCustomBindings::StartCachingAccessibilityTrees( - const v8::FunctionCallbackInfo<v8::Value>& args) { +void AutomationInternalCustomBindings::StartCachingAccessibilityTrees() { if (should_ignore_context_) return; @@ -194,128 +168,9 @@ } } -void AutomationInternalCustomBindings::StopCachingAccessibilityTrees( - const v8::FunctionCallbackInfo<v8::Value>& args) { +void AutomationInternalCustomBindings::StopCachingAccessibilityTrees() { message_filter_->Detach(); message_filter_.reset(); - ClearCachedAccessibilityTrees(); -} - -void AutomationInternalCustomBindings::GetSchemaAdditions( - const v8::FunctionCallbackInfo<v8::Value>& args) { - v8::Isolate* isolate = GetIsolate(); - - gin::DataObjectBuilder name_from_type(isolate); - for (int32_t i = static_cast<int32_t>(ax::mojom::NameFrom::kNone); - i <= static_cast<int32_t>(ax::mojom::NameFrom::kMaxValue); ++i) { - name_from_type.Set( - i, - base::StringPiece(ui::ToString(static_cast<ax::mojom::NameFrom>(i)))); - } - - gin::DataObjectBuilder restriction(isolate); - for (int32_t i = static_cast<int32_t>(ax::mojom::Restriction::kNone); - i <= static_cast<int32_t>(ax::mojom::Restriction::kMaxValue); ++i) { - restriction.Set(i, base::StringPiece(ui::ToString( - static_cast<ax::mojom::Restriction>(i)))); - } - - gin::DataObjectBuilder description_from_type(isolate); - for (int32_t i = static_cast<int32_t>(ax::mojom::DescriptionFrom::kNone); - i <= static_cast<int32_t>(ax::mojom::DescriptionFrom::kMaxValue); ++i) { - description_from_type.Set( - i, base::StringPiece( - ui::ToString(static_cast<ax::mojom::DescriptionFrom>(i)))); - } - - args.GetReturnValue().Set( - gin::DataObjectBuilder(isolate) - .Set("NameFromType", name_from_type.Build()) - .Set("Restriction", restriction.Build()) - .Set("DescriptionFromType", description_from_type.Build()) - .Build()); -} - -void AutomationInternalCustomBindings::GetState( - const v8::FunctionCallbackInfo<v8::Value>& args) { - v8::Isolate* isolate = GetIsolate(); - if (args.Length() < 2 || !args[0]->IsString() || !args[1]->IsNumber()) - ThrowInvalidArgumentsException(); - - ui::AXTreeID tree_id = - ui::AXTreeID::FromString(*v8::String::Utf8Value(isolate, args[0])); - int node_id = args[1]->Int32Value(context()->v8_context()).FromMaybe(0); - - ui::AutomationAXTreeWrapper* tree_wrapper = - GetAutomationAXTreeWrapperFromTreeID(tree_id); - if (!tree_wrapper) - return; - - ui::AXNode* node = - tree_wrapper->GetNodeFromTree(tree_wrapper->GetTreeID(), node_id); - if (!node) - return; - - gin::DataObjectBuilder state(isolate); - uint32_t state_pos = 0, state_shifter = node->data().state; - while (state_shifter) { - if (state_shifter & 1) - state.Set(ui::ToString(static_cast<ax::mojom::State>(state_pos)), true); - state_shifter = state_shifter >> 1; - state_pos++; - } - ui::AutomationAXTreeWrapper* top_tree_wrapper = nullptr; - ui::AutomationAXTreeWrapper* walker = tree_wrapper; - while (walker && walker != top_tree_wrapper) { - top_tree_wrapper = walker; - GetParent(walker->ax_tree()->root(), &walker); - } - - const bool focused = tree_wrapper->IsInFocusChain(node->id()); - if (focused) { - state.Set(api::automation::ToString(api::automation::STATE_TYPE_FOCUSED), - true); - } - - bool offscreen = false; - ComputeGlobalNodeBounds(tree_wrapper, node, gfx::RectF(), &offscreen); - if (offscreen) - state.Set(api::automation::ToString(api::automation::STATE_TYPE_OFFSCREEN), - true); - - args.GetReturnValue().Set(state.Build()); -} - -void AutomationInternalCustomBindings::GetImageAnnotation( - v8::Isolate* isolate, - v8::ReturnValue<v8::Value> result, - ui::AutomationAXTreeWrapper* tree_wrapper, - ui::AXNode* node) { - std::string status_string = std::string(); - auto status = node->data().GetImageAnnotationStatus(); - switch (status) { - case ax::mojom::ImageAnnotationStatus::kNone: - case ax::mojom::ImageAnnotationStatus::kWillNotAnnotateDueToScheme: - case ax::mojom::ImageAnnotationStatus::kIneligibleForAnnotation: - case ax::mojom::ImageAnnotationStatus::kSilentlyEligibleForAnnotation: - break; - - case ax::mojom::ImageAnnotationStatus::kEligibleForAnnotation: - case ax::mojom::ImageAnnotationStatus::kAnnotationPending: - case ax::mojom::ImageAnnotationStatus::kAnnotationEmpty: - case ax::mojom::ImageAnnotationStatus::kAnnotationAdult: - case ax::mojom::ImageAnnotationStatus::kAnnotationProcessFailed: - status_string = GetLocalizedStringForImageAnnotationStatus(status); - break; - case ax::mojom::ImageAnnotationStatus::kAnnotationSucceeded: - status_string = node->GetStringAttribute( - ax::mojom::StringAttribute::kImageAnnotation); - break; - } - if (status_string.empty()) - return; - result.Set( - v8::String::NewFromUtf8(isolate, status_string.c_str()).ToLocalChecked()); } // @@ -582,6 +437,14 @@ return api::automation::ToString(ConvertMarkerTypeFromAXToAutomation(type)); } +std::string AutomationInternalCustomBindings::GetFocusedStateString() const { + return api::automation::ToString(api::automation::STATE_TYPE_FOCUSED); +} + +std::string AutomationInternalCustomBindings::GetOffscreenStateString() const { + return api::automation::ToString(api::automation::STATE_TYPE_OFFSCREEN); +} + void AutomationInternalCustomBindings::DispatchEvent( const std::string& event_name, const base::Value::List& event_args) const {
diff --git a/extensions/renderer/api/automation/automation_internal_custom_bindings.h b/extensions/renderer/api/automation/automation_internal_custom_bindings.h index ce4a432..65e5eb0 100644 --- a/extensions/renderer/api/automation/automation_internal_custom_bindings.h +++ b/extensions/renderer/api/automation/automation_internal_custom_bindings.h
@@ -88,8 +88,19 @@ ui::TreeChangeObserverFilter ParseTreeChangeObserverFilter( const std::string& filter) const override; std::string GetMarkerTypeString(ax::mojom::MarkerType type) const override; + std::string GetFocusedStateString() const override; + std::string GetOffscreenStateString() const override; + std::string GetLocalizedStringForImageAnnotationStatus( + ax::mojom::ImageAnnotationStatus status) const override; void DispatchEvent(const std::string& event_name, const base::Value::List& event_args) const override; + bool IsInteractPermitted() const override; + // This enables the MessageFilter that allows us to listen to accessibility + // events forwarded to this process. + void StartCachingAccessibilityTrees() override; + // This disables the MessageFilter that allows us to listen to accessibility + // events forwarded to this process. + void StopCachingAccessibilityTrees() override; private: friend class AutomationInternalCustomBindingsTest; @@ -97,37 +108,6 @@ // ObjectBackedNativeHandler overrides: void Invalidate() override; - // Returns whether this extension has the "interact" permission set (either - // explicitly or implicitly after manifest parsing). - void IsInteractPermitted(const v8::FunctionCallbackInfo<v8::Value>& args); - - // Returns an object with bindings that will be added to the - // chrome.automation namespace. - void GetSchemaAdditions(const v8::FunctionCallbackInfo<v8::Value>& args); - - // This is called by automation_internal_custom_bindings.js to indicate - // that an API was called that needs access to accessibility trees. This - // enables the MessageFilter that allows us to listen to accessibility - // events forwarded to this process. - void StartCachingAccessibilityTrees( - const v8::FunctionCallbackInfo<v8::Value>& args); - - // This is called by automation_internal_custom_bindings.js to indicate - // that an API was called that turns off accessibility trees. This - // disables the MessageFilter that allows us to listen to accessibility - // events forwarded to this process and clears all existing tree state. - void StopCachingAccessibilityTrees( - const v8::FunctionCallbackInfo<v8::Value>& args); - - // Args: string ax_tree_id, int node_id - // Returns: JS object with a string key for each state flag that's set. - void GetState(const v8::FunctionCallbackInfo<v8::Value>& args); - - void GetImageAnnotation(v8::Isolate* isolate, - v8::ReturnValue<v8::Value> result, - ui::AutomationAXTreeWrapper* tree_wrapper, - ui::AXNode* node); - // // Helper functions. // @@ -142,9 +122,6 @@ void SendChildTreeIDEvent(ui::AXTreeID child_tree_id); - std::string GetLocalizedStringForImageAnnotationStatus( - ax::mojom::ImageAnnotationStatus status) const; - void MaybeSendOnAllAutomationEventListenersRemoved(); scoped_refptr<AutomationMessageFilter> message_filter_;
diff --git a/gpu/command_buffer/service/dawn_caching_interface.cc b/gpu/command_buffer/service/dawn_caching_interface.cc index 8ffdfc9..13df3a7 100644 --- a/gpu/command_buffer/service/dawn_caching_interface.cc +++ b/gpu/command_buffer/service/dawn_caching_interface.cc
@@ -4,19 +4,18 @@ #include "gpu/command_buffer/service/dawn_caching_interface.h" -#include <string> +#include <cstring> -#include "base/callback_helpers.h" #include "base/memory/ptr_util.h" #include "gpu/command_buffer/service/decoder_client.h" #include "gpu/config/gpu_preferences.h" #include "net/base/io_buffer.h" -#include "net/disk_cache/disk_cache.h" namespace gpu::webgpu { -DawnCachingInterface::DawnCachingInterface(ScopedDiskCacheBackend backend, - DecoderClient* decoder_client) +DawnCachingInterface::DawnCachingInterface( + scoped_refptr<detail::DawnCachingBackend> backend, + DecoderClient* decoder_client) : backend_(std::move(backend)), decoder_client_(decoder_client) {} DawnCachingInterface::~DawnCachingInterface() = default; @@ -29,27 +28,7 @@ return 0u; } std::string key_str(static_cast<const char*>(key), key_size); - - disk_cache::EntryResult entry_result = backend()->OpenOrCreateEntry( - key_str, net::RequestPriority::DEFAULT_PRIORITY, base::DoNothing()); - if (entry_result.net_error() != net::OK) { - return 0u; - } - disk_cache::ScopedEntryPtr entry(entry_result.ReleaseEntry()); - size_t size = entry->GetDataSize(0) > 0 ? entry->GetDataSize(0) : 0u; - - if (value_size == 0 && value_out == nullptr) { - return size; - } - if (value_size != size) { - return 0u; - } - - scoped_refptr<net::IOBuffer> buffer = - base::MakeRefCounted<net::WrappedIOBuffer>( - static_cast<const char*>(value_out)); - int status = entry->ReadData(0, 0, buffer.get(), size, base::DoNothing()); - return status > 0 ? size_t(status) : 0u; + return backend()->LoadData(key_str, value_out, value_size); } void DawnCachingInterface::StoreData(const void* key, @@ -60,18 +39,7 @@ return; } std::string key_str(static_cast<const char*>(key), key_size); - - disk_cache::EntryResult entry_result = backend()->OpenOrCreateEntry( - key_str, net::RequestPriority::DEFAULT_PRIORITY, base::DoNothing()); - if (entry_result.net_error() != net::OK) { - return; - } - disk_cache::ScopedEntryPtr entry(entry_result.ReleaseEntry()); - - scoped_refptr<net::IOBuffer> buffer = - base::MakeRefCounted<net::WrappedIOBuffer>( - static_cast<const char*>(value)); - entry->WriteData(0, 0, buffer.get(), value_size, base::DoNothing(), false); + backend()->StoreData(key_str, value, value_size); // Send the cache entry to be stored on the host-side if applicable. if (decoder_client_) { @@ -90,28 +58,6 @@ DawnCachingInterfaceFactory::~DawnCachingInterfaceFactory() = default; -ScopedDiskCacheBackend -DawnCachingInterfaceFactory::CreateDefaultInMemoryBackend() { - disk_cache::BackendResult result = disk_cache::CreateCacheBackend( - net::CacheType::MEMORY_CACHE, net::CACHE_BACKEND_DEFAULT, - /*file_operations=*/nullptr, base::FilePath(), - /*max_bytes=*/GetDefaultGpuDiskCacheSize(), - disk_cache::ResetHandling::kNeverReset, - /*net_log=*/nullptr, base::DoNothing()); - - // In-memory cache initialization should generally not fail. If it does, - // currently just logging an error. All operations check that |backend_| is - // valid so nothing bad will happen and we will fail silently with no cache - // hits. - if (result.net_error != net::OK) { - LOG(WARNING) << "Unable to create an in-memory cache to back " - "DawnCachingInterface(s)."; - return base::MakeRefCounted<RefCountedDiskCacheBackend>(nullptr); - } - return base::MakeRefCounted<RefCountedDiskCacheBackend>( - std::move(result.backend)); -} - std::unique_ptr<DawnCachingInterface> DawnCachingInterfaceFactory::CreateInstance( const gpu::GpuDiskCacheHandle& handle, @@ -123,8 +69,8 @@ new DawnCachingInterface(it->second, decoder_client)); } - ScopedDiskCacheBackend backend = backend_factory_.Run(); - if (backend->data.get() != nullptr) { + scoped_refptr<detail::DawnCachingBackend> backend = backend_factory_.Run(); + if (backend != nullptr) { backends_[handle] = backend; } return base::WrapUnique( @@ -142,4 +88,108 @@ backends_.erase(handle); } +scoped_refptr<detail::DawnCachingBackend> +DawnCachingInterfaceFactory::CreateDefaultInMemoryBackend() { + return base::MakeRefCounted<detail::DawnCachingBackend>( + GetDefaultGpuDiskCacheSize()); +} + +namespace detail { + +DawnCachingBackend::Entry::Entry(const std::string& key, + const void* value, + size_t value_size) + : key_(key), data_(static_cast<const char*>(value), value_size) {} + +const std::string& DawnCachingBackend::Entry::Key() const { + return key_; +} + +size_t DawnCachingBackend::Entry::TotalSize() const { + return key_.length() + data_.length(); +} + +size_t DawnCachingBackend::Entry::DataSize() const { + return data_.length(); +} + +size_t DawnCachingBackend::Entry::ReadData(void* value_out, + size_t value_size) const { + // First handle "peek" case where use is trying to get the size of the entry. + if (value_out == nullptr && value_size == 0) { + return DataSize(); + } + + // Otherwise, verify that the size that is being copied out is identical. + DCHECK(value_size == DataSize()); + memcpy(value_out, data_.data(), value_size); + return value_size; +} + +DawnCachingBackend::DawnCachingBackend(size_t max_size) : max_size_(max_size) {} + +DawnCachingBackend::~DawnCachingBackend() = default; + +size_t DawnCachingBackend::LoadData(const std::string& key, + void* value_out, + size_t value_size) { + // Because we are tracking LRU, even loads modify internal state so mutex is + // required. + base::AutoLock lock(mutex_); + + auto it = entries_.find(key); + if (it == entries_.end()) { + return 0u; + } + + // Even if this was just a "peek" operation to get size, the entry was + // accessed so move it to the back of the eviction queue. + it->second->RemoveFromList(); + lru_.Append(it->second.get()); + return it->second->ReadData(value_out, value_size); +} + +void DawnCachingBackend::StoreData(const std::string& key, + const void* value, + size_t value_size) { + // Don't need to do anything if we are not storing anything. + if (value == nullptr || value_size == 0) { + return; + } + + base::AutoLock lock(mutex_); + + // If an entry for this key already exists, first evict the existing entry. + if (auto it = entries_.find(key); it != entries_.end()) { + EvictEntry(it->second.get()); + } + + auto entry = std::make_unique<Entry>(key, value, value_size); + + // Evict least used entries until we have enough room to add the new entry. + while (current_size_ + entry->TotalSize() > max_size_) { + EvictEntry(lru_.head()->value()); + } + + auto [it, inserted] = entries_.insert({key, std::move(entry)}); + DCHECK(inserted); + // Add the entry size to the overall size and update the eviction queue. + current_size_ += it->second->TotalSize(); + lru_.Append(it->second.get()); +} + +void DawnCachingBackend::EvictEntry(DawnCachingBackend::Entry* entry) { + // Always remove the entry from the LRU first because removing it from the + // entry map will cause the entry to be destroyed. + entry->RemoveFromList(); + + // Update the size information. + current_size_ -= entry->TotalSize(); + + // Finally remove the entry from the map thereby destroying the entry. + entries_.erase(entry->Key()); +} + +} // namespace detail + } // namespace gpu::webgpu
diff --git a/gpu/command_buffer/service/dawn_caching_interface.h b/gpu/command_buffer/service/dawn_caching_interface.h index 2f33432b..09392c6 100644 --- a/gpu/command_buffer/service/dawn_caching_interface.h +++ b/gpu/command_buffer/service/dawn_caching_interface.h
@@ -7,13 +7,17 @@ #include <dawn/platform/DawnPlatform.h> -#include <map> #include <memory> +#include <string> +#include "base/containers/flat_map.h" +#include "base/containers/linked_list.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" +#include "base/synchronization/lock.h" +#include "base/thread_annotations.h" #include "gpu/gpu_gles2_export.h" #include "gpu/ipc/common/gpu_disk_cache_type.h" -#include "net/disk_cache/disk_cache.h" namespace gpu { @@ -23,11 +27,55 @@ class DawnCachingInterfaceFactory; -using RefCountedDiskCacheBackend = - base::RefCountedData<std::unique_ptr<disk_cache::Backend>>; -using ScopedDiskCacheBackend = scoped_refptr<RefCountedDiskCacheBackend>; +namespace detail { -// Provides a wrapper class around an in-memory disk_cache::Backend. This class +// In memory caching backend that is just a thread-safe wrapper around a map +// with a simple LRU eviction algorithm implemented on top. This is the actual +// backing cache for instances of DawnCachingInterface. The eviction queue is +// set up so that the entries in the front are the first entries to be deleted. +class GPU_GLES2_EXPORT DawnCachingBackend + : public base::RefCounted<DawnCachingBackend> { + public: + explicit DawnCachingBackend(size_t max_size); + + size_t LoadData(const std::string& key, void* value_out, size_t value_size); + void StoreData(const std::string& key, const void* value, size_t value_size); + + private: + // Internal entry class for LRU tracking and holding key/value pair. + class Entry : public base::LinkNode<Entry> { + public: + Entry(const std::string& key, const void* value, size_t value_size); + + const std::string& Key() const; + + size_t TotalSize() const; + size_t DataSize() const; + + size_t ReadData(void* value_out, size_t value_size) const; + + private: + const std::string key_; + const std::string data_; + }; + + friend class base::RefCounted<DawnCachingBackend>; + ~DawnCachingBackend(); + + void EvictEntry(Entry* entry) EXCLUSIVE_LOCKS_REQUIRED(mutex_); + + base::Lock mutex_; + base::flat_map<std::string, std::unique_ptr<Entry>> entries_ + GUARDED_BY(mutex_); + base::LinkedList<Entry> lru_ GUARDED_BY(mutex_); + + size_t max_size_; + size_t current_size_ = 0; +}; + +} // namespace detail + +// Provides a wrapper class around an in-memory DawnCachingBackend. This class // was originally designed to handle both disk and in-memory cache backends, but // because it lives on the GPU process and does not have permissions (due to // sandbox restrictions) to disk, the disk functionality was removed. Should it @@ -55,15 +103,16 @@ friend class DawnCachingInterfaceFactory; // Simplified accessor to the backend. - disk_cache::Backend* backend() { return backend_->data.get(); } + detail::DawnCachingBackend* backend() { return backend_.get(); } // Constructor is private because creation of interfaces should be deferred to // the factory. - explicit DawnCachingInterface(ScopedDiskCacheBackend backend, - DecoderClient* decoder_client = nullptr); + explicit DawnCachingInterface( + scoped_refptr<detail::DawnCachingBackend> backend, + DecoderClient* decoder_client = nullptr); // Caching interface owns a reference to the backend. - ScopedDiskCacheBackend backend_ = nullptr; + scoped_refptr<detail::DawnCachingBackend> backend_ = nullptr; // Decoder client provides ability to store cache entries to persistent disk. // The client is not owned by this class and needs to be valid throughout the @@ -78,7 +127,8 @@ class GPU_GLES2_EXPORT DawnCachingInterfaceFactory { public: // Factory for backend creation, especially for testing. - using BackendFactory = base::RepeatingCallback<ScopedDiskCacheBackend()>; + using BackendFactory = + base::RepeatingCallback<scoped_refptr<detail::DawnCachingBackend>()>; explicit DawnCachingInterfaceFactory(BackendFactory factory); DawnCachingInterfaceFactory(); @@ -109,14 +159,17 @@ void ReleaseHandle(const gpu::GpuDiskCacheHandle& handle); private: - // Creates a scoped disk cache backend for assignment. - static ScopedDiskCacheBackend CreateDefaultInMemoryBackend(); + // Creates a default backend for assignment. + static scoped_refptr<detail::DawnCachingBackend> + CreateDefaultInMemoryBackend(); // Factory to create backends. BackendFactory backend_factory_; // Map that holds existing backends. - std::map<gpu::GpuDiskCacheHandle, ScopedDiskCacheBackend> backends_; + base::flat_map<gpu::GpuDiskCacheHandle, + scoped_refptr<detail::DawnCachingBackend>> + backends_; }; } // namespace webgpu
diff --git a/gpu/command_buffer/service/dawn_caching_interface_unittest.cc b/gpu/command_buffer/service/dawn_caching_interface_unittest.cc index bab7579..6bf3d0f9 100644 --- a/gpu/command_buffer/service/dawn_caching_interface_unittest.cc +++ b/gpu/command_buffer/service/dawn_caching_interface_unittest.cc
@@ -98,9 +98,8 @@ TEST_F(DawnCachingInterfaceTest, UnableToCreateBackend) { // This factory mimics what happens when we are unable to create a backend. - DawnCachingInterfaceFactory factory(base::BindRepeating([]() { - return base::MakeRefCounted<RefCountedDiskCacheBackend>(nullptr); - })); + DawnCachingInterfaceFactory factory(base::BindRepeating( + []() -> scoped_refptr<detail::DawnCachingBackend> { return nullptr; })); // Without an actual backend, all loads and stores should do nothing. { @@ -129,5 +128,64 @@ kDataSize); } +TEST_F(DawnCachingInterfaceTest, TestMaxSizeEviction) { + // Verifies that a cache size that should only fit one entry will only keep + // one entry in memory. + static constexpr std::string_view kKey1 = "1"; + static constexpr std::string_view kData1 = "1"; + static constexpr std::string_view kKey2 = "2"; + static constexpr std::string_view kData2 = "2"; + static_assert(kKey1.size() == kKey2.size()); + static_assert(kData1.size() == kData2.size()); + static constexpr size_t kKeySize = kKey1.size(); + static constexpr size_t kDataSize = kData1.size(); + static constexpr size_t kCacheSize = 2u * kKeySize + 2u * kDataSize - 1u; + + DawnCachingInterfaceFactory factory(base::BindRepeating([]() { + return base::MakeRefCounted<detail::DawnCachingBackend>(kCacheSize); + })); + + auto interface = factory.CreateInstance(); + interface->StoreData(kKey1.data(), kKeySize, kData1.data(), kDataSize); + interface->StoreData(kKey2.data(), kKeySize, kData2.data(), kDataSize); + + EXPECT_EQ(0u, interface->LoadData(kKey1.data(), 1u, nullptr, 0)); + EXPECT_EQ(kDataSize, interface->LoadData(kKey2.data(), 1u, nullptr, 0)); +} + +TEST_F(DawnCachingInterfaceTest, TestLruEviction) { + // Verifies that a cache size that should only fit two entries evicts the + // proper entry when a third one is stored. + static constexpr std::string_view kKey1 = "1"; + static constexpr std::string_view kData1 = "1"; + static constexpr std::string_view kKey2 = "2"; + static constexpr std::string_view kData2 = "2"; + static constexpr std::string_view kKey3 = "3"; + static constexpr std::string_view kData3 = "3"; + static_assert(kKey1.size() == kKey2.size()); + static_assert(kKey2.size() == kKey3.size()); + static_assert(kData1.size() == kData2.size()); + static_assert(kData2.size() == kData3.size()); + static constexpr size_t kKeySize = kKey1.size(); + static constexpr size_t kDataSize = kData1.size(); + static constexpr size_t kCacheSize = 3u * kKeySize + 3u * kDataSize - 1u; + + DawnCachingInterfaceFactory factory(base::BindRepeating([]() { + return base::MakeRefCounted<detail::DawnCachingBackend>(kCacheSize); + })); + + // Even though Key1 was stored first, because we loaded it once, Key2 should + // be the one to be evicted when Key3 is added. + auto interface = factory.CreateInstance(); + interface->StoreData(kKey1.data(), kKeySize, kData1.data(), kDataSize); + interface->StoreData(kKey2.data(), kKeySize, kData2.data(), kDataSize); + EXPECT_EQ(kDataSize, interface->LoadData(kKey1.data(), 1u, nullptr, 0)); + interface->StoreData(kKey3.data(), kKeySize, kData3.data(), kDataSize); + + EXPECT_EQ(kDataSize, interface->LoadData(kKey1.data(), 1u, nullptr, 0)); + EXPECT_EQ(0u, interface->LoadData(kKey2.data(), 1u, nullptr, 0)); + EXPECT_EQ(kDataSize, interface->LoadData(kKey3.data(), 1u, nullptr, 0)); +} + } // namespace } // namespace gpu::webgpu
diff --git a/gpu/command_buffer/service/shared_image/egl_image_backing.cc b/gpu/command_buffer/service/shared_image/egl_image_backing.cc index f34d927..2ecc731 100644 --- a/gpu/command_buffer/service/shared_image/egl_image_backing.cc +++ b/gpu/command_buffer/service/shared_image/egl_image_backing.cc
@@ -426,6 +426,16 @@ bind_egl_image = false; } buffer = egl_image_buffer_; + + if (!pixel_data.empty()) { + // If pixel data is being uploaded to the texture, that means we are + // sending commands to the gpu. Hence consider it as a write and add a + // fence to synchronize it with corresponding reads. This case happens + // when tab windows are composited by viz for tablet ui. Initial pixel + // data gets uploaded on the gpu main thread and being read on DrDc + // thread. + write_fence_ = gl::GLFenceEGL::Create(); + } } // Mark the backing as cleared if pixel data has been uploaded. Note that
diff --git a/infra/config/generated/builders/ci/GPU Linux Builder/properties.json b/infra/config/generated/builders/ci/GPU Linux Builder/properties.json index ea60800..a5e0626 100644 --- a/infra/config/generated/builders/ci/GPU Linux Builder/properties.json +++ b/infra/config/generated/builders/ci/GPU Linux Builder/properties.json
@@ -109,10 +109,6 @@ { "builder": "linux-rel-ml", "group": "tryserver.chromium.linux" - }, - { - "builder": "linux-rel-warmed", - "group": "tryserver.chromium.linux" } ] }
diff --git "a/infra/config/generated/builders/ci/GPU Mac Builder \050reclient shadow\051/properties.json" "b/infra/config/generated/builders/ci/GPU Mac Builder \050reclient shadow\051/properties.json" deleted file mode 100644 index f3f308e..0000000 --- "a/infra/config/generated/builders/ci/GPU Mac Builder \050reclient shadow\051/properties.json" +++ /dev/null
@@ -1,58 +0,0 @@ -{ - "$build/chromium_tests_builder_config": { - "builder_config": { - "builder_db": { - "entries": [ - { - "builder_id": { - "bucket": "ci", - "builder": "GPU Mac Builder (reclient shadow)", - "project": "chromium" - }, - "builder_spec": { - "builder_group": "chromium.gpu", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb", - "goma_use_local" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64, - "target_platform": "mac" - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage" - ], - "config": "chromium" - } - } - } - ] - }, - "builder_ids": [ - { - "bucket": "ci", - "builder": "GPU Mac Builder (reclient shadow)", - "project": "chromium" - } - ] - } - }, - "$build/reclient": { - "instance": "rbe-chromium-trusted", - "jobs": 250, - "metrics_project": "chromium-reclient-metrics" - }, - "$recipe_engine/resultdb/test_presentation": { - "column_keys": [], - "grouping_keys": [ - "status", - "v.test_suite" - ] - }, - "builder_group": "chromium.gpu", - "recipe": "chromium" -} \ No newline at end of file
diff --git a/infra/config/generated/builders/ci/Linux Builder/properties.json b/infra/config/generated/builders/ci/Linux Builder/properties.json index a8d944db..97724ab1 100644 --- a/infra/config/generated/builders/ci/Linux Builder/properties.json +++ b/infra/config/generated/builders/ci/Linux Builder/properties.json
@@ -111,10 +111,6 @@ "group": "tryserver.chromium.linux" }, { - "builder": "linux-rel-warmed", - "group": "tryserver.chromium.linux" - }, - { "builder": "linux_chromium_compile_rel_ng", "group": "tryserver.chromium.linux" }
diff --git "a/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/properties.json" "b/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/properties.json" index f10f0e1..a3f6825 100644 --- "a/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/properties.json" +++ "b/infra/config/generated/builders/ci/Linux Release \050NVIDIA\051/properties.json"
@@ -102,10 +102,6 @@ { "builder": "linux-rel-ml", "group": "tryserver.chromium.linux" - }, - { - "builder": "linux-rel-warmed", - "group": "tryserver.chromium.linux" } ] }
diff --git a/infra/config/generated/builders/ci/Linux Tests/properties.json b/infra/config/generated/builders/ci/Linux Tests/properties.json index d08e3358..18cdf85 100644 --- a/infra/config/generated/builders/ci/Linux Tests/properties.json +++ b/infra/config/generated/builders/ci/Linux Tests/properties.json
@@ -104,10 +104,6 @@ "group": "tryserver.chromium.linux" }, { - "builder": "linux-rel-warmed", - "group": "tryserver.chromium.linux" - }, - { "builder": "linux_chromium_compile_rel_ng", "group": "tryserver.chromium.linux" }
diff --git "a/infra/config/generated/builders/ci/mac-arm64-rel \050reclient shadow\051/properties.json" "b/infra/config/generated/builders/ci/mac-arm64-rel \050reclient shadow\051/properties.json" deleted file mode 100644 index 98166ef..0000000 --- "a/infra/config/generated/builders/ci/mac-arm64-rel \050reclient shadow\051/properties.json" +++ /dev/null
@@ -1,55 +0,0 @@ -{ - "$build/chromium_tests_builder_config": { - "builder_config": { - "builder_db": { - "entries": [ - { - "builder_id": { - "bucket": "ci", - "builder": "mac-arm64-rel (reclient shadow)", - "project": "chromium" - }, - "builder_spec": { - "builder_group": "chromium.mac", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_arch": "arm", - "target_bits": 64, - "target_platform": "mac" - }, - "legacy_gclient_config": { - "config": "chromium" - } - } - } - ] - }, - "builder_ids": [ - { - "bucket": "ci", - "builder": "mac-arm64-rel (reclient shadow)", - "project": "chromium" - } - ] - } - }, - "$build/reclient": { - "instance": "rbe-chromium-trusted", - "jobs": 200, - "metrics_project": "chromium-reclient-metrics" - }, - "$recipe_engine/resultdb/test_presentation": { - "column_keys": [], - "grouping_keys": [ - "status", - "v.test_suite" - ] - }, - "builder_group": "chromium.mac", - "recipe": "chromium" -} \ No newline at end of file
diff --git a/infra/config/generated/builders/infra/linux-rel-warmed-compilator-warmer/properties.json b/infra/config/generated/builders/infra/linux-rel-warmed-compilator-warmer/properties.json deleted file mode 100644 index 9f0284f..0000000 --- a/infra/config/generated/builders/infra/linux-rel-warmed-compilator-warmer/properties.json +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "$recipe_engine/resultdb/test_presentation": { - "column_keys": [], - "grouping_keys": [ - "status", - "v.test_suite" - ] - }, - "builder_to_warm": { - "builder_group": "tryserver.chromium.linux", - "builder_name": "linux-rel-warmed" - }, - "recipe": "chromium/builder_cache_prewarmer" -} \ No newline at end of file
diff --git a/infra/config/generated/builders/try/linux-rel-warmed-compilator/properties.json b/infra/config/generated/builders/try/linux-rel-warmed-compilator/properties.json deleted file mode 100644 index 111c6fd..0000000 --- a/infra/config/generated/builders/try/linux-rel-warmed-compilator/properties.json +++ /dev/null
@@ -1,181 +0,0 @@ -{ - "$build/chromium_tests_builder_config": { - "builder_config": { - "builder_db": { - "entries": [ - { - "builder_id": { - "bucket": "ci", - "builder": "GPU Linux Builder", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-gpu-archive", - "builder_group": "chromium.gpu", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage", - "enable_reclient" - ], - "config": "chromium" - } - } - }, - { - "builder_id": { - "bucket": "ci", - "builder": "Linux Builder", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-linux-archive", - "builder_group": "chromium.linux", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage", - "enable_reclient" - ], - "config": "chromium" - } - } - }, - { - "builder_id": { - "bucket": "ci", - "builder": "Linux Release (NVIDIA)", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-gpu-archive", - "builder_group": "chromium.gpu", - "execution_mode": "TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage" - ], - "config": "chromium" - }, - "parent": { - "bucket": "ci", - "builder": "GPU Linux Builder", - "project": "chromium" - } - } - }, - { - "builder_id": { - "bucket": "ci", - "builder": "Linux Tests", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-linux-archive", - "builder_group": "chromium.linux", - "execution_mode": "TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage" - ], - "config": "chromium" - }, - "parent": { - "bucket": "ci", - "builder": "Linux Builder", - "project": "chromium" - } - } - } - ] - }, - "builder_ids": [ - { - "bucket": "ci", - "builder": "GPU Linux Builder", - "project": "chromium" - }, - { - "bucket": "ci", - "builder": "Linux Builder", - "project": "chromium" - } - ], - "builder_ids_in_scope_for_testing": [ - { - "bucket": "ci", - "builder": "Linux Release (NVIDIA)", - "project": "chromium" - }, - { - "bucket": "ci", - "builder": "Linux Tests", - "project": "chromium" - } - ], - "rts_config": { - "condition": "QUICK_RUN_ONLY" - } - } - }, - "$build/code_coverage": { - "coverage_test_types": [ - "unit", - "overall" - ], - "use_clang_coverage": true - }, - "$build/goma": { - "enable_ats": true, - "jobs": 150, - "rpc_extra_params": "?prod", - "server_host": "goma.chromium.org", - "use_luci_auth": true - }, - "$build/reclient": { - "instance": "rbe-chromium-untrusted", - "jobs": 150, - "metrics_project": "chromium-reclient-metrics" - }, - "$recipe_engine/resultdb/test_presentation": { - "column_keys": [], - "grouping_keys": [ - "status", - "v.test_suite" - ] - }, - "builder_group": "tryserver.chromium.linux", - "recipe": "chromium/compilator" -} \ No newline at end of file
diff --git a/infra/config/generated/builders/try/linux-rel-warmed/properties.json b/infra/config/generated/builders/try/linux-rel-warmed/properties.json deleted file mode 100644 index 53fb3ab..0000000 --- a/infra/config/generated/builders/try/linux-rel-warmed/properties.json +++ /dev/null
@@ -1,173 +0,0 @@ -{ - "$build/chromium_orchestrator": { - "compilator": "linux-rel-warmed-compilator", - "compilator_watcher_git_revision": "7809a690bbd935bcb3b4d922e24cabe168aaabc8" - }, - "$build/chromium_tests_builder_config": { - "builder_config": { - "builder_db": { - "entries": [ - { - "builder_id": { - "bucket": "ci", - "builder": "GPU Linux Builder", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-gpu-archive", - "builder_group": "chromium.gpu", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage", - "enable_reclient" - ], - "config": "chromium" - } - } - }, - { - "builder_id": { - "bucket": "ci", - "builder": "Linux Builder", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-linux-archive", - "builder_group": "chromium.linux", - "execution_mode": "COMPILE_AND_TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage", - "enable_reclient" - ], - "config": "chromium" - } - } - }, - { - "builder_id": { - "bucket": "ci", - "builder": "Linux Release (NVIDIA)", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-gpu-archive", - "builder_group": "chromium.gpu", - "execution_mode": "TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage" - ], - "config": "chromium" - }, - "parent": { - "bucket": "ci", - "builder": "GPU Linux Builder", - "project": "chromium" - } - } - }, - { - "builder_id": { - "bucket": "ci", - "builder": "Linux Tests", - "project": "chromium" - }, - "builder_spec": { - "build_gs_bucket": "chromium-linux-archive", - "builder_group": "chromium.linux", - "execution_mode": "TEST", - "legacy_chromium_config": { - "apply_configs": [ - "mb" - ], - "build_config": "Release", - "config": "chromium", - "target_bits": 64 - }, - "legacy_gclient_config": { - "apply_configs": [ - "use_clang_coverage" - ], - "config": "chromium" - }, - "parent": { - "bucket": "ci", - "builder": "Linux Builder", - "project": "chromium" - } - } - } - ] - }, - "builder_ids": [ - { - "bucket": "ci", - "builder": "GPU Linux Builder", - "project": "chromium" - }, - { - "bucket": "ci", - "builder": "Linux Builder", - "project": "chromium" - } - ], - "builder_ids_in_scope_for_testing": [ - { - "bucket": "ci", - "builder": "Linux Release (NVIDIA)", - "project": "chromium" - }, - { - "bucket": "ci", - "builder": "Linux Tests", - "project": "chromium" - } - ], - "rts_config": { - "condition": "QUICK_RUN_ONLY" - } - } - }, - "$build/code_coverage": { - "coverage_test_types": [ - "unit", - "overall" - ], - "use_clang_coverage": true - }, - "$recipe_engine/resultdb/test_presentation": { - "column_keys": [], - "grouping_keys": [ - "status", - "v.test_suite" - ] - }, - "builder_group": "tryserver.chromium.linux", - "recipe": "chromium/orchestrator" -} \ No newline at end of file
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg index a252ffe..a73ed4b5 100644 --- a/infra/config/generated/luci/commit-queue.cfg +++ b/infra/config/generated/luci/commit-queue.cfg
@@ -3009,14 +3009,6 @@ } } builders { - name: "chromium/try/linux-rel-warmed" - includable_only: true - } - builders { - name: "chromium/try/linux-rel-warmed-compilator" - includable_only: true - } - builders { name: "chromium/try/linux-rust-x64-dbg" includable_only: true }
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index f21e04a9..f80066b 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -9825,88 +9825,6 @@ } } builders { - name: "GPU Mac Builder (reclient shadow)" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "cpu:x86-64" - dimensions: "free_space:standard" - dimensions: "os:Mac" - dimensions: "pool:luci.chromium.gpu.ci" - exe { - cipd_package: "infra/chromium/bootstrapper/${platform}" - cipd_version: "latest" - cmd: "bootstrapper" - } - properties: - '{' - ' "$bootstrap/exe": {' - ' "exe": {' - ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",' - ' "cipd_version": "refs/heads/main",' - ' "cmd": [' - ' "luciexe"' - ' ]' - ' }' - ' },' - ' "$bootstrap/properties": {' - ' "properties_file": "infra/config/generated/builders/ci/GPU Mac Builder (reclient shadow)/properties.json",' - ' "top_level_project": {' - ' "ref": "refs/heads/main",' - ' "repo": {' - ' "host": "chromium.googlesource.com",' - ' "project": "chromium/src"' - ' }' - ' }' - ' },' - ' "builder_group": "chromium.gpu",' - ' "led_builder_is_bootstrapped": true,' - ' "recipe": "chromium"' - '}' - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 10 - } - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "ci_test_results" - test_results {} - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "gpu_ci_test_results" - test_results { - predicate { - test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+" - } - } - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "blink_web_tests_ci_test_results" - test_results { - predicate { - test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)" - } - } - } - history_options { - use_invocation_timestamp: true - } - } - } - builders { name: "GPU Win x64 Builder" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" @@ -17183,81 +17101,6 @@ } } builders { - name: "Mac deterministic (reclient shadow)" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "cpu:x86-64" - dimensions: "free_space:standard" - dimensions: "os:Mac-12" - dimensions: "pool:luci.chromium.ci" - exe { - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - cmd: "luciexe" - } - properties: - '{' - ' "$build/reclient": {' - ' "instance": "rbe-chromium-trusted",' - ' "jobs": 200,' - ' "metrics_project": "chromium-reclient-metrics"' - ' },' - ' "$recipe_engine/resultdb/test_presentation": {' - ' "column_keys": [],' - ' "grouping_keys": [' - ' "status",' - ' "v.test_suite"' - ' ]' - ' },' - ' "builder_group": "chromium.fyi",' - ' "recipe": "swarming/deterministic_build"' - '}' - priority: 35 - execution_timeout_secs: 21600 - build_numbers: YES - service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 10 - } - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "ci_test_results" - test_results {} - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "gpu_ci_test_results" - test_results { - predicate { - test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+" - } - } - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "blink_web_tests_ci_test_results" - test_results { - predicate { - test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)" - } - } - } - history_options { - use_invocation_timestamp: true - } - } - } - builders { name: "Mac10.13 Tests" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" @@ -38774,7 +38617,7 @@ dimensions: "cores:8" dimensions: "cpu:x86-64" dimensions: "free_space:standard" - dimensions: "os:Ubuntu-18.04" + dimensions: "os:Ubuntu-20.04" dimensions: "pool:luci.chromium.ci" dimensions: "ssd:0" exe { @@ -42221,92 +42064,6 @@ } } builders { - name: "mac-arm64-rel (reclient shadow)" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builderless:1" - dimensions: "cpu:x86-64" - dimensions: "free_space:standard" - dimensions: "os:Mac-12" - dimensions: "pool:luci.chromium.ci" - exe { - cipd_package: "infra/chromium/bootstrapper/${platform}" - cipd_version: "latest" - cmd: "bootstrapper" - } - properties: - '{' - ' "$bootstrap/exe": {' - ' "exe": {' - ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",' - ' "cipd_version": "refs/heads/main",' - ' "cmd": [' - ' "luciexe"' - ' ]' - ' }' - ' },' - ' "$bootstrap/properties": {' - ' "properties_file": "infra/config/generated/builders/ci/mac-arm64-rel (reclient shadow)/properties.json",' - ' "top_level_project": {' - ' "ref": "refs/heads/main",' - ' "repo": {' - ' "host": "chromium.googlesource.com",' - ' "project": "chromium/src"' - ' }' - ' }' - ' },' - ' "builder_group": "chromium.mac",' - ' "led_builder_is_bootstrapped": true,' - ' "recipe": "chromium"' - '}' - execution_timeout_secs: 10800 - build_numbers: YES - service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 10 - } - experiments { - key: "luci.buildbucket.omit_python2" - value: 100 - } - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "ci_test_results" - test_results {} - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "gpu_ci_test_results" - test_results { - predicate { - test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+" - } - } - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "blink_web_tests_ci_test_results" - test_results { - predicate { - test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)" - } - } - } - history_options { - use_invocation_timestamp: true - } - } - } - builders { name: "mac-arm64-updater-tester-dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" @@ -51444,68 +51201,6 @@ } } buckets { - name: "infra" - acls { - group: "all" - } - acls { - role: SCHEDULER - group: "project-chromium-infra-schedulers" - } - swarming { - builders { - name: "linux-rel-warmed-compilator-warmer" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builder:linux-rel-warmed-compilator" - dimensions: "cpu:x86-64" - dimensions: "pool:luci.chromium.try" - exe { - cipd_package: "infra/chromium/bootstrapper/${platform}" - cipd_version: "latest" - cmd: "bootstrapper" - } - properties: - '{' - ' "$bootstrap/exe": {' - ' "exe": {' - ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",' - ' "cipd_version": "refs/heads/main",' - ' "cmd": [' - ' "luciexe"' - ' ]' - ' }' - ' },' - ' "$bootstrap/properties": {' - ' "properties_file": "infra/config/generated/builders/infra/linux-rel-warmed-compilator-warmer/properties.json",' - ' "top_level_project": {' - ' "ref": "refs/heads/main",' - ' "repo": {' - ' "host": "chromium.googlesource.com",' - ' "project": "chromium/src"' - ' }' - ' }' - ' },' - ' "led_builder_is_bootstrapped": true,' - ' "recipe": "chromium/builder_cache_prewarmer"' - '}' - caches { - name: "linux_rel_warmed_compilator_warmed_cache" - path: "builder" - wait_for_warm_cache_secs: 240 - } - build_numbers: YES - service_account: "chromium-warmer@chops-service-accounts.iam.gserviceaccount.com" - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - } - } - } -} -buckets { name: "reclient" acls { role: WRITER @@ -76834,200 +76529,6 @@ } } builders { - name: "linux-rel-warmed" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builder:linux-rel-warmed" - dimensions: "cores:2" - dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-18.04" - dimensions: "pool:luci.chromium.try" - exe { - cipd_package: "infra/chromium/bootstrapper/${platform}" - cipd_version: "latest" - cmd: "bootstrapper" - } - properties: - '{' - ' "$bootstrap/exe": {' - ' "exe": {' - ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",' - ' "cipd_version": "refs/heads/main",' - ' "cmd": [' - ' "luciexe"' - ' ]' - ' }' - ' },' - ' "$bootstrap/properties": {' - ' "properties_file": "infra/config/generated/builders/try/linux-rel-warmed/properties.json",' - ' "top_level_project": {' - ' "ref": "refs/heads/main",' - ' "repo": {' - ' "host": "chromium.googlesource.com",' - ' "project": "chromium/src"' - ' }' - ' }' - ' },' - ' "builder_group": "tryserver.chromium.linux",' - ' "led_builder_is_bootstrapped": true,' - ' "recipe": "chromium/orchestrator"' - '}' - execution_timeout_secs: 14400 - expiration_secs: 7200 - grace_period { - seconds: 120 - } - caches { - name: "win_toolchain" - path: "win_toolchain" - } - build_numbers: YES - service_account: "chromium-orchestrator@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage { - value: 5 - } - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 20 - } - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "try_test_results" - test_results {} - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "gpu_try_test_results" - test_results { - predicate { - test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+" - } - } - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "blink_web_tests_try_test_results" - test_results { - predicate { - test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)" - } - } - } - history_options { - use_invocation_timestamp: true - } - } - description_html: "This is the orchestrator half of an orchestrator + compilator pair of builders. The compilator is <a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-rel-warmed-compilator\">linux-rel-warmed-compilator</a>." - } - builders { - name: "linux-rel-warmed-compilator" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "builder:linux-rel-warmed-compilator" - dimensions: "cores:16" - dimensions: "cpu:x86-64" - dimensions: "os:Ubuntu-18.04" - dimensions: "pool:luci.chromium.try" - dimensions: "ssd:1" - exe { - cipd_package: "infra/chromium/bootstrapper/${platform}" - cipd_version: "latest" - cmd: "bootstrapper" - } - properties: - '{' - ' "$bootstrap/exe": {' - ' "exe": {' - ' "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",' - ' "cipd_version": "refs/heads/main",' - ' "cmd": [' - ' "luciexe"' - ' ]' - ' }' - ' },' - ' "$bootstrap/properties": {' - ' "properties_file": "infra/config/generated/builders/try/linux-rel-warmed-compilator/properties.json",' - ' "top_level_project": {' - ' "ref": "refs/heads/main",' - ' "repo": {' - ' "host": "chromium.googlesource.com",' - ' "project": "chromium/src"' - ' }' - ' }' - ' },' - ' "builder_group": "tryserver.chromium.linux",' - ' "led_builder_is_bootstrapped": true,' - ' "recipe": "chromium/compilator"' - '}' - execution_timeout_secs: 14400 - expiration_secs: 7200 - grace_period { - seconds: 120 - } - caches { - name: "linux_rel_warmed_compilator_warmed_cache" - path: "builder" - wait_for_warm_cache_secs: 240 - } - caches { - name: "win_toolchain" - path: "win_toolchain" - } - build_numbers: YES - service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage { - value: 5 - } - experiments { - key: "chromium_swarming.expose_merge_script_failures" - value: 20 - } - experiments { - key: "luci.recipes.use_python3" - value: 100 - } - resultdb { - enable: true - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "try_test_results" - test_results {} - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "gpu_try_test_results" - test_results { - predicate { - test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+" - } - } - } - bq_exports { - project: "chrome-luci-data" - dataset: "chromium" - table: "blink_web_tests_try_test_results" - test_results { - predicate { - test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)" - } - } - } - history_options { - use_invocation_timestamp: true - } - } - description_html: "This is the compilator half of an orchestrator + compilator pair of builders. The orchestrator is <a href=\"https://ci.chromium.org/p/chromium/builders/try/linux-rel-warmed\">linux-rel-warmed</a>." - } - builders { name: "linux-rust-x64-dbg" swarming_host: "chromium-swarm.appspot.com" dimensions: "builder:linux-rust-x64-dbg"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg index ff19d11..8a63769 100644 --- a/infra/config/generated/luci/luci-milo.cfg +++ b/infra/config/generated/luci/luci-milo.cfg
@@ -216,11 +216,6 @@ short_name: "bld" } builders { - name: "buildbucket/luci.chromium.ci/mac-arm64-rel (reclient shadow)" - category: "chromium.mac|release|arm64" - short_name: "rec" - } - builders { name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)" category: "chromium.mac|debug" short_name: "bld" @@ -1857,7 +1852,7 @@ builders { name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-rel" category: "fyi" - short_name: "a64" + short_name: "arm64" } builders { name: "buildbucket/luci.chromium.ci/ToTFuchsiaOfficial" @@ -2788,12 +2783,6 @@ name: "buildbucket/luci.chromium.try/linux-rel-compilator" } builders { - name: "buildbucket/luci.chromium.try/linux-rel-warmed" - } - builders { - name: "buildbucket/luci.chromium.try/linux-rel-warmed-compilator" - } - builders { name: "buildbucket/luci.chromium.try/linux-wayland-rel" } builders { @@ -8245,23 +8234,18 @@ short_name: "dbg" } builders { - name: "buildbucket/luci.chromium.ci/Mac deterministic (reclient shadow)" - category: "deterministic|mac" - short_name: "rec" - } - builders { name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-cfv2-script" - category: "fuchsia|a64" + category: "fuchsia|arm64" short_name: "cfv2" } builders { name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-emu-arg" - category: "fuchsia|a64" + category: "fuchsia|arm64" short_name: "emu-arg" } builders { name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-rel" - category: "fuchsia|a64" + category: "fuchsia|arm64" short_name: "rel" } builders { @@ -9890,11 +9874,6 @@ category: "Mac" } builders { - name: "buildbucket/luci.chromium.ci/GPU Mac Builder (reclient shadow)" - category: "Mac" - short_name: "rec" - } - builders { name: "buildbucket/luci.chromium.ci/GPU Linux Builder" category: "Linux" } @@ -11353,11 +11332,6 @@ short_name: "bld" } builders { - name: "buildbucket/luci.chromium.ci/mac-arm64-rel (reclient shadow)" - category: "release|arm64" - short_name: "rec" - } - builders { name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)" category: "debug" short_name: "bld" @@ -15765,340 +15739,6 @@ } } consoles { - id: "infra" - name: "infra" - repo_url: "https://chromium.googlesource.com/chromium/src" - refs: "regexp:refs/heads/main" - manifest_name: "REVISION" - builders { - name: "buildbucket/luci.chromium.infra/linux-rel-warmed-compilator-warmer" - category: "warmer" - } - header { - oncalls { - name: "Chromium" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff" - } - oncalls { - name: "Android" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff" - } - oncalls { - name: "iOS" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ios" - } - oncalls { - name: "ChromeOS" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chromeos-gardeners" - } - oncalls { - name: "Fuchsia" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chrome-fuchsia-gardener" - } - oncalls { - name: "GPU" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-gpu-pixel-wrangler-weekly" - } - oncalls { - name: "ANGLE" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:angle-wrangler" - } - oncalls { - name: "Perf" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chromium-perf-regression-sheriff" - } - oncalls { - name: "Perfbot" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/grotation:chromium-perf-bot-sheriff" - } - oncalls { - name: "Trooper" - url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra" - show_primary_secondary_labels: true - } - links { - name: "Builds" - links { - text: "continuous" - url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html" - alt: "Continuous browser snapshots" - } - links { - text: "symbols" - url: "https://www.chromium.org/developers/how-tos/debugging-on-windows" - alt: "Windows Symbols" - } - links { - text: "status" - url: "https://chromium-status.appspot.com/" - alt: "Current tree status" - } - } - links { - name: "Dashboards" - links { - text: "perf" - url: "https://chromeperf.appspot.com/" - alt: "Chrome perf dashboard" - } - links { - text: "flake-portal" - url: "https://analysis.chromium.org/p/chromium/flake-portal" - alt: "New flake portal" - } - links { - text: "legacy-flakiness" - url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html" - alt: "Legacy flakiness dashboard" - } - } - links { - name: "Chromium" - links { - text: "source" - url: "https://chromium.googlesource.com/chromium/src" - alt: "Chromium source code repository" - } - links { - text: "reviews" - url: "https://chromium-review.googlesource.com" - alt: "Chromium code review tool" - } - links { - text: "bugs" - url: "https://crbug.com" - alt: "Chromium bug tracker" - } - links { - text: "coverage" - url: "https://analysis.chromium.org/coverage/p/chromium" - alt: "Chromium code coverage dashboard" - } - links { - text: "dev" - url: "https://dev.chromium.org/Home" - alt: "Chromium developer home page" - } - links { - text: "support" - url: "https://support.google.com/chrome/#topic=7438008" - alt: "Google Chrome help center" - } - } - links { - name: "Consoles" - links { - text: "android" - url: "/p/chromium/g/chromium.android" - alt: "Chromium Android console" - } - links { - text: "clang" - url: "/p/chromium/g/chromium.clang" - alt: "Chromium Clang console" - } - links { - text: "dawn" - url: "/p/chromium/g/chromium.dawn" - alt: "Chromium Dawn console" - } - links { - text: "fuzz" - url: "/p/chromium/g/chromium.fuzz" - alt: "Chromium Fuzz console" - } - links { - text: "fuchsia" - url: "/p/chromium/g/chromium.fuchsia" - alt: "Chromium Fuchsia console" - } - links { - text: "fyi" - url: "/p/chromium/g/chromium.fyi" - alt: "Chromium FYI console" - } - links { - text: "gpu" - url: "/p/chromium/g/chromium.gpu" - alt: "Chromium GPU console" - } - links { - text: "packager" - url: "/p/chromium/g/chromium.packager" - alt: "Chromium Packager console" - } - links { - text: "perf" - url: "/p/chrome/g/chrome.perf/console" - alt: "Chromium Perf console" - } - links { - text: "perf.fyi" - url: "/p/chrome/g/chrome.perf.fyi/console" - alt: "Chromium Perf FYI console" - } - links { - text: "angle" - url: "/p/chromium/g/chromium.angle" - alt: "Chromium ANGLE console" - } - links { - text: "swangle" - url: "/p/chromium/g/chromium.swangle" - alt: "Chromium SWANGLE console" - } - links { - text: "updater" - url: "/p/chromium/g/chromium.updater" - alt: "Chromium Updater console" - } - links { - text: "webrtc" - url: "/p/chromium/g/chromium.webrtc" - alt: "Chromium WebRTC console" - } - links { - text: "chromiumos" - url: "/p/chromium/g/chromium.chromiumos" - alt: "ChromiumOS console" - } - links { - text: "flakiness" - url: "/p/chromium/g/chromium.flakiness" - alt: "Chromium Flakiness console" - } - } - links { - name: "Branch Consoles" - links { - text: "m100" - url: "/p/chromium-m100/g/main/console" - } - links { - text: "m102" - url: "/p/chromium-m102/g/main/console" - } - links { - text: "m104" - url: "/p/chromium-m104/g/main/console" - } - links { - text: "m105" - url: "/p/chromium-m105/g/main/console" - } - links { - text: "m106" - url: "/p/chromium-m106/g/main/console" - } - links { - text: "m107" - url: "/p/chromium-m107/g/main/console" - } - links { - text: "trunk" - url: "/p/chromium/g/main/console" - alt: "Trunk (ToT) console" - } - } - links { - name: "Tryservers" - links { - text: "android" - url: "/p/chromium/g/tryserver.chromium.android/builders" - alt: "Android" - } - links { - text: "angle" - url: "/p/chromium/g/tryserver.chromium.angle/builders" - alt: "Angle" - } - links { - text: "blink" - url: "/p/chromium/g/tryserver.blink/builders" - alt: "Blink" - } - links { - text: "chrome" - url: "/p/chrome/g/tryserver.chrome/builders" - alt: "Chrome" - } - links { - text: "chromiumos" - url: "/p/chromium/g/tryserver.chromium.chromiumos/builders" - alt: "ChromiumOS" - } - links { - text: "fuchsia" - url: "/p/chromium/g/tryserver.chromium.fuchsia/builders" - alt: "Fuchsia" - } - links { - text: "linux" - url: "/p/chromium/g/tryserver.chromium.linux/builders" - alt: "Linux" - } - links { - text: "mac" - url: "/p/chromium/g/tryserver.chromium.mac/builders" - alt: "Mac" - } - links { - text: "swangle" - url: "/p/chromium/g/tryserver.chromium.swangle/builders" - alt: "SWANGLE" - } - links { - text: "tricium" - url: "/p/chromium/g/tryserver.chromium.tricium/builders" - alt: "Tricium" - } - links { - text: "win" - url: "/p/chromium/g/tryserver.chromium.win/builders" - alt: "Win" - } - } - links { - name: "Navigate" - links { - text: "about" - url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot" - alt: "Tour of the console" - } - links { - text: "customize" - url: "https://chromium.googlesource.com/chromium/src/+/refs/heads/main/infra/config/generated/luci/luci-milo.cfg" - alt: "Customize this console" - } - } - console_groups { - title { - text: "Tree Closers" - url: "https://chromium-status.appspot.com/" - } - console_ids: "chromium/chromium" - console_ids: "chromium/chromium.win" - console_ids: "chromium/chromium.mac" - console_ids: "chromium/chromium.linux" - console_ids: "chromium/chromium.chromiumos" - console_ids: "chromium/chromium.fuchsia" - console_ids: "chrome/chrome" - console_ids: "chromium/chromium.memory" - console_ids: "chromium/chromium.gpu" - } - console_groups { - console_ids: "chromium/chromium.android" - console_ids: "chrome/chrome.perf" - console_ids: "chromium/chromium.fuchsia.fyi" - console_ids: "chromium/chromium.gpu.fyi" - console_ids: "chromium/chromium.angle" - console_ids: "chromium/chromium.swangle" - console_ids: "chromium/chromium.fuzz" - } - tree_status_host: "chromium-status.appspot.com" - } -} -consoles { id: "luci.chromium.goma" name: "luci.chromium.goma" repo_url: "https://chromium.googlesource.com/chromium/src" @@ -17177,12 +16817,6 @@ name: "buildbucket/luci.chromium.try/linux-rel-ml" } builders { - name: "buildbucket/luci.chromium.try/linux-rel-warmed" - } - builders { - name: "buildbucket/luci.chromium.try/linux-rel-warmed-compilator" - } - builders { name: "buildbucket/luci.chromium.try/linux-rust-x64-dbg" } builders { @@ -18250,12 +17884,6 @@ name: "buildbucket/luci.chromium.try/linux-rel-ml" } builders { - name: "buildbucket/luci.chromium.try/linux-rel-warmed" - } - builders { - name: "buildbucket/luci.chromium.try/linux-rel-warmed-compilator" - } - builders { name: "buildbucket/luci.chromium.try/linux-viz-rel" } builders {
diff --git a/infra/config/generated/luci/luci-notify.cfg b/infra/config/generated/luci/luci-notify.cfg index 1bd65317..b830ecb8 100644 --- a/infra/config/generated/luci/luci-notify.cfg +++ b/infra/config/generated/luci/luci-notify.cfg
@@ -3631,25 +3631,6 @@ } notifiers { notifications { - on_occurrence: FAILURE - failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|runhooks|update|\\w*nocompile_test)\\b" - email { - rotation_urls: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff" - } - template: "tree_closure_email_template" - } - builders { - bucket: "ci" - name: "mac-arm64-rel (reclient shadow)" - repository: "https://chromium.googlesource.com/chromium/src" - } - tree_closers { - tree_status_host: "chromium-status.appspot.com" - failed_step_regexp: "\\b(bot_update|compile|gclient runhooks|runhooks|update|\\w*nocompile_test)\\b" - } -} -notifiers { - notifications { on_change: true email { recipients: "chrome-memory-safety+bots@google.com"
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg index 42ac191..fd148ec 100644 --- a/infra/config/generated/luci/luci-scheduler.cfg +++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -1512,16 +1512,6 @@ } } job { - id: "GPU Mac Builder (reclient shadow)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "GPU Mac Builder (reclient shadow)" - } -} -job { id: "GPU Win x64 Builder" realm: "ci" acl_sets: "ci" @@ -2737,16 +2727,6 @@ } } job { - id: "Mac deterministic (reclient shadow)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "Mac deterministic (reclient shadow)" - } -} -job { id: "Mac10.13 Tests" realm: "ci" acls { @@ -6513,16 +6493,6 @@ } } job { - id: "mac-arm64-rel (reclient shadow)" - realm: "ci" - acl_sets: "ci" - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "ci" - builder: "mac-arm64-rel (reclient shadow)" - } -} -job { id: "mac-arm64-rel reclient staging" realm: "reclient" acl_sets: "reclient" @@ -7406,7 +7376,6 @@ triggers: "GPU Linux Builder (dbg)" triggers: "GPU Mac Builder" triggers: "GPU Mac Builder (dbg)" - triggers: "GPU Mac Builder (reclient shadow)" triggers: "GPU Win x64 Builder" triggers: "GPU Win x64 Builder (dbg)" triggers: "Leak Detection Linux" @@ -7454,7 +7423,6 @@ triggers: "Mac Builder Next" triggers: "Mac deterministic" triggers: "Mac deterministic (dbg)" - triggers: "Mac deterministic (reclient shadow)" triggers: "Network Service Linux" triggers: "Site Isolation Android" triggers: "TSAN Debug" @@ -7671,7 +7639,6 @@ triggers: "mac-arm64-on-arm64-rel" triggers: "mac-arm64-on-arm64-rel-reclient" triggers: "mac-arm64-rel" - triggers: "mac-arm64-rel (reclient shadow)" triggers: "mac-backuprefptr-x64-fyi-rel" triggers: "mac-code-coverage" triggers: "mac-fieldtrial-rel"
diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg index c1671e5..a776df5 100644 --- a/infra/config/generated/luci/realms.cfg +++ b/infra/config/generated/luci/realms.cfg
@@ -375,21 +375,6 @@ } } realms { - name: "infra" - bindings { - role: "role/buildbucket.builderServiceAccount" - principals: "user:chromium-warmer@chops-service-accounts.iam.gserviceaccount.com" - } - bindings { - role: "role/buildbucket.reader" - principals: "group:all" - } - bindings { - role: "role/buildbucket.triggerer" - principals: "group:project-chromium-infra-schedulers" - } -} -realms { name: "pools/ci" bindings { role: "role/swarming.poolUser"
diff --git a/infra/config/subprojects/chromium/ci/chromium.fyi.star b/infra/config/subprojects/chromium/ci/chromium.fyi.star index 2c34d124..a5aec19 100644 --- a/infra/config/subprojects/chromium/ci/chromium.fyi.star +++ b/infra/config/subprojects/chromium/ci/chromium.fyi.star
@@ -200,7 +200,7 @@ ), console_view_entry = [ consoles.console_view_entry( - category = "fuchsia|a64", + category = "fuchsia|arm64", short_name = "emu-arg", ), ], @@ -212,14 +212,14 @@ name = "fuchsia-fyi-arm64-rel", console_view_entry = [ consoles.console_view_entry( - category = "fuchsia|a64", + category = "fuchsia|arm64", short_name = "rel", ), consoles.console_view_entry( branch_selector = branches.MAIN, console_view = "sheriff.fuchsia", category = "fyi", - short_name = "a64", + short_name = "arm64", ), ], notifies = ["cr-fuchsia"], @@ -281,7 +281,7 @@ ), console_view_entry = [ consoles.console_view_entry( - category = "fuchsia|a64", + category = "fuchsia|arm64", short_name = "cfv2", ), ], @@ -2280,21 +2280,6 @@ ) fyi_mac_builder( - name = "Mac deterministic (reclient shadow)", - console_view_entry = consoles.console_view_entry( - category = "deterministic|mac", - short_name = "rec", - ), - cores = None, - executable = "recipe:swarming/deterministic_build", - execution_timeout = 6 * time.hour, - builderless = True, - goma_backend = None, - reclient_instance = reclient.instance.DEFAULT_TRUSTED, - reclient_jobs = 200, -) - -fyi_mac_builder( name = "mac-hermetic-upgrade-rel", console_view_entry = consoles.console_view_entry( category = "mac",
diff --git a/infra/config/subprojects/chromium/ci/chromium.gpu.star b/infra/config/subprojects/chromium/ci/chromium.gpu.star index 26835a36..d9adf43 100644 --- a/infra/config/subprojects/chromium/ci/chromium.gpu.star +++ b/infra/config/subprojects/chromium/ci/chromium.gpu.star
@@ -9,7 +9,6 @@ load("//lib/builders.star", "reclient", "sheriff_rotations") load("//lib/ci.star", "ci") load("//lib/consoles.star", "consoles") -load("//lib/structs.star", "structs") ci.defaults.set( builder_group = "chromium.gpu", @@ -133,24 +132,6 @@ ) ci.gpu.mac_builder( - name = "GPU Mac Builder (reclient shadow)", - builder_spec = builder_config.copy_from( - "ci/GPU Mac Builder", - lambda spec: structs.evolve( - spec, - build_gs_bucket = None, - ), - ), - console_view_entry = consoles.console_view_entry( - category = "Mac", - short_name = "rec", - ), - goma_backend = None, - tree_closing = False, - sheriff_rotations = args.ignore_default(None), -) - -ci.gpu.mac_builder( name = "GPU Mac Builder (dbg)", console_view_entry = consoles.console_view_entry( category = "Mac",
diff --git a/infra/config/subprojects/chromium/ci/chromium.linux.star b/infra/config/subprojects/chromium/ci/chromium.linux.star index 9ecc450..fefed82 100644 --- a/infra/config/subprojects/chromium/ci/chromium.linux.star +++ b/infra/config/subprojects/chromium/ci/chromium.linux.star
@@ -472,4 +472,5 @@ short_name = "gcc", ), reclient_instance = None, + os = os.LINUX_FOCAL, )
diff --git a/infra/config/subprojects/chromium/ci/chromium.mac.star b/infra/config/subprojects/chromium/ci/chromium.mac.star index d97f8362..0e1b747 100644 --- a/infra/config/subprojects/chromium/ci/chromium.mac.star +++ b/infra/config/subprojects/chromium/ci/chromium.mac.star
@@ -168,24 +168,6 @@ reclient_jobs = reclient.jobs.DEFAULT, ) -ci.builder( - name = "mac-arm64-rel (reclient shadow)", - builder_spec = builder_config.copy_from( - "ci/mac-arm64-rel", - ), - console_view_entry = consoles.console_view_entry( - category = "release|arm64", - short_name = "rec", - ), - os = os.MAC_DEFAULT, - sheriff_rotations = args.ignore_default(None), - builderless = True, - cores = None, - goma_backend = None, - reclient_instance = reclient.instance.DEFAULT_TRUSTED, - reclient_jobs = 200, -) - ci.thin_tester( name = "mac11-arm64-rel-tests", branch_selector = branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
diff --git a/infra/config/subprojects/chromium/infra.star b/infra/config/subprojects/chromium/infra.star deleted file mode 100644 index cfa248d..0000000 --- a/infra/config/subprojects/chromium/infra.star +++ /dev/null
@@ -1,60 +0,0 @@ -# Copyright 2021 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -load("//lib/builders.star", "builders", "cpu", "goma") -load("//lib/consoles.star", "consoles") - -builders.defaults.set( - bucket = "infra", - build_numbers = True, - cores = 8, - cpu = cpu.X86_64, - # TODO(crbug.com/1362440): remove this. - omit_python2 = False, -) - -consoles.console_view( - name = "infra", -) - -luci.bucket( - name = "infra", - acls = [ - acl.entry( - roles = acl.BUILDBUCKET_READER, - groups = "all", - ), - acl.entry( - roles = acl.BUILDBUCKET_TRIGGERER, - groups = "project-chromium-infra-schedulers", - ), - ], -) - -builders.builder( - name = "linux-rel-warmed-compilator-warmer", - console_view_entry = consoles.console_view_entry( - console_view = "infra", - category = "warmer", - ), - override_builder_dimension = "linux-rel-warmed-compilator", - caches = [ - swarming.cache( - name = "linux_rel_warmed_compilator_warmed_cache", - path = "builder", - wait_for_warm_cache = 4 * time.minute, - ), - ], - cores = None, - executable = "recipe:chromium/builder_cache_prewarmer", - goma_jobs = goma.jobs.J150, - pool = "luci.chromium.try", - properties = { - "builder_to_warm": { - "builder_name": "linux-rel-warmed", - "builder_group": "tryserver.chromium.linux", - }, - }, - service_account = "chromium-warmer@chops-service-accounts.iam.gserviceaccount.com", -)
diff --git a/infra/config/subprojects/chromium/subproject.star b/infra/config/subprojects/chromium/subproject.star index 495a4286..6b58e9321 100644 --- a/infra/config/subprojects/chromium/subproject.star +++ b/infra/config/subprojects/chromium/subproject.star
@@ -14,7 +14,6 @@ exec("./ci.star") exec("./try.star") -exec("./infra.star") # TODO(gbeaty) Move the builders in these files into the per-builder group # files, this can't be done during the freeze because it changes the grace
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star index 58d6850e..5a9f1f4 100644 --- a/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star +++ b/infra/config/subprojects/chromium/try/tryserver.chromium.linux.star
@@ -279,33 +279,6 @@ main_list_view = "try", ) -# crbug.com/1270571: Experimental bot to test pre-warming -try_.orchestrator_builder( - name = "linux-rel-warmed", - compilator = "linux-rel-warmed-compilator", - mirrors = [ - "ci/Linux Builder", - "ci/Linux Tests", - "ci/GPU Linux Builder", - "ci/Linux Release (NVIDIA)", - ], - try_settings = builder_config.try_settings( - rts_config = builder_config.rts_config( - condition = builder_config.rts_condition.QUICK_RUN_ONLY, - ), - ), - main_list_view = "try", - use_clang_coverage = True, - coverage_test_types = ["unit", "overall"], -) - -# crbug.com/1270571: Experimental bot to test pre-warming -try_.compilator_builder( - name = "linux-rel-warmed-compilator", - main_list_view = "try", - builder_cache_name = "linux_rel_warmed_compilator_warmed_cache", -) - try_.builder( name = "linux-wayland-rel", branch_selector = branches.STANDARD_MILESTONE,
diff --git a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.h b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.h index 22284ea..48d63a20 100644 --- a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.h +++ b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.h
@@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_HTTPS_UPGRADES_HTTPS_ONLY_MODE_UPGRADE_TAB_HELPER_H_ #define IOS_CHROME_BROWSER_HTTPS_UPGRADES_HTTPS_ONLY_MODE_UPGRADE_TAB_HELPER_H_ +#include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h" #import "ios/web/public/navigation/web_state_policy_decider.h" @@ -71,7 +72,7 @@ // allowlisted). bool IsHttpAllowedForUrl(const GURL& url) const; // Called when the upgrade timer times out. - void OnHttpsLoadTimeout(); + void OnHttpsLoadTimeout(base::WeakPtr<web::WebState> weak_web_state); // Stops the current navigation and sets the state so that an upgrade will be // started. void StopToUpgrade(
diff --git a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm index 7c8bf68..f4b21b5 100644 --- a/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm +++ b/ios/chrome/browser/https_upgrades/https_only_mode_upgrade_tab_helper.mm
@@ -86,7 +86,7 @@ timer_.Start( FROM_HERE, service_->GetFallbackDelay(), base::BindOnce(&HttpsOnlyModeUpgradeTabHelper::OnHttpsLoadTimeout, - base::Unretained(this))); + base::Unretained(this), web_state->GetWeakPtr())); return; } if (state_ == State::kNone) { @@ -195,10 +195,13 @@ timer_.Stop(); } -void HttpsOnlyModeUpgradeTabHelper::OnHttpsLoadTimeout() { +void HttpsOnlyModeUpgradeTabHelper::OnHttpsLoadTimeout( + base::WeakPtr<web::WebState> weak_web_state) { DCHECK(state_ == State::kUpgraded); state_ = State::kStoppedWithTimeout; - web_state()->Stop(); + if (weak_web_state) { + weak_web_state->Stop(); + } } void HttpsOnlyModeUpgradeTabHelper::ShouldAllowResponse(
diff --git a/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper.h b/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper.h index 81eb238..a34efa12 100644 --- a/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper.h +++ b/ios/chrome/browser/https_upgrades/typed_navigation_upgrade_tab_helper.h
@@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_HTTPS_UPGRADES_TYPED_NAVIGATION_UPGRADE_TAB_HELPER_H_ #define IOS_CHROME_BROWSER_HTTPS_UPGRADES_TYPED_NAVIGATION_UPGRADE_TAB_HELPER_H_ +#include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/timer/timer.h" #include "ios/web/public/web_state_observer.h"
diff --git a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 index 12ae0d4..2fd9aec 100644 --- a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -6b4d8ab1f9c827a5894a2c746632901779f4d120 \ No newline at end of file +de72dc675b14e4991a7cb9baa82f30211f607a1d \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 index 6be76836..42b1fb4e 100644 --- a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -777da630537c9b5855a8eec0ca588eff3546a538 \ No newline at end of file +3bf383bb2b4df52801ee07d5957dae4afd6609da \ No newline at end of file
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 cdcc296..e67fb161 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 @@ -70e9559b3a45dc52b86421f007d1f2ddebde91ab \ No newline at end of file +5eae18bddaea678b0bfa80b89c2a670a184aa43a \ 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 4c8a5a4..569ed72e 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 @@ -835ff3a19b959a4e2c857438c1c2c99b06209e86 \ No newline at end of file +3956be883981b9cded485a2937b36b513d585686 \ 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 aea36c4..b2aeaa5f 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 @@ -7c4bb4237c0378cf71e083e4761b9b576fa64522 \ No newline at end of file +b0f6e45f6b5b12a866e132342443b96f185d3e26 \ 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 2fb9624..c9942bee18 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 @@ -42516bccc31127b2c375ef5e3f662880f7fb263e \ No newline at end of file +ca307ee1df9b276fd07b87dc6a3ae6e2417c7e65 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 index 3ddda26..0cc0dba 100644 --- a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -895c4f7cf5704c5f67c4f2379cd1ded875b22207 \ No newline at end of file +c38f3c462960014abca1c968d7cbdbda16bcad17 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 index aa4fac675..bc20790 100644 --- a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -05c0baf4eda0525d9bdd0129e8778d558d790f8e \ No newline at end of file +b4ff819ba70dfc719d29b0134bfc86c84a48980e \ 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 e5322cd9..9135d508 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 @@ -e96ee0b2baf3aa828e5453c93bc4099c79072379 \ No newline at end of file +5c459cb370513f8451c74bdfc9489c66f1fa358d \ 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 9c4db3c..38ec65b 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 @@ -7a12e89b647930596d7d95f944449839e722c4e2 \ No newline at end of file +c9f47d804537129cf1a1976b49b8b1e8c978ae48 \ 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 b9abf539..0cd5d5b 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 @@ -8472e757a8810daff7af0dda84da85c3bd967cb3 \ No newline at end of file +fafaf8f7baa67ac4cad4835ad389a3d0b3d9f55e \ 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 a8594fe..0564f88 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 @@ -7469b91bef9135ba655ea6b1903252e8cba55acc \ No newline at end of file +ba33d85816aeda024b1d20c4a660f2df53b0caf8 \ 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 59ae307..f70da20 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 @@ -ec65a7f4895a05135a1b941e94823eff97ecee75 \ No newline at end of file +3f5f66bef47f415f3820ff189c0d08f8dbf4abd3 \ 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 4cab8ea..8a94b77 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 @@ -1eceaa2b422705468d1c8b73d7cceb7dc89e2a99 \ No newline at end of file +fddb891931e589735567023c91d482f31def2452 \ No newline at end of file
diff --git a/media/mojo/mojom/speech_recognition.mojom b/media/mojo/mojom/speech_recognition.mojom index 19a6373..b7e7a2b 100644 --- a/media/mojo/mojom/speech_recognition.mojom +++ b/media/mojo/mojom/speech_recognition.mojom
@@ -176,8 +176,23 @@ kCaption, }; +// Which Chrome/ChromeOS application that is triggering the +// speech recognition session to start. +[Stable, Extensible] +enum RecognizerClientType { + [Default] kUnknown, + // Dictation on ChromeOS. + kDictation, + // LiveCaption on Chrome/ChromeOS. + kLiveCaption, + // Projector on ChromeOS. + kProjector, + // CastModerator on ChromeOS. + kCastModerator, +}; + // Options for speech recognition. -// TODO(crbug.com/1165437): Add option to include timing metrics in the result. +// Next version: 2 [Stable] struct SpeechRecognitionOptions { // What kind of recognition to use. @@ -194,4 +209,10 @@ // can use its own language. Right now Language is only used by Projector // and Dictation via OnDeviceSpeechRecognizer in Chrome OS. string? language; + + // Whether the recognition is happening on-device or remotely on a server. + [MinVersion=1] bool is_server_based; + + // Which client is requesting the speech recognition session. + [MinVersion=1] RecognizerClientType recognizer_client_type; };
diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/public/cpp/ukm_recorder.cc index 11bb9ef6..abb28ac2 100644 --- a/services/metrics/public/cpp/ukm_recorder.cc +++ b/services/metrics/public/cpp/ukm_recorder.cc
@@ -74,7 +74,7 @@ // static ukm::SourceId UkmRecorder::GetSourceIdForRedirectUrl( - base::PassKey<DIPSBounceDetector>, + base::PassKey<DIPSNavigationHandle>, const GURL& redirect_url) { return UkmRecorder::GetSourceIdFromScopeImpl(redirect_url, SourceIdType::REDIRECT_ID);
diff --git a/services/metrics/public/cpp/ukm_recorder.h b/services/metrics/public/cpp/ukm_recorder.h index 091dfdb..b8db0b40 100644 --- a/services/metrics/public/cpp/ukm_recorder.h +++ b/services/metrics/public/cpp/ukm_recorder.h
@@ -15,7 +15,7 @@ #include "services/metrics/public/mojom/ukm_interface.mojom-forward.h" #include "url/gurl.h" -class DIPSBounceDetector; +class DIPSNavigationHandle; class PermissionUmaUtil; class WebApkUkmRecorder; @@ -116,8 +116,8 @@ // Gets a new SourceId of REDIRECT_ID type and updates the source url // from the redirect chain. This method should only be called in the - // DIPSBounceDetector class. - static SourceId GetSourceIdForRedirectUrl(base::PassKey<DIPSBounceDetector>, + // DIPSNavigationHandle class. + static SourceId GetSourceIdForRedirectUrl(base::PassKey<DIPSNavigationHandle>, const GURL& redirect_url); // Add an entry to the UkmEntry list.
diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 1d5a3fa3..2fb2d7e 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -5674,7 +5674,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5688,6 +5687,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5702,7 +5702,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5716,6 +5715,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5730,7 +5730,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5744,6 +5743,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5762,7 +5762,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5776,6 +5775,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5794,7 +5794,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5813,6 +5812,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5827,7 +5827,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5841,6 +5840,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5859,7 +5859,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5878,6 +5877,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5893,7 +5893,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5907,6 +5906,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5921,7 +5921,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5935,6 +5934,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5949,7 +5949,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5959,6 +5958,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -5976,7 +5976,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5990,6 +5989,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -6007,7 +6007,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -6021,6 +6020,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" }, { @@ -6037,7 +6037,6 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin-public/R105-14988.0.0", - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -6051,6 +6050,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" } ]
diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json index d39e278..6f2330a8 100644 --- a/testing/buildbot/chromium.gpu.json +++ b/testing/buildbot/chromium.gpu.json
@@ -359,15 +359,6 @@ "GPU Linux Builder (dbg)": {}, "GPU Mac Builder": {}, "GPU Mac Builder (dbg)": {}, - "GPU Mac Builder (reclient shadow)": { - "additional_compile_targets": [ - "angle_unittests", - "browser_tests", - "gl_tests", - "gl_unittests", - "telemetry_gpu_integration_test" - ] - }, "Linux Debug (NVIDIA)": { "gtest_tests": [ {
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 07aeb1b..6a19f67 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json
@@ -26946,11 +26946,6 @@ "all" ] }, - "mac-arm64-rel (reclient shadow)": { - "additional_compile_targets": [ - "all" - ] - }, "mac11-arm64-rel-tests": { "gtest_tests": [ {
diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py index b87166ee..cc4d3bb 100755 --- a/testing/buildbot/generate_buildbot_json.py +++ b/testing/buildbot/generate_buildbot_json.py
@@ -117,6 +117,9 @@ for test in isolated_scripts: if 'swarming' in test: test['swarming'] = {'can_use_on_swarming_builders': False} + if 'isolate_name' in test: + test['test'] = test['isolate_name'] + del test['isolate_name'] return isolated_scripts
diff --git a/testing/buildbot/generate_buildbot_json_unittest.py b/testing/buildbot/generate_buildbot_json_unittest.py index 2bc82e1..cd744ee 100755 --- a/testing/buildbot/generate_buildbot_json_unittest.py +++ b/testing/buildbot/generate_buildbot_json_unittest.py
@@ -1892,7 +1892,6 @@ "-v", "--extra-browser-args=--log-level=0 --js-flags=--expose-gc" ], - "isolate_name": "telemetry_gpu_integration_test", "merge": { "args": [], "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -1902,6 +1901,7 @@ "swarming": { "can_use_on_swarming_builders": false }, + "test": "telemetry_gpu_integration_test", "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test/" } ]
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index 8a22d1e6..ac5d34b 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl
@@ -4226,15 +4226,6 @@ 'GPU Linux Builder (dbg)': {}, 'GPU Mac Builder': {}, 'GPU Mac Builder (dbg)': {}, - 'GPU Mac Builder (reclient shadow)': { - 'additional_compile_targets': [ - 'angle_unittests', - 'browser_tests', - 'gl_tests', - 'gl_unittests', - 'telemetry_gpu_integration_test', - ], - }, 'Linux Debug (NVIDIA)': { 'browser_config': 'debug', 'os_type': 'linux', @@ -5251,11 +5242,6 @@ 'all', ], }, - 'mac-arm64-rel (reclient shadow)': { - 'additional_compile_targets': [ - 'all', - ], - }, 'mac11-arm64-rel-tests': { 'mixins': [ # Only run selected test suites on CQ. https://crbug.com/1234525.
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index 837ddf0..dbd1438 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -9646,6 +9646,21 @@ ] } ], + "SmartLockBluetoothScreenOffFix": [ + { + "platforms": [ + "chromeos" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "SmartLockBluetoothScreenOffFix" + ] + } + ] + } + ], "SmartLockUIRevamp": [ { "platforms": [ @@ -9803,23 +9818,6 @@ ] } ], - "SurfaceSyncThrottlingRelaunch": [ - { - "platforms": [ - "android", - "android_weblayer", - "android_webview" - ], - "experiments": [ - { - "name": "Enabled", - "enable_features": [ - "SurfaceSyncThrottling" - ] - } - ] - } - ], "SyncAndroidPromosRevamp": [ { "platforms": [
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc index 3bb49ed..edd9720 100644 --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -1642,5 +1642,11 @@ "WildcardSubdomainsInPermissionsPolicy", base::FEATURE_DISABLED_BY_DEFAULT); +const base::Feature kDocumentEventNodePathCaching{ + "DocumentEventNodePathCaching", base::FEATURE_DISABLED_BY_DEFAULT}; + +const base::FeatureParam<int> kDocumentMaxEventNodePathCachedEntries{ + &kDocumentEventNodePathCaching, "max-cache-entries", 100}; + } // namespace features } // namespace blink
diff --git a/third_party/blink/common/input/web_gesture_event.cc b/third_party/blink/common/input/web_gesture_event.cc index 7b13e59..f353e9b 100644 --- a/third_party/blink/common/input/web_gesture_event.cc +++ b/third_party/blink/common/input/web_gesture_event.cc
@@ -340,10 +340,9 @@ gfx::Transform combined_scroll_pinch = GetTransformForEvent(last_event); if (second_last_event) { - combined_scroll_pinch.PreconcatTransform( - GetTransformForEvent(*second_last_event)); + combined_scroll_pinch.PreConcat(GetTransformForEvent(*second_last_event)); } - combined_scroll_pinch.ConcatTransform(GetTransformForEvent(new_event)); + combined_scroll_pinch.PostConcat(GetTransformForEvent(new_event)); float combined_scale = SkScalarToFloat(combined_scroll_pinch.rc(0, 0)); float combined_scroll_pinch_x =
diff --git a/third_party/blink/perf_tests/events/EventsDispatchingDifferentEventsOnSameNode.html b/third_party/blink/perf_tests/events/EventsDispatchingDifferentEventsOnSameNode.html new file mode 100644 index 0000000..f35e730d --- /dev/null +++ b/third_party/blink/perf_tests/events/EventsDispatchingDifferentEventsOnSameNode.html
@@ -0,0 +1,34 @@ +<!DOCTYPE html> +<html> +<head> +<script type="text/javascript" src="../resources/runner.js"></script> +</head> +<body> +<script> + +// Repeatedly send different events to the same node. +let node = document.body; +let depth = 50; +while (depth) { + const child = document.createElement('div'); + node.appendChild(child); + node = child; + depth--; +} +const numEvents = 1000; +const customEvents = Array.from(Array(numEvents)).map((_, i) => { + return new Event(`foo-${i}`); +}); + + +function run() { + customEvents.forEach((event) => node.dispatchEvent(event)); +} + +PerfTestRunner.measureRunsPerSecond({ + description: "Measure events dispatching on same node", + run: run, +}); +</script> +</body> +</html>
diff --git a/third_party/blink/public/common/context_menu_data/untrustworthy_context_menu_params.h b/third_party/blink/public/common/context_menu_data/untrustworthy_context_menu_params.h index 10ea8f9..6f706a3 100644 --- a/third_party/blink/public/common/context_menu_data/untrustworthy_context_menu_params.h +++ b/third_party/blink/public/common/context_menu_data/untrustworthy_context_menu_params.h
@@ -126,7 +126,9 @@ // If this node is an input field, the type of that field. blink::mojom::ContextMenuDataInputFieldType input_field_type; - // Rect representing the coordinates in the document space of the selection. + // For the outermost main frame's widget, this will be the selection rect in + // viewport space. For a local root, this is in the coordinates of the local + // frame root. gfx::Rect selection_rect; // Start position of the selection text.
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h index aab07195..6848bdc 100644 --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h
@@ -873,6 +873,14 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE( kWildcardSubdomainsInPermissionsPolicy); +// If enabled, will cache for each node's EventPath::NodePath in document. +BLINK_COMMON_EXPORT extern const base::Feature kDocumentEventNodePathCaching; + +// Parameter for tuning max entries allowed in EventNodePathCache, which will be +// used to do LRU eviction in document. +BLINK_COMMON_EXPORT extern const base::FeatureParam<int> + kDocumentMaxEventNodePathCachedEntries; + } // namespace features } // namespace blink
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn index 95ef7677..8e91527 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn
@@ -772,13 +772,10 @@ } css_properties("make_core_generated_known_exposed_properties") { - script = "../build/scripts/core/css/properties/make_known_exposed_properties.py" - other_inputs = [ - "../build/scripts/core/css/properties/templates/known_exposed_properties.cc.tmpl", - ] - outputs = [ - "$blink_core_output_dir/known_exposed_properties.cc", - ] + script = + "../build/scripts/core/css/properties/make_known_exposed_properties.py" + other_inputs = [ "../build/scripts/core/css/properties/templates/known_exposed_properties.cc.tmpl" ] + outputs = [ "$blink_core_output_dir/known_exposed_properties.cc" ] } code_generator("make_core_generated_css_value_keywords") { @@ -946,6 +943,11 @@ output_dir = blink_core_output_dir } +make_names("make_core_generated_delivery_type_names") { + in_files = [ "timing/delivery_type_names.json5" ] + output_dir = blink_core_output_dir +} + make_names("make_core_generated_pointer_type_names") { in_files = [ "events/pointer_type_names.json5" ] output_dir = blink_core_output_dir @@ -1149,6 +1151,7 @@ ":make_core_generated_css_value_id_mappings", ":make_core_generated_css_value_keywords", ":make_core_generated_cssom_types", + ":make_core_generated_delivery_type_names", ":make_core_generated_event_factory", ":make_core_generated_event_names", ":make_core_generated_event_target_names",
diff --git a/third_party/blink/renderer/core/animation/view_timeline.cc b/third_party/blink/renderer/core/animation/view_timeline.cc index 7c1875f3..500dc84 100644 --- a/third_party/blink/renderer/core/animation/view_timeline.cc +++ b/third_party/blink/renderer/core/animation/view_timeline.cc
@@ -8,6 +8,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_view_timeline.h" #include "third_party/blink/renderer/bindings/core/v8/v8_view_timeline_options.h" #include "third_party/blink/renderer/core/dom/document.h" +#include "third_party/blink/renderer/core/dom/node_computed_style.h" #include "third_party/blink/renderer/core/layout/layout_box.h" #include "third_party/blink/renderer/platform/geometry/calculation_value.h" @@ -32,16 +33,50 @@ return point.y() - source_element->ClientTopNoLayout(); } -double ComputeInset(const Length& inset, double viewport_size) { - if (inset.IsFixed()) - return inset.Pixels(); - if (inset.IsPercent()) - return (viewport_size * (inset.Percent() / 100.0)); - if (inset.IsCalculated()) - return inset.GetCalculationValue().Evaluate(ClampTo<float>(viewport_size)); - // TODO(crbug.com/1344151): Support 'auto'. - DCHECK(inset.IsAuto()); - return 0; +bool IsBlockDirection(ScrollTimeline::ScrollDirection direction, + WritingMode writing_mode) { + using ScrollDirection = ScrollTimeline::ScrollDirection; + switch (direction) { + case ScrollDirection::kBlock: + return true; + case ScrollDirection::kInline: + return false; + case ScrollDirection::kHorizontal: + return !blink::IsHorizontalWritingMode(writing_mode); + case ScrollDirection::kVertical: + return blink::IsHorizontalWritingMode(writing_mode); + } +} + +// ResolveAuto replaces any value 'auto' with the value of the corresponding +// scroll-padding-* property. Note that 'auto' is a valid value for +// scroll-padding-*, and therefore 'auto' (the "pointer" to the scroll-padding +// value) may resolve to 'auto' (the actual value of the scroll-padding +// property). +// +// https://drafts.csswg.org/scroll-animations-1/#valdef-view-timeline-inset-auto +ViewTimeline::Inset ResolveAuto(const ViewTimeline::Inset& inset, + Element& source, + ScrollTimeline::ScrollDirection direction) { + const ComputedStyle* style = source.GetComputedStyle(); + if (!style) + return inset; + + const Length& start = inset.start_side; + const Length& end = inset.end_side; + + if (IsBlockDirection(direction, style->GetWritingMode())) { + return ViewTimeline::Inset( + start.IsAuto() ? style->ScrollPaddingBlockStart() : start, + end.IsAuto() ? style->ScrollPaddingBlockEnd() : end); + } + return ViewTimeline::Inset( + start.IsAuto() ? style->ScrollPaddingInlineStart() : start, + end.IsAuto() ? style->ScrollPaddingInlineEnd() : end); +} + +LayoutUnit ComputeInset(const Length& inset, LayoutUnit viewport_size) { + return MinimumValueForLength(inset, viewport_size); } } // end namespace @@ -112,24 +147,29 @@ LayoutBox* source_layout = source->GetLayoutBox(); DCHECK(source_layout); + LayoutUnit viewport_size; + target_offset_ = ComputeOffset(layout_box, source_layout, physical_orientation); if (physical_orientation == kHorizontalScroll) { target_size_ = layout_box->Size().Width().ToDouble(); - viewport_size_ = scrollable_area->LayoutContentRect().Width(); + viewport_size = scrollable_area->LayoutContentRect().Width(); } else { target_size_ = layout_box->Size().Height().ToDouble(); - viewport_size_ = scrollable_area->LayoutContentRect().Height(); + viewport_size = scrollable_area->LayoutContentRect().Height(); } + viewport_size_ = viewport_size.ToDouble(); + + Inset inset = ResolveAuto(inset_, *source, GetOrientation()); // Note that the end_side_inset is used to adjust the start offset, // and the start_side_inset is used to adjust the end offset. // This is because "start side" refers to logical start side [1] of the // source box, where as "start offset" refers to the start of the timeline, // and similarly for end side/offset. // [1] https://drafts.csswg.org/css-writing-modes-4/#css-start - end_side_inset_ = ComputeInset(inset_.end_side, viewport_size_); - start_side_inset_ = ComputeInset(inset_.start_side, viewport_size_); + end_side_inset_ = ComputeInset(inset.end_side, viewport_size); + start_side_inset_ = ComputeInset(inset.start_side, viewport_size); // TODO(crbug.com/1329159): If any of the sizes change we need to invalidate // timing normalization.
diff --git a/third_party/blink/renderer/core/animation/view_timeline.h b/third_party/blink/renderer/core/animation/view_timeline.h index 4361f65..30b8b31 100644 --- a/third_party/blink/renderer/core/animation/view_timeline.h +++ b/third_party/blink/renderer/core/animation/view_timeline.h
@@ -40,8 +40,8 @@ // Note these represent the logical start/end sides of the source scroller, // not the start/end of the timeline. // https://drafts.csswg.org/css-writing-modes-4/#css-start - Length start_side; - Length end_side; + Length start_side = Length::Fixed(); + Length end_side = Length::Fixed(); }; static ViewTimeline* Create(Document&, ViewTimelineOptions*, ExceptionState&);
diff --git a/third_party/blink/renderer/core/core_initializer.cc b/third_party/blink/renderer/core/core_initializer.cc index 0909787..55c6500 100644 --- a/third_party/blink/renderer/core/core_initializer.cc +++ b/third_party/blink/renderer/core/core_initializer.cc
@@ -40,6 +40,7 @@ #include "third_party/blink/renderer/core/css/media_query_evaluator.h" #include "third_party/blink/renderer/core/css/parser/css_parser_token_range.h" #include "third_party/blink/renderer/core/css/style_change_reason.h" +#include "third_party/blink/renderer/core/delivery_type_names.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/event_interface_names.h" #include "third_party/blink/renderer/core/event_target_names.h" @@ -107,14 +108,14 @@ xmlns_names::kAttrsCount; const unsigned kCoreStaticStringsCount = - kQualifiedNamesCount + event_interface_names::kNamesCount + - event_target_names::kNamesCount + event_type_names::kNamesCount + - fetch_initiator_type_names::kNamesCount + font_family_names::kNamesCount + - html_tokenizer_names::kNamesCount + http_names::kNamesCount + - input_type_names::kNamesCount + keywords::kNamesCount + - media_feature_names::kNamesCount + media_type_names::kNamesCount + - performance_entry_names::kNamesCount + pointer_type_names::kNamesCount + - shadow_element_names::kNamesCount; + kQualifiedNamesCount + delivery_type_names::kNamesCount + + event_interface_names::kNamesCount + event_target_names::kNamesCount + + event_type_names::kNamesCount + fetch_initiator_type_names::kNamesCount + + font_family_names::kNamesCount + html_tokenizer_names::kNamesCount + + http_names::kNamesCount + input_type_names::kNamesCount + + keywords::kNamesCount + media_feature_names::kNamesCount + + media_type_names::kNamesCount + performance_entry_names::kNamesCount + + pointer_type_names::kNamesCount + shadow_element_names::kNamesCount; StringImpl::ReserveStaticStringsCapacityForSize( kCoreStaticStringsCount + StringImpl::AllStaticStrings().size()); @@ -129,6 +130,7 @@ xml_names::Init(); xmlns_names::Init(); + delivery_type_names::Init(); event_interface_names::Init(); event_target_names::Init(); event_type_names::Init();
diff --git a/third_party/blink/renderer/core/css/parser/css_property_parser.cc b/third_party/blink/renderer/core/css/parser/css_property_parser.cc index 38ca4704..936e6e340 100644 --- a/third_party/blink/renderer/core/css/parser/css_property_parser.cc +++ b/third_party/blink/renderer/core/css/parser/css_property_parser.cc
@@ -185,6 +185,57 @@ : property.IsWebExposed(execution_context); } +// Take the given string, lowercase it (with possible caveats; +// see comments on the LChar version), convert it to ASCII and store it into +// the buffer together with a zero terminator. The string and zero terminator +// is assumed to fit. +// +// Returns false if the string is outside the allowed range of ASCII, so that +// it could never match any CSS properties or values. +static inline bool QuasiLowercaseIntoBuffer(const UChar* src, + unsigned length, + char* dst) { + for (unsigned i = 0; i < length; ++i) { + UChar c = src[i]; + if (c == 0 || c >= 0x7F) // illegal character + return false; + dst[i] = ToASCIILower(c); + } + dst[length] = '\0'; + return true; +} + +// Fast-path version for LChar strings. This uses the fact that all +// CSS properties and values are restricted to [a-zA-Z0-9-]. Crucially, +// this means we can do whatever we want to the six characters @[\]^_, +// because they cannot match any known values anyway. We use this to +// get a faster lowercasing than ToASCIILower() (which uses a table) +// can give us; we take anything in the range [0x40, 0x7f] and just +// set the 0x20 bit. This converts A-Z to a-z and messes up @[\]^_ +// (so that they become `{|}~<DEL>, respectively). Things outside this +// range, such as 0-9 and -, are unchanged. +// +// This version never returns false, since the [0x80, 0xff] range +// won't match anything anyway (it is really only needed for UChar, +// since otherwise we could have e.g. U+0161 be downcasted to 0x61). +static inline bool QuasiLowercaseIntoBuffer(const LChar* src, + unsigned length, + char* dst) { + unsigned i; + for (i = 0; i < (length & ~3); i += 4) { + uint32_t x; + memcpy(&x, src + i, sizeof(x)); + x |= (x & 0x40404040) >> 1; + memcpy(dst + i, &x, sizeof(x)); + } + for (; i < length; ++i) { + LChar c = src[i]; + dst[i] = c | ((c & 0x40) >> 1); + } + dst[length] = '\0'; + return true; +} + template <typename CharacterType> static CSSPropertyID UnresolvedCSSPropertyID( const ExecutionContext* execution_context, @@ -199,19 +250,22 @@ return CSSPropertyID::kInvalid; char buffer[kMaxCSSPropertyNameLength + 1]; // 1 for null character - - for (unsigned i = 0; i != length; ++i) { - CharacterType c = property_name[i]; - if (c == 0 || c >= 0x7F) - return CSSPropertyID::kInvalid; // illegal character - buffer[i] = ToASCIILower(c); + if (!QuasiLowercaseIntoBuffer(property_name, length, buffer)) { + return CSSPropertyID::kInvalid; } - buffer[length] = '\0'; const char* name = buffer; const Property* hash_table_entry = FindProperty(name, length); - if (!hash_table_entry) +#if DCHECK_IS_ON() + // Verify that we get the same answer with standard lowercasing. + for (unsigned i = 0; i < length; ++i) { + buffer[i] = ToASCIILower(property_name[i]); + } + DCHECK_EQ(hash_table_entry, FindProperty(buffer, length)); +#endif + if (!hash_table_entry) { return CSSPropertyID::kInvalid; + } CSSPropertyID property_id = static_cast<CSSPropertyID>(hash_table_entry->id); if (kKnownExposedProperties.Has(property_id)) { @@ -253,16 +307,18 @@ static CSSValueID CssValueKeywordID(const CharacterType* value_keyword, unsigned length) { char buffer[maxCSSValueKeywordLength + 1]; // 1 for null character - - for (unsigned i = 0; i != length; ++i) { - CharacterType c = value_keyword[i]; - if (c == 0 || c >= 0x7F) - return CSSValueID::kInvalid; // illegal character - buffer[i] = WTF::ToASCIILower(c); + if (!QuasiLowercaseIntoBuffer(value_keyword, length, buffer)) { + return CSSValueID::kInvalid; } - buffer[length] = '\0'; const Value* hash_table_entry = FindValue(buffer, length); +#if DCHECK_IS_ON() + // Verify that we get the same answer with standard lowercasing. + for (unsigned i = 0; i < length; ++i) { + buffer[i] = ToASCIILower(value_keyword[i]); + } + DCHECK_EQ(hash_table_entry, FindValue(buffer, length)); +#endif return hash_table_entry ? static_cast<CSSValueID>(hash_table_entry->id) : CSSValueID::kInvalid; }
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc index 63f6fd9..3d836e5 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc
@@ -8422,6 +8422,8 @@ visitor->Trace(anchor_element_interaction_tracker_); visitor->Trace(focused_element_change_observers_); visitor->Trace(pending_link_header_preloads_); + visitor->Trace(event_node_path_cache_); + visitor->Trace(event_node_path_cache_key_list_); Supplementable<Document>::Trace(visitor); TreeScope::Trace(visitor); ContainerNode::Trace(visitor); @@ -8808,6 +8810,62 @@ cookie_jar_->CheckPartitionedCookiesOriginTrial(response); } +static wtf_size_t MaxEventNodePathCachedEntriesValue() { + // The cache stores N entries/nodes that are receiving events simultaneously + // in a document. The size of this cache will be O(kN) where k is the average + // tree depth of the stored nodes. + static const wtf_size_t kMaxEventNodePathCachedEntriesValue = + features::kDocumentMaxEventNodePathCachedEntries.Get(); + return kMaxEventNodePathCachedEntriesValue; +} + +static bool EventNodePathCachingEnabled() { + // Cache the feature value since checking for each event path regresses + // performance. + static const bool kEnabled = + base::FeatureList::IsEnabled(features::kDocumentEventNodePathCaching); + return kEnabled; +} + +const EventPath::NodePath& Document::GetOrCalculateEventNodePath(Node& node) { + DCHECK(EventNodePathCachingEnabled()); + if (event_node_path_dom_tree_version_ != dom_tree_version_) { + if (!event_node_path_cache_.empty()) { + event_node_path_cache_.clear(); + event_node_path_cache_key_list_.clear(); + } else { + DCHECK(event_node_path_cache_key_list_.empty()); + } + event_node_path_dom_tree_version_ = dom_tree_version_; + } + + Member<EventPath::NodePath> event_node_path; + { + // Keep `result` within own scope to avoid dangling references into cache, + // because it might get modified during pruning. + auto result = event_node_path_cache_.insert(&node, nullptr); + if (result.is_new_entry) { + EventPath::NodePath node_path = EventPath::CalculateNodePath(node); + result.stored_value->value = + MakeGarbageCollected<EventPath::NodePath>(std::move(node_path)); + } + event_node_path = result.stored_value->value; + } + event_node_path_cache_key_list_.PrependOrMoveToFirst(&node); + + // Prune oldest cached node if size is bigger than max. + wtf_size_t max_entries = MaxEventNodePathCachedEntriesValue(); + if (event_node_path_cache_key_list_.size() > max_entries) { + DCHECK_EQ(event_node_path_cache_key_list_.size(), max_entries + 1); + event_node_path_cache_.erase(event_node_path_cache_key_list_.back()); + event_node_path_cache_key_list_.pop_back(); + } + + DCHECK_EQ(event_node_path_cache_.size(), + event_node_path_cache_key_list_.size()); + return *event_node_path; +} + template class CORE_TEMPLATE_EXPORT Supplement<Document>; } // namespace blink
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h index 5304cf6..645e3bb 100644 --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h
@@ -62,6 +62,7 @@ #include "third_party/blink/renderer/core/dom/document_lifecycle.h" #include "third_party/blink/renderer/core/dom/document_timing.h" #include "third_party/blink/renderer/core/dom/element.h" +#include "third_party/blink/renderer/core/dom/events/event_path.h" #include "third_party/blink/renderer/core/dom/live_node_list_registry.h" #include "third_party/blink/renderer/core/dom/qualified_name.h" #include "third_party/blink/renderer/core/dom/synchronous_mutation_observer.h" @@ -97,7 +98,7 @@ namespace gfx { class QuadF; class RectF; -} +} // namespace gfx namespace mojo { template <typename Interface> @@ -620,8 +621,8 @@ DocumentState* GetDocumentState() const; void SetStateForNewControls(const Vector<String>&); - LocalFrameView* View() const; // can be null - LocalFrame* GetFrame() const; // can be null + LocalFrameView* View() const; // can be null + LocalFrame* GetFrame() const; // can be null Page* GetPage() const; // can be null Settings* GetSettings() const; // can be null @@ -1466,6 +1467,8 @@ // https://html.spec.whatwg.org/multipage/iframe-embed-object.html#the-embed-element void DelayLoadEventUntilLayoutTreeUpdate(); + const EventPath::NodePath& GetOrCalculateEventNodePath(Node& node); + const DocumentTiming& GetTiming() const { return document_timing_; } bool ShouldMarkFontPerformance() const { @@ -2453,6 +2456,16 @@ // successful and not successful) by the page. std::unique_ptr<FontMatchingMetrics> font_matching_metrics_; + // For a given node, cache the vector of nodes that defines its EventPath so + // all events dispatched on this node won't get recalculated. This cache uses + // a LRU strategy and gets cleared when the DOM tree version changes. + uint64_t event_node_path_dom_tree_version_; + using EventNodePathCache = + HeapHashMap<Member<Node>, Member<EventPath::NodePath>>; + using EventNodePathCacheKeyList = HeapLinkedHashSet<Member<Node>>; + EventNodePathCache event_node_path_cache_; + EventNodePathCacheKeyList event_node_path_cache_key_list_; + #if DCHECK_IS_ON() unsigned slot_assignment_recalc_forbidden_recursion_depth_ = 0; #endif
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc index 7501c7f..08a2d26 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2052,7 +2052,7 @@ return rects; } -gfx::Rect Element::VisibleBoundsInVisualViewport() const { +gfx::Rect Element::VisibleBoundsInLocalRoot() const { if (!GetLayoutObject() || !GetDocument().GetPage() || !GetDocument().GetFrame()) return gfx::Rect(); @@ -2066,17 +2066,14 @@ rect.Intersect(frame_clip_rect); // MapToVisualRectInAncestorSpace, called with a null ancestor argument, - // returns the viewport-visible rect in the root frame's coordinate space. + // returns the root-frame-visible rect in the root frame's coordinate space. + // TODO(bokan): When the root is remote this appears to be document space, + // rather than frame. // MapToVisualRectInAncestorSpace applies ancestors' frame's clipping but does // not apply (overflow) element clipping. GetDocument().View()->GetLayoutView()->MapToVisualRectInAncestorSpace(nullptr, rect); - // TODO(layout-dev): Callers of this method don't expect the offset of the - // local frame root from a remote top-level frame to be applied here. They - // expect the result to be in the coordinate system of the local root frame. - // Either the method should be renamed to something which communicates that, - // or callers should be updated to expect actual top-level frame coordinates. rect = GetDocument() .GetFrame() ->LocalFrameRoot() @@ -2084,20 +2081,7 @@ ->AbsoluteToLocalRect(rect, kTraverseDocumentBoundaries | kApplyRemoteMainFrameTransform); - gfx::Rect visible_rect = ToPixelSnappedRect(rect); - // If the rect is in the coordinates of the main frame, then it should - // also be clipped to the viewport to account for page scale. For OOPIFs, - // local frame root -> viewport coordinate conversion is done in the - // browser process. - if (GetDocument().GetFrame()->LocalFrameRoot().IsMainFrame()) { - gfx::Size viewport_size = - GetDocument().GetPage()->GetVisualViewport().Size(); - visible_rect = - GetDocument().GetPage()->GetVisualViewport().RootFrameToViewport( - visible_rect); - visible_rect.Intersect(gfx::Rect(gfx::Point(), viewport_size)); - } - return visible_rect; + return ToPixelSnappedRect(rect); } void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
diff --git a/third_party/blink/renderer/core/dom/element.h b/third_party/blink/renderer/core/dom/element.h index aab6f16d..9b348b0 100644 --- a/third_party/blink/renderer/core/dom/element.h +++ b/third_party/blink/renderer/core/dom/element.h
@@ -408,11 +408,12 @@ Vector<gfx::Rect> OutlineRectsInWidget( DocumentUpdateReason reason = DocumentUpdateReason::kUnknown) const; - // Returns an intersection rectangle of the bounds rectangle and the visual - // viewport's rectangle in the visual viewport's coordinate space. - // Applies ancestors' frames' clipping, but does not (yet) apply (overflow) - // element clipping (crbug.com/889840). - gfx::Rect VisibleBoundsInVisualViewport() const; + // Returns the bounds of this element relative to the local root frame's + // origin. While the rect is relative to the local root, it is intersected + // with all ancestor frame clips, including the visual viewport transform and + // clip in the main frame. While this applies ancestor frame clipping, it + // does not (yet) apply (overflow) element clipping (crbug.com/889840). + gfx::Rect VisibleBoundsInLocalRoot() const; DOMRectList* getClientRects(); // Returns a rectangle in zoomed pixel units.
diff --git a/third_party/blink/renderer/core/dom/events/event_path.cc b/third_party/blink/renderer/core/dom/events/event_path.cc index 70ad7cb..7f3b39f 100644 --- a/third_party/blink/renderer/core/dom/events/event_path.cc +++ b/third_party/blink/renderer/core/dom/events/event_path.cc
@@ -26,6 +26,7 @@ #include "third_party/blink/renderer/core/dom/events/event_path.h" +#include "third_party/blink/public/common/features.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/events/window_event_context.h" #include "third_party/blink/renderer/core/dom/shadow_root.h" @@ -84,10 +85,74 @@ CalculateTreeOrderAndSetNearestAncestorClosedTree(); } +EventPath::NodePath EventPath::CalculateNodePath(Node& node) { + // Given a node, find all the nodes the event path might traverse. + NodePath node_path; + Node* current = &node; + + node_path.push_back(current); + while (current) { + if (current->IsChildOfShadowHost() && !current->IsPseudoElement()) { + if (HTMLSlotElement* slot = current->AssignedSlot()) { + current = slot; + node_path.push_back(current); + continue; + } + } + if (auto* shadow_root = DynamicTo<ShadowRoot>(current)) { + current = current->OwnerShadowHost(); + node_path.push_back(current); + } else { + current = current->parentNode(); + if (current) + node_path.push_back(current); + } + } + return node_path; +} + +static bool EventNodePathCachingEnabled() { + // Cache the feature value since checking for each event path regresses + // performance. + static const bool kEnabled = + base::FeatureList::IsEnabled(features::kDocumentEventNodePathCaching); + return kEnabled; +} + void EventPath::CalculatePath() { DCHECK(node_); DCHECK(node_event_contexts_.empty()); + if (EventNodePathCachingEnabled()) + CalculatePathCachingEnabled(); + else + CalculatePathCachingDisabled(); +} + +void EventPath::CalculatePathCachingEnabled() { + // Find the cached CalculateNodePath result + const NodePath& node_path = + node_->GetDocument().GetOrCalculateEventNodePath(*node_); + // We need to do the KeepEventInNode and ShouldStopAtShadowRoot checks + // outside of CalculateNodePath as they depend on the dispatched event. + for (Node* node_in_path : node_path) { + DCHECK(node_in_path); + node_event_contexts_.push_back(NodeEventContext( + *node_in_path, EventTargetRespectingTargetRules(*node_in_path))); + if (!event_) + continue; + if (node_in_path->KeepEventInNode(*event_)) + break; + if (auto* shadow_root = DynamicTo<ShadowRoot>(node_in_path)) { + if (ShouldStopAtShadowRoot(*event_, *shadow_root, *node_)) + break; + } + } +} + +// TODO(crbug.com/329788): This function should be removed once the +// kDocumentEventNodePathCaching experiment is fully enabled. +void EventPath::CalculatePathCachingDisabled() { // For performance and memory usage reasons we want to store the // path using as few bytes as possible and with as few allocations // as possible which is why we gather the data on the stack before
diff --git a/third_party/blink/renderer/core/dom/events/event_path.h b/third_party/blink/renderer/core/dom/events/event_path.h index 105c349..274a8a6 100644 --- a/third_party/blink/renderer/core/dom/events/event_path.h +++ b/third_party/blink/renderer/core/dom/events/event_path.h
@@ -46,6 +46,8 @@ class CORE_EXPORT EventPath final : public GarbageCollected<EventPath> { public: + using NodePath = HeapVector<Member<Node>, 64>; + explicit EventPath(Node&, Event* = nullptr); EventPath(const EventPath&) = delete; EventPath& operator=(const EventPath&) = delete; @@ -84,6 +86,7 @@ NodeEventContext& TopNodeEventContext(); static EventTarget& EventTargetRespectingTargetRules(Node&); + static NodePath CalculateNodePath(Node&); void Trace(Visitor*) const; void Clear() { @@ -96,6 +99,8 @@ void Initialize(); void CalculatePath(); + void CalculatePathCachingEnabled(); + void CalculatePathCachingDisabled(); void CalculateAdjustedTargets(); void CalculateTreeOrderAndSetNearestAncestorClosedTree();
diff --git a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc index 8def289..8608c66 100644 --- a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc +++ b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc
@@ -868,15 +868,8 @@ LocalFrameView* view = popup_client_->OwnerElement().GetDocument().View(); DCHECK(view); - LocalFrameView* root_view = view->GetFrame().LocalFrameRoot().View(); - DCHECK(root_view); - - // TODO(bokan): VisibleBoundsInVisualViewport will soon be turned into - // VisibleBoundsInLocalRoot. return view->GetFrame().GetChromeClient().LocalRootToScreenDIPs( - root_view->ViewportToFrame( - popup_client_->OwnerElement().VisibleBoundsInVisualViewport()), - view); + popup_client_->OwnerElement().VisibleBoundsInLocalRoot(), view); } WebInputEventResult WebPagePopupImpl::DispatchBufferedTouchEvents() {
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc index 43428b1..2eb40d0 100644 --- a/third_party/blink/renderer/core/frame/local_frame_view.cc +++ b/third_party/blink/renderer/core/frame/local_frame_view.cc
@@ -336,6 +336,7 @@ visitor->Trace(lifecycle_observers_); visitor->Trace(fullscreen_video_elements_); visitor->Trace(pending_transform_updates_); + visitor->Trace(pending_opacity_updates_); } void LocalFrameView::ForAllChildViewsAndPlugins( @@ -5013,17 +5014,52 @@ return true; } -void LocalFrameView::UpdateAllPendingTransforms() { +bool LocalFrameView::UpdateAllPendingTransforms() { DCHECK(GetFrame().IsLocalRoot() || !IsAttached()); - ForAllNonThrottledLocalFrameViews([](LocalFrameView& frame_view) { + bool updated = false; + ForAllNonThrottledLocalFrameViews([&updated](LocalFrameView& frame_view) { if (frame_view.pending_transform_updates_) { for (const LayoutObject* object : *frame_view.pending_transform_updates_) { PaintPropertyTreeBuilder::DirectlyUpdateTransformMatrix(*object); + updated = true; } frame_view.pending_transform_updates_->clear(); } }); + return updated; } +void LocalFrameView::AddPendingOpacityUpdate(LayoutObject& object) { + if (!pending_opacity_updates_) { + pending_opacity_updates_ = + MakeGarbageCollected<HeapHashSet<Member<LayoutObject>>>(); + } + pending_opacity_updates_->insert(&object); +} + +bool LocalFrameView::RemovePendingOpacityUpdate(const LayoutObject& object) { + if (!pending_opacity_updates_) + return false; + auto it = pending_opacity_updates_->find(const_cast<LayoutObject*>(&object)); + if (it == pending_opacity_updates_->end()) + return false; + pending_opacity_updates_->erase(it); + return true; +} + +bool LocalFrameView::UpdateAllPendingOpacityUpdates() { + DCHECK(GetFrame().IsLocalRoot() || !IsAttached()); + bool updated = false; + ForAllNonThrottledLocalFrameViews([&updated](LocalFrameView& frame_view) { + if (frame_view.pending_opacity_updates_) { + for (const LayoutObject* object : *frame_view.pending_opacity_updates_) { + PaintPropertyTreeBuilder::DirectlyUpdateOpacityValue(*object); + updated = true; + } + frame_view.pending_opacity_updates_->clear(); + } + }); + return updated; +} } // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.h b/third_party/blink/renderer/core/frame/local_frame_view.h index 13997852..deef7ca 100644 --- a/third_party/blink/renderer/core/frame/local_frame_view.h +++ b/third_party/blink/renderer/core/frame/local_frame_view.h
@@ -769,7 +769,11 @@ void AddPendingTransformUpdate(LayoutObject& object); bool RemovePendingTransformUpdate(const LayoutObject& object); - void UpdateAllPendingTransforms(); + bool UpdateAllPendingTransforms(); + + void AddPendingOpacityUpdate(LayoutObject& object); + bool RemovePendingOpacityUpdate(const LayoutObject& object); + bool UpdateAllPendingOpacityUpdates(); protected: void FrameRectsChanged(const gfx::Rect&) override; @@ -1176,7 +1180,9 @@ // possible, avoids needing to walk the tree to update them. See: // https://chromium.googlesource.com/chromium/src/+/main/third_party/blink/renderer/core/paint/README.md#Transform-update-optimization // for more on the fast path + // TODO(yotha): unify these into one HeapHashMap. Member<HeapHashSet<Member<LayoutObject>>> pending_transform_updates_; + Member<HeapHashSet<Member<LayoutObject>>> pending_opacity_updates_; #if DCHECK_IS_ON() bool is_updating_descendant_dependent_flags_;
diff --git a/third_party/blink/renderer/core/frame/visual_viewport_test.cc b/third_party/blink/renderer/core/frame/visual_viewport_test.cc index 471491e..4b0a077 100644 --- a/third_party/blink/renderer/core/frame/visual_viewport_test.cc +++ b/third_party/blink/renderer/core/frame/visual_viewport_test.cc
@@ -1704,21 +1704,6 @@ EXPECT_EQ(expected_bounds.size(), bounds_in_viewport.size()); } -TEST_P(VisualViewportTest, ElementVisibleBoundsInVisualViewport) { - InitializeWithAndroidSettings(); - WebView()->MainFrameViewWidget()->Resize(gfx::Size(640, 1080)); - RegisterMockedHttpURLLoad("viewport-select.html"); - NavigateTo(base_url_ + "viewport-select.html"); - - ASSERT_EQ(2.0f, WebView()->PageScaleFactor()); - To<LocalFrame>(WebView()->GetPage()->MainFrame())->SetInitialFocus(false); - Element* element = WebView()->FocusedElement(); - EXPECT_FALSE(element->VisibleBoundsInVisualViewport().IsEmpty()); - - WebView()->SetPageScaleFactor(4.0); - EXPECT_TRUE(element->VisibleBoundsInVisualViewport().IsEmpty()); -} - // Test that the various window.scroll and document.body.scroll properties and // methods don't change with the visual viewport. TEST_P(VisualViewportTest, visualViewportIsInert) {
diff --git a/third_party/blink/renderer/core/html/forms/html_select_element_test.cc b/third_party/blink/renderer/core/html/forms/html_select_element_test.cc index 942605b..28bbbf0 100644 --- a/third_party/blink/renderer/core/html/forms/html_select_element_test.cc +++ b/third_party/blink/renderer/core/html/forms/html_select_element_test.cc
@@ -174,13 +174,13 @@ EXPECT_EQ(nullptr, To<HTMLSelectElement>(element)->OptionToBeShown()); } -TEST_F(HTMLSelectElementTest, VisibleBoundsInVisualViewport) { +TEST_F(HTMLSelectElementTest, VisibleBoundsInLocalRoot) { SetHtmlInnerHTML( "<select style='position:fixed; top:12.3px; height:24px; " "-webkit-appearance:none;'><option>o1</select>"); auto* select = To<HTMLSelectElement>(GetDocument().body()->firstChild()); ASSERT_NE(select, nullptr); - gfx::Rect bounds = select->VisibleBoundsInVisualViewport(); + gfx::Rect bounds = select->VisibleBoundsInLocalRoot(); EXPECT_EQ(24, bounds.height()); }
diff --git a/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc b/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc index 82daf66..8cb3785f 100644 --- a/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc +++ b/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
@@ -20,6 +20,7 @@ #include "third_party/blink/renderer/core/exported/web_view_impl.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h" +#include "third_party/blink/renderer/core/frame/web_frame_widget_impl.h" #include "third_party/blink/renderer/core/html/forms/chooser_resource_loader.h" #include "third_party/blink/renderer/core/html/forms/html_opt_group_element.h" #include "third_party/blink/renderer/core/html/forms/html_option_element.h" @@ -278,13 +279,9 @@ // element's items (see AddElementStyle). This requires a style-clean tree. // See Element::EnsureComputedStyle for further explanation. DCHECK(!owner_element.GetDocument().NeedsLayoutTreeUpdate()); - LocalFrameView* view = owner_element.GetDocument().View(); - LocalFrameView* root_view = view->GetFrame().LocalFrameRoot().View(); - // TODO(bokan): VisibleBoundsInVisualViewport will soon be - // VisibleBoundsInLocalRoot. gfx::Rect anchor_rect_in_screen = chrome_client_->LocalRootToScreenDIPs( - root_view->ViewportToFrame(owner_element.VisibleBoundsInVisualViewport()), - view); + owner_element.VisibleBoundsInLocalRoot(), + owner_element.GetDocument().View()); float scale_factor = chrome_client_->WindowToViewportScalar( owner_element.GetDocument().GetFrame(), 1.f); @@ -683,14 +680,9 @@ } context.FinishGroupIfNecessary(); PagePopupClient::AddString("],\n", data.get()); - LocalFrameView* view = OwnerElement().GetDocument().View(); - LocalFrameView* root_view = view->GetFrame().LocalFrameRoot().View(); - // TODO(bokan): VisibleBoundsInVisualViewport will soon be - // VisibleBoundsInLocalRoot. gfx::Rect anchor_rect_in_screen = chrome_client_->LocalRootToScreenDIPs( - root_view->ViewportToFrame( - OwnerElement().VisibleBoundsInVisualViewport()), - view); + owner_element_->VisibleBoundsInLocalRoot(), + OwnerElement().GetDocument().View()); AddProperty("anchorRectInScreen", anchor_rect_in_screen, data.get()); PagePopupClient::AddString("}\n", data.get()); popup_->PostMessageToPopup(String::FromUTF8(data->Data(), data->size()));
diff --git a/third_party/blink/renderer/core/html/forms/select_type.cc b/third_party/blink/renderer/core/html/forms/select_type.cc index 9e41741..838879e 100644 --- a/third_party/blink/renderer/core/html/forms/select_type.cc +++ b/third_party/blink/renderer/core/html/forms/select_type.cc
@@ -44,6 +44,7 @@ #include "third_party/blink/renderer/core/events/mouse_event.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/frame/local_frame.h" +#include "third_party/blink/renderer/core/frame/visual_viewport.h" #include "third_party/blink/renderer/core/html/forms/html_form_element.h" #include "third_party/blink/renderer/core/html/forms/html_select_element.h" #include "third_party/blink/renderer/core/html/forms/menu_list_inner_element.h" @@ -321,7 +322,23 @@ return; if (!select_->GetLayoutObject()) return; - if (select_->VisibleBoundsInVisualViewport().IsEmpty()) + + gfx::Rect local_root_rect = select_->VisibleBoundsInLocalRoot(); + + if (!document.GetFrame()->LocalFrameRoot().IsOutermostMainFrame()) { + // TODO(bokan): If we're in a remote frame, we cannot access the active + // visual viewport. VisibleBoundsInLocalRoot will clip to the outermost + // main frame but if the user is pinch-zoomed this won't be accurate. + if (local_root_rect.IsEmpty()) + return; + } + + gfx::Rect visual_viewport_rect = + document.GetPage()->GetVisualViewport().RootFrameToViewport( + local_root_rect); + visual_viewport_rect.Intersect( + gfx::Rect(document.GetPage()->GetVisualViewport().Size())); + if (visual_viewport_rect.IsEmpty()) return; if (!popup_) {
diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_party/blink/renderer/core/input/event_handler.cc index 70dae17..e0b10ba 100644 --- a/third_party/blink/renderer/core/input/event_handler.cc +++ b/third_party/blink/renderer/core/input/event_handler.cc
@@ -2164,7 +2164,7 @@ } // Intersect the selection rect and the visible bounds of focused_element. if (focused_element) { - gfx::Rect clipped_rect = view->ViewportToFrame( + gfx::Rect clipped_rect = view->ConvertFromRootFrame( GetFocusedElementRectForNonLocatedContextMenu(focused_element)); left = std::max(clipped_rect.x(), left); top = std::max(clipped_rect.y(), top); @@ -2184,8 +2184,7 @@ } else if (focused_element) { gfx::Rect clipped_rect = GetFocusedElementRectForNonLocatedContextMenu(focused_element); - location_in_root_frame = - visual_viewport.ViewportToRootFrame(clipped_rect.CenterPoint()); + location_in_root_frame = clipped_rect.CenterPoint(); } else { // TODO(crbug.com/1274078): Should this use ScrollPosition()? location_in_root_frame = @@ -2233,7 +2232,20 @@ gfx::Rect EventHandler::GetFocusedElementRectForNonLocatedContextMenu( Element* focused_element) { - gfx::Rect clipped_rect = focused_element->VisibleBoundsInVisualViewport(); + gfx::Rect visible_rect = focused_element->VisibleBoundsInLocalRoot(); + + VisualViewport& visual_viewport = frame_->GetPage()->GetVisualViewport(); + + // TODO(bokan): This method may not work as expected when the local root + // isn't the main frame since the result won't be transformed and clipped by + // the visual viewport (which is accessible only from the outermost main + // frame). + if (frame_->LocalFrameRoot().IsOutermostMainFrame()) { + visible_rect = visual_viewport.RootFrameToViewport(visible_rect); + visible_rect.Intersect(gfx::Rect(visual_viewport.Size())); + } + + gfx::Rect clipped_rect = visible_rect; // The bounding rect of multiline elements may include points that are // not within the element. Intersect the clipped rect with the first // outline rect to ensure that the selection rect only includes visible @@ -2241,7 +2253,8 @@ Vector<gfx::Rect> outline_rects = focused_element->OutlineRectsInWidget(); if (outline_rects.size() > 1) clipped_rect.Intersect(outline_rects[0]); - return clipped_rect; + + return visual_viewport.ViewportToRootFrame(clipped_rect); } void EventHandler::ScheduleHoverStateUpdate() {
diff --git a/third_party/blink/renderer/core/input/event_handler.h b/third_party/blink/renderer/core/input/event_handler.h index 02897953..47eaec7c 100644 --- a/third_party/blink/renderer/core/input/event_handler.h +++ b/third_party/blink/renderer/core/input/event_handler.h
@@ -368,6 +368,7 @@ const HitTestRequest& request, const WebMouseEvent& mev); + // Returned rect is in local root frame coordinates. gfx::Rect GetFocusedElementRectForNonLocatedContextMenu( Element* focused_element);
diff --git a/third_party/blink/renderer/core/layout/layout_block.cc b/third_party/blink/renderer/core/layout/layout_block.cc index 23c5f03..5947cdd 100644 --- a/third_party/blink/renderer/core/layout/layout_block.cc +++ b/third_party/blink/renderer/core/layout/layout_block.cc
@@ -216,6 +216,17 @@ old_style.PaddingBottom() != new_style.PaddingBottom(); } +// Compute a local version of the "font size scale factor" used by SVG +// <text>. Squared to avoid computing the square root. See +// SVGLayoutSupport::CalculateScreenFontSizeScalingFactor(). +static double ComputeSquaredLocalFontSizeScalingFactor( + const TransformationMatrix* transform) { + if (!transform) + return 1; + const auto affine = transform->ToAffineTransform(); + return affine.XScaleSquared() + affine.YScaleSquared(); +} + void LayoutBlock::StyleDidChange(StyleDifference diff, const ComputedStyle* old_style) { NOT_DESTROYED(); @@ -223,10 +234,8 @@ // updates Layer()->Transform(). double old_squared_scale = 1; if (Layer() && diff.TransformChanged() && has_svg_text_descendants_) { - if (TransformationMatrix* old_transform = Layer()->Transform()) { - const auto transform = old_transform->ToAffineTransform(); - old_squared_scale = transform.XScaleSquared() + transform.YScaleSquared(); - } + old_squared_scale = + ComputeSquaredLocalFontSizeScalingFactor(Layer()->Transform()); } LayoutBox::StyleDidChange(diff, old_style); @@ -278,14 +287,10 @@ kLogicalHeight); if (diff.TransformChanged() && has_svg_text_descendants_) { - const TransformationMatrix* new_transform = - Layer() ? Layer()->Transform() : nullptr; - const auto new_affine_transform = - new_transform ? new_transform->ToAffineTransform() : AffineTransform(); - // Compare XScaleSquared()+YScaleSquared(). - // See SVGLayoutSupport::CalculateScreenFontSizeScalingFactor(). - if (old_squared_scale != new_affine_transform.XScaleSquared() + - new_affine_transform.YScaleSquared()) { + const double new_squared_scale = ComputeSquaredLocalFontSizeScalingFactor( + Layer() ? Layer()->Transform() : nullptr); + // Compare local scale before and after. + if (old_squared_scale != new_squared_scale) { for (LayoutBox* box : *View()->SvgTextDescendantsMap().at(this)) To<LayoutNGSVGText>(box)->SetNeedsTextMetricsUpdate(); }
diff --git a/third_party/blink/renderer/core/layout/layout_object.cc b/third_party/blink/renderer/core/layout/layout_object.cc index ace9bf4e..6229400 100644 --- a/third_party/blink/renderer/core/layout/layout_object.cc +++ b/third_party/blink/renderer/core/layout/layout_object.cc
@@ -3670,6 +3670,7 @@ if (GetFrameView()) { GetFrameView()->RemovePendingTransformUpdate(*this); + GetFrameView()->RemovePendingOpacityUpdate(*this); SetIsBackgroundAttachmentFixedObject(false); } }
diff --git a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.cc b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.cc index bd8ef77..fa8a29a 100644 --- a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.cc +++ b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.cc
@@ -252,7 +252,7 @@ return ComputedGridTrackList(track_direction).named_grid_lines; } -const ComputedGridTrackList& NGGridLineResolver::ComputedGridTrackList( +const blink::ComputedGridTrackList& NGGridLineResolver::ComputedGridTrackList( GridTrackSizingDirection track_direction) const { // TODO(kschmi): Refactor so this isn't necessary when // `is_subgrid_line_resolver_`.
diff --git a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.h b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.h index 5e2fcb9f..ac8a4f47 100644 --- a/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.h +++ b/third_party/blink/renderer/core/layout/ng/grid/ng_grid_line_resolver.h
@@ -59,7 +59,7 @@ const NamedGridLinesMap& ExplicitNamedLinesMap( GridTrackSizingDirection track_direction) const; - const ComputedGridTrackList& ComputedGridTrackList( + const blink::ComputedGridTrackList& ComputedGridTrackList( GridTrackSizingDirection track_direction) const; GridSpan ResolveGridPositionAgainstOppositePosition(
diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc index 20d3f4a..5501389 100644 --- a/third_party/blink/renderer/core/page/context_menu_controller.cc +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc
@@ -65,6 +65,7 @@ #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/frame/picture_in_picture_controller.h" #include "third_party/blink/renderer/core/frame/settings.h" +#include "third_party/blink/renderer/core/frame/visual_viewport.h" #include "third_party/blink/renderer/core/frame/web_frame_widget_impl.h" #include "third_party/blink/renderer/core/frame/web_local_frame_impl.h" #include "third_party/blink/renderer/core/html/forms/html_form_element.h" @@ -392,29 +393,35 @@ gfx::Rect anchor; gfx::Rect focus; selected_frame->Selection().ComputeAbsoluteBounds(anchor, focus); - anchor = selected_frame->View()->FrameToViewport(anchor); - focus = selected_frame->View()->FrameToViewport(focus); - int left = std::min(focus.x(), anchor.x()); - int top = std::min(focus.y(), anchor.y()); - int right = std::max(focus.x() + focus.width(), anchor.x() + anchor.width()); - int bottom = - std::max(focus.y() + focus.height(), anchor.y() + anchor.height()); + anchor = selected_frame->View()->ConvertToRootFrame(anchor); + focus = selected_frame->View()->ConvertToRootFrame(focus); + + gfx::Rect combined_rect = anchor; + combined_rect.UnionEvenIfEmpty(focus); + // Intersect the selection rect and the visible bounds of the focused_element // to ensure the selection rect is visible. Document* doc = selected_frame->GetDocument(); if (doc) { - Element* focused_element = doc->FocusedElement(); - if (focused_element) { - gfx::Rect visible_bound = - focused_element->VisibleBoundsInVisualViewport(); - left = std::max(visible_bound.x(), left); - top = std::max(visible_bound.y(), top); - right = std::min(visible_bound.right(), right); - bottom = std::min(visible_bound.bottom(), bottom); - } + if (Element* focused_element = doc->FocusedElement()) + combined_rect.Intersect(focused_element->VisibleBoundsInLocalRoot()); } - return gfx::Rect(left, top, right - left, bottom - top); + // TODO(bokan): This method may not work as expected when the local root + // isn't the main frame since the result won't be transformed and clipped by + // the visual viewport (which is accessible only from the outermost main + // frame). + if (selected_frame->LocalFrameRoot().IsOutermostMainFrame()) { + VisualViewport& visual_viewport = + selected_frame->GetPage()->GetVisualViewport(); + + gfx::Rect rect_in_visual_viewport = + visual_viewport.RootFrameToViewport(combined_rect); + rect_in_visual_viewport.Intersect(gfx::Rect(visual_viewport.Size())); + return rect_in_visual_viewport; + } + + return combined_rect; } bool ContextMenuController::ShouldShowContextMenuFromTouch(
diff --git a/third_party/blink/renderer/core/page/context_menu_controller_test.cc b/third_party/blink/renderer/core/page/context_menu_controller_test.cc index 4f6d769..d9098dc 100644 --- a/third_party/blink/renderer/core/page/context_menu_controller_test.cc +++ b/third_party/blink/renderer/core/page/context_menu_controller_test.cc
@@ -868,7 +868,9 @@ int top = std::min(focus.y(), anchor.y()); int right = std::max(focus.right(), anchor.right()); int bottom = std::max(focus.bottom(), anchor.bottom()); - gfx::Rect selection_rect(left, top, right - left, bottom - top); + gfx::Rect selection_rect = + document->GetFrame()->LocalFrameRoot().View()->FrameToViewport( + gfx::Rect(left, top, right - left, bottom - top)); EXPECT_EQ(context_menu_data.selection_rect, selection_rect); // Select all the content of |textarea|. @@ -879,16 +881,18 @@ EXPECT_EQ(context_menu_data.selected_text, "Sample editable text"); // The selection rect is clipped by the editable box. - gfx::Rect clip_bound = editable_element->VisibleBoundsInVisualViewport(); + gfx::Rect clip_bound = editable_element->VisibleBoundsInLocalRoot(); selection.ComputeAbsoluteBounds(anchor, focus); - anchor = document->GetFrame()->View()->FrameToViewport(anchor); - focus = document->GetFrame()->View()->FrameToViewport(focus); + anchor = document->GetFrame()->View()->ConvertToRootFrame(anchor); + focus = document->GetFrame()->View()->ConvertToRootFrame(focus); left = std::max(clip_bound.x(), std::min(focus.x(), anchor.x())); top = std::max(clip_bound.y(), std::min(focus.y(), anchor.y())); right = std::min(clip_bound.right(), std::max(focus.right(), anchor.right())); bottom = std::min(clip_bound.bottom(), std::max(focus.bottom(), anchor.bottom())); - selection_rect = gfx::Rect(left, top, right - left, bottom - top); + selection_rect = + document->GetFrame()->LocalFrameRoot().View()->FrameToViewport( + gfx::Rect(left, top, right - left, bottom - top)); EXPECT_EQ(context_menu_data.selection_rect, selection_rect); }
diff --git a/third_party/blink/renderer/core/page/spatial_navigation_test.cc b/third_party/blink/renderer/core/page/spatial_navigation_test.cc index 5f01ffd..287cdab 100644 --- a/third_party/blink/renderer/core/page/spatial_navigation_test.cc +++ b/third_party/blink/renderer/core/page/spatial_navigation_test.cc
@@ -200,12 +200,11 @@ Node* enclosing_container = ScrollableAreaOrDocumentOf(content); // TODO(crbug.com/889840): - // VisibleBoundsInVisualViewport does not (yet) take div-clipping into + // VisibleBoundsInLocalRoot does not (yet) take div-clipping into // account. The node is off screen, but nevertheless VBIVV returns a non- - // empty rect. If you fix VisibleBoundsInVisualViewport, change to + // empty rect. If you fix VisibleBoundsInLocalRoot, change to // EXPECT_TRUE here and stop using LayoutObject in IsOffscreen(). - EXPECT_FALSE( - content->VisibleBoundsInVisualViewport().IsEmpty()); // EXPECT_TRUE. + EXPECT_FALSE(content->VisibleBoundsInLocalRoot().IsEmpty()); // EXPECT_TRUE. EXPECT_TRUE(IsOffscreen(content)); EXPECT_FALSE(IsOffscreen(container)); @@ -369,11 +368,11 @@ const PhysicalRect container_box = NodeRectInRootFrame(container); // TODO(crbug.com/889840): - // VisibleBoundsInVisualViewport does not (yet) take div-clipping into + // VisibleBoundsInLocalRoot does not (yet) take div-clipping into // account. The node is off screen, but nevertheless VBIVV returns a non- - // empty rect. If you fix VisibleBoundsInVisualViewport, change to + // empty rect. If you fix VisibleBoundsInLocalRoot, change to // EXPECT_TRUE here and stop using LayoutObject in IsOffscreen(). - EXPECT_FALSE(b->VisibleBoundsInVisualViewport().IsEmpty()); // EXPECT_TRUE. + EXPECT_FALSE(b->VisibleBoundsInLocalRoot().IsEmpty()); // EXPECT_TRUE. EXPECT_TRUE(IsOffscreen(b)); // Go down. @@ -567,12 +566,11 @@ EXPECT_FALSE(IsOffscreen(div)); // TODO(crbug.com/889840): - // VisibleBoundsInVisualViewport does not (yet) take div-clipping into + // VisibleBoundsInLocalRoot does not (yet) take div-clipping into // account. The node is off screen, but nevertheless VBIVV returns a non- - // empty rect. If you fix VisibleBoundsInVisualViewport, change to + // empty rect. If you fix VisibleBoundsInLocalRoot, change to // EXPECT_TRUE here and stop using LayoutObject in IsOffscreen(). - EXPECT_FALSE( - iframe->VisibleBoundsInVisualViewport().IsEmpty()); // EXPECT_TRUE. + EXPECT_FALSE(iframe->VisibleBoundsInLocalRoot().IsEmpty()); // EXPECT_TRUE. // The <iframe> is not displayed in the visual viewport because it is clipped // by the div. In other words, it is being offscreen. And so is also its
diff --git a/third_party/blink/renderer/core/page/validation_message_client_impl.cc b/third_party/blink/renderer/core/page/validation_message_client_impl.cc index 992b715..3bec369 100644 --- a/third_party/blink/renderer/core/page/validation_message_client_impl.cc +++ b/third_party/blink/renderer/core/page/validation_message_client_impl.cc
@@ -190,12 +190,13 @@ return; } - gfx::Rect new_anchor_rect_in_viewport = - current_anchor_->VisibleBoundsInVisualViewport(); - if (new_anchor_rect_in_viewport.IsEmpty()) { - // In a remote frame, VisibleBoundsInVisualViewport() returns an empty - // rectangle for a while after initial load or scrolling. So we don't - // hide the validation bubble until we see a non-empty rectable. + gfx::Rect new_anchor_rect_in_local_root = + current_anchor_->VisibleBoundsInLocalRoot(); + if (new_anchor_rect_in_local_root.IsEmpty()) { + // In a remote frame, VisibleBoundsInLocalRoot() may return an empty + // rectangle while waiting for updated ancestor rects from the browser + // (e.g. during initial load or scrolling). So we don't hide the validation + // bubble until we see a non-empty rectangle. if (!allow_initial_empty_anchor_) { HideValidationMessage(*current_anchor_); return;
diff --git a/third_party/blink/renderer/core/page/validation_message_overlay_delegate.cc b/third_party/blink/renderer/core/page/validation_message_overlay_delegate.cc index 65bd3ec..23dc28b 100644 --- a/third_party/blink/renderer/core/page/validation_message_overlay_delegate.cc +++ b/third_party/blink/renderer/core/page/validation_message_overlay_delegate.cc
@@ -195,7 +195,7 @@ // Get the size to decide position later. // TODO(schenney): This says get size, so we only need to update to layout. FrameView().UpdateAllLifecyclePhases(DocumentUpdateReason::kOverlay); - bubble_size_ = container.VisibleBoundsInVisualViewport().size(); + bubble_size_ = container.VisibleBoundsInLocalRoot().size(); // Add one because the content sometimes exceeds the exact width due to // rounding errors. bubble_size_.Enlarge(1, 0); @@ -256,7 +256,26 @@ if (IsHiding()) return; float zoom_factor = To<LocalFrame>(page_->MainFrame())->PageZoomFactor(); - gfx::Rect anchor_rect = anchor_->VisibleBoundsInVisualViewport(); + gfx::Rect anchor_rect = anchor_->VisibleBoundsInLocalRoot(); + + Page* anchor_page = anchor_->GetDocument().GetPage(); + // If the main frame is local the overlay is attached to it so we have to + // account for the anchor's position relative to the visual viewport. If the + // main frame is remote the overlay will be attached to the local root so the + // visual viewport transform will already be applied to the overlay. + if (auto* overlay_frame = DynamicTo<LocalFrame>(anchor_page->MainFrame())) { + PhysicalRect rect(anchor_rect); + anchor_->GetDocument() + .GetFrame() + ->LocalFrameRoot() + .ContentLayoutObject() + ->MapToVisualRectInAncestorSpace(nullptr, rect); + anchor_rect = ToPixelSnappedRect(rect); + anchor_rect = + anchor_page->GetVisualViewport().RootFrameToViewport(anchor_rect); + anchor_rect.Intersect(gfx::Rect(anchor_page->GetVisualViewport().Size())); + } + bool show_bottom_arrow = false; double bubble_y = anchor_rect.bottom(); if (view_rect.bottom() - anchor_rect.bottom() < bubble_size_.height()) {
diff --git a/third_party/blink/renderer/core/paint/README.md b/third_party/blink/renderer/core/paint/README.md index c13720a..af393b2 100644 --- a/third_party/blink/renderer/core/paint/README.md +++ b/third_party/blink/renderer/core/paint/README.md
@@ -462,9 +462,9 @@ from its containing self-painting layer to this layer, assuming that this layer needs all paint phases that its container self-painting layer needs. -### Transform update optimization +### Property tree update optimization -In specific cases of a transform update, we can directly update the property +In some specific cases of style updates, we can directly update the property tree without needing to run the property tree builder (Which requires a layout tree walk). During `PaintLayer::StyleDidChange` we check if this update meets the requirements for a quick update, and if so we add it to a list of pending @@ -472,9 +472,13 @@ changes can't be detected correctly). The updates are executed later in `PrePaintTreeWalk::WalkTree` using the -`LocalFrameView::UpdateAllPendingTransforms`. If at some point during pre-paint -we reach a node that has a pending update, we mark that node as needs full -update, and remove the pending update from the list. +the designated functions (For example - +`LocalFrameView::UpdateAllPendingTransforms`). If at some point during +pre-paint we reach a node that has a pending update, we mark that node as needs +full update, and remove the pending update from the list. + +Current updates that are checked for an optimized update are transform updates +and opacity updates. ### Hit test information recording
diff --git a/third_party/blink/renderer/core/paint/clip_path_clipper.cc b/third_party/blink/renderer/core/paint/clip_path_clipper.cc index 37b8108..924054e 100644 --- a/third_party/blink/renderer/core/paint/clip_path_clipper.cc +++ b/third_party/blink/renderer/core/paint/clip_path_clipper.cc
@@ -112,6 +112,11 @@ absl::optional<gfx::RectF> bounding_box = ClipPathClipper::LocalClipPathBoundingBox(clip_path_owner); DCHECK(bounding_box); + + // Pixel snap bounding rect to allow for the proper painting of partially + // opaque pixels + *bounding_box = gfx::RectF(gfx::ToEnclosingRect(*bounding_box)); + // The mask image should be the same size as the bounding rect, but will have // an origin of 0,0 as it has its own coordinate space. gfx::RectF src_rect = gfx::RectF(bounding_box.value().size());
diff --git a/third_party/blink/renderer/core/paint/compositing/compositing_test.cc b/third_party/blink/renderer/core/paint/compositing/compositing_test.cc index 56b5a04..c6e446e2 100644 --- a/third_party/blink/renderer/core/paint/compositing/compositing_test.cc +++ b/third_party/blink/renderer/core/paint/compositing/compositing_test.cc
@@ -981,6 +981,75 @@ EXPECT_FALSE(transform_node->transform_changed); } +// Same as the test above but for opacity changes +TEST_P(CompositingSimTest, FastPathOpacityUpdateFromStyle) { + InitializeWithHTML(R"HTML( + <!DOCTYPE html> + <style> + @keyframes animation { + 0% { opacity: 0.2; } + 100% { opacity: 0.8; } + } + #div { + opacity: 0.1; + width: 100px; + height: 100px; + /* + This causes the opacity to have an active animation, but because + the delay is so large, it will not have an effect for the duration + of this unit test. + */ + animation-name: animation; + animation-duration: 999s; + animation-delay: 999s; + } + </style> + <div id='div'></div> + )HTML"); + + Compositor().BeginFrame(); + + // Check the initial state of the blink effect node. + auto* div = GetElementById("div"); + auto* div_properties = + div->GetLayoutObject()->FirstFragment().PaintProperties(); + ASSERT_TRUE(div_properties); + EXPECT_NEAR(0.1, div_properties->Effect()->Opacity(), 0.001); + EXPECT_TRUE(div_properties->Effect()->HasActiveOpacityAnimation()); + EXPECT_FALSE(div->GetLayoutObject()->NeedsPaintPropertyUpdate()); + + // Check the initial state of the cc effect node. + auto* div_cc_layer = CcLayerByDOMElementId("div"); + auto effect_tree_index = div_cc_layer->effect_tree_index(); + const auto* effect_node = + GetPropertyTrees()->effect_tree().Node(effect_tree_index); + EXPECT_FALSE(effect_node->effect_changed); + EXPECT_FALSE(paint_artifact_compositor()->NeedsUpdate()); + EXPECT_NEAR(0.1, effect_node->opacity, 0.001); + + // Change the effect style and ensure the blink and cc effect nodes are + // not marked for a full update. + div->setAttribute(html_names::kStyleAttr, "opacity: 0.15"); + GetDocument().View()->UpdateLifecycleToLayoutClean( + DocumentUpdateReason::kTest); + EXPECT_FALSE(div->GetLayoutObject()->NeedsPaintPropertyUpdate()); + EXPECT_FALSE(paint_artifact_compositor()->NeedsUpdate()); + + // Continue to run the lifecycle to paint and ensure that updates are + // performed. + UpdateAllLifecyclePhasesExceptPaint(); + EXPECT_NEAR(0.15, div_properties->Effect()->Opacity(), 0.001); + EXPECT_NEAR(0.15, effect_node->opacity, 0.001); + EXPECT_TRUE(effect_node->effect_changed); + EXPECT_FALSE(div->GetLayoutObject()->NeedsPaintPropertyUpdate()); + EXPECT_FALSE(paint_artifact_compositor()->NeedsUpdate()); + EXPECT_TRUE(effect_node->effect_changed); + + // After a frame the |opacity_changed| value should be reset. + Compositor().BeginFrame(); + EXPECT_FALSE(effect_node->effect_changed); +} + TEST_P(CompositingSimTest, DirectSVGTransformPropertyUpdate) { InitializeWithHTML(R"HTML( <!doctype html>
diff --git a/third_party/blink/renderer/core/paint/object_paint_properties.h b/third_party/blink/renderer/core/paint/object_paint_properties.h index d417496..2a7d380 100644 --- a/third_party/blink/renderer/core/paint/object_paint_properties.h +++ b/third_party/blink/renderer/core/paint/object_paint_properties.h
@@ -321,6 +321,12 @@ std::move(transform_and_origin), animation_state); } + PaintPropertyChangeType DirectlyUpdateOpacity( + float opacity, + const EffectPaintPropertyNode::AnimationState& animation_state) { + return effect_->DirectlyUpdateOpacity(opacity, animation_state); + } + private: // Return true if the property tree structure changes (an existing node was // deleted), and false otherwise. See the class-level comment ("update & clear
diff --git a/third_party/blink/renderer/core/paint/paint_layer.cc b/third_party/blink/renderer/core/paint/paint_layer.cc index 98c1f9e..9f30bbb 100644 --- a/third_party/blink/renderer/core/paint/paint_layer.cc +++ b/third_party/blink/renderer/core/paint/paint_layer.cc
@@ -2456,9 +2456,18 @@ } } + bool needs_full_opacity_update = diff.OpacityChanged(); + if (needs_full_opacity_update) { + if (PaintPropertyTreeBuilder::ScheduleDeferredOpacityNodeUpdate( + GetLayoutObject())) { + needs_full_opacity_update = false; + SetNeedsDescendantDependentFlagsUpdate(); + } + } + // See also |LayoutObject::SetStyle| which handles these invalidations if a // PaintLayer is not present. - if (needs_full_transform_update || diff.OpacityChanged() || + if (needs_full_transform_update || needs_full_opacity_update || diff.ZIndexChanged() || diff.FilterChanged() || diff.CssClipChanged() || diff.BlendModeChanged() || diff.MaskChanged() || diff.CompositingReasonsChanged()) {
diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc b/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc index 5971312..6dc557e 100644 --- a/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc +++ b/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc
@@ -851,6 +851,24 @@ } } +static void DirectlyUpdateCcOpacity(const LayoutObject& object, + ObjectPaintProperties& properties, + PaintPropertyChangeType& change_type) { + if (change_type == PaintPropertyChangeType::kChangedOnlySimpleValues && + properties.Effect()->HasDirectCompositingReasons()) { + if (auto* paint_artifact_compositor = + object.GetFrameView()->GetPaintArtifactCompositor()) { + bool updated = + paint_artifact_compositor->DirectlyUpdateCompositedOpacityValue( + *properties.Effect()); + if (updated) { + change_type = PaintPropertyChangeType::kChangedOnlyCompositedValues; + properties.Effect()->CompositorSimpleValuesUpdated(); + } + } + } +} + // TODO(dbaron): Remove this function when we can remove the // BackfaceVisibilityInteropEnabled() check, and have the caller use // CompositingReason::kDirectReasonsForTransformProperty directly. @@ -1446,6 +1464,9 @@ void FragmentPaintPropertyTreeBuilder::UpdateEffect() { DCHECK(properties_); + // Since we're doing a full update, clear list of objects waiting for a + // deferred update + object_.GetFrameView()->RemovePendingOpacityUpdate(object_); const ComputedStyle& style = object_.StyleRef(); if (NeedsPaintPropertyUpdate()) { @@ -1557,25 +1578,7 @@ // If we have simple value change, which means opacity, we should try to // directly update it on the PaintArtifactCompositor in order to avoid // doing a full rebuild. - if (effective_change_type == - PaintPropertyChangeType::kChangedOnlySimpleValues && - properties_->Effect()->HasDirectCompositingReasons() && - // TODO(crbug.com/1253797): Due to the bug, we may create multiple - // cc effect nodes for one blink effect node of a fragmented object, - // and direct update would be incomplete in the case. - !object_.FirstFragment().NextFragment()) { - if (auto* paint_artifact_compositor = - object_.GetFrameView()->GetPaintArtifactCompositor()) { - bool updated = - paint_artifact_compositor->DirectlyUpdateCompositedOpacityValue( - *properties_->Effect()); - if (updated) { - effective_change_type = - PaintPropertyChangeType::kChangedOnlyCompositedValues; - properties_->Effect()->CompositorSimpleValuesUpdated(); - } - } - } + DirectlyUpdateCcOpacity(object_, *properties_, effective_change_type); OnUpdateEffect(effective_change_type); auto mask_direct_compositing_reasons = @@ -2927,7 +2930,8 @@ // |translation_2d_to_layout_shift_root_delta|) is updated properly. // See: ../paint/README.md#Transform-update-optimization for more on // optimized transform updates - if (object_.GetFrameView()->RemovePendingTransformUpdate(object_)) + if (object_.GetFrameView()->RemovePendingTransformUpdate(object_) || + object_.GetFrameView()->RemovePendingOpacityUpdate(object_)) object_.GetMutableForPainting().SetOnlyThisNeedsPaintPropertyUpdate(); if (box.Size() == box.PreviousSize()) @@ -4194,6 +4198,17 @@ return false; } +bool PaintPropertyTreeBuilder::ScheduleDeferredOpacityNodeUpdate( + LayoutObject& object) { + if (!base::FeatureList::IsEnabled(features::kFastPathPaintPropertyUpdates)) + return false; + if (CanDoDeferredOpacityNodeUpdate(object)) { + object.GetFrameView()->AddPendingOpacityUpdate(object); + return true; + } + return false; +} + // Fast-path for directly updating transforms. Returns true if successful. This // is similar to |FragmentPaintPropertyTreeBuilder::UpdateIndividualTransform|. void PaintPropertyTreeBuilder::DirectlyUpdateTransformMatrix( @@ -4252,6 +4267,34 @@ } } +void PaintPropertyTreeBuilder::DirectlyUpdateOpacityValue( + const LayoutObject& object) { + DCHECK(CanDoDeferredOpacityNodeUpdate(object)); + const ComputedStyle& style = object.StyleRef(); + + EffectPaintPropertyNode::AnimationState animation_state; + animation_state.is_running_opacity_animation_on_compositor = + style.IsRunningOpacityAnimationOnCompositor(); + animation_state.is_running_backdrop_filter_animation_on_compositor = + style.IsRunningBackdropFilterAnimationOnCompositor(); + + FragmentData* fragment_data = &object.GetMutableForPainting().FirstFragment(); + auto* properties = fragment_data->PaintProperties(); + auto effective_change_type = + properties->DirectlyUpdateOpacity(style.Opacity(), animation_state); + // If we have simple value change, which means opacity, we should try to + // directly update it on the PaintArtifactCompositor in order to avoid + // needing to run the property tree builder at all. + DirectlyUpdateCcOpacity(object, *properties, effective_change_type); + + if (effective_change_type >= + PaintPropertyChangeType::kChangedOnlySimpleValues) { + object.GetFrameView()->SetPaintArtifactCompositorNeedsUpdate( + PaintArtifactCompositorUpdateReason:: + kPaintPropertyTreeBuilderPaintPropertyChanged); + } +} + void PaintPropertyTreeBuilder::IssueInvalidationsAfterUpdate() { // We need to update property tree states of paint chunks. auto max_change = properties_changed_.Max(); @@ -4359,4 +4402,33 @@ return true; } +bool PaintPropertyTreeBuilder::CanDoDeferredOpacityNodeUpdate( + const LayoutObject& object) { + // If we already need a full update, do not do the direct update. + if (object.NeedsPaintPropertyUpdate() || + object.DescendantNeedsPaintPropertyUpdate()) { + return false; + } + + // This fast path does not support iterating over each fragment, so do not + // run the fast path in the presence of fragmentation. + if (object.FirstFragment().NextFragment()) + return false; + + auto* properties = object.FirstFragment().PaintProperties(); + // Cannot directly update properties if they have not been created yet. + if (!properties || !properties->Effect()) + return false; + + // Descendant state depends on opacity being zero, so we can't do a direct + // update if it changes + bool old_opacity_is_zero = properties->Effect()->Opacity() == 0; + bool new_opacity_is_zero = object.Style()->Opacity() == 0; + if (old_opacity_is_zero != new_opacity_is_zero) { + return false; + } + + return true; +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_builder.h b/third_party/blink/renderer/core/paint/paint_property_tree_builder.h index 0bcd685..66f00d2 100644 --- a/third_party/blink/renderer/core/paint/paint_property_tree_builder.h +++ b/third_party/blink/renderer/core/paint/paint_property_tree_builder.h
@@ -371,8 +371,10 @@ } static void DirectlyUpdateTransformMatrix(const LayoutObject& object); + static void DirectlyUpdateOpacityValue(const LayoutObject& object); static bool ScheduleDeferredTransformNodeUpdate(LayoutObject& object); + static bool ScheduleDeferredOpacityNodeUpdate(LayoutObject& object); private: ALWAYS_INLINE void InitFragmentPaintProperties( @@ -410,6 +412,7 @@ bool IsInNGFragmentTraversal() const { return pre_paint_info_; } static bool CanDoDeferredTransformNodeUpdate(const LayoutObject& object); + static bool CanDoDeferredOpacityNodeUpdate(const LayoutObject& object); const LayoutObject& object_; NGPrePaintInfo* pre_paint_info_;
diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc index ba1d707..8f11d0fe 100644 --- a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc +++ b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
@@ -1973,4 +1973,25 @@ EXPECT_EQ(200, div_properties->Transform()->Translation2D().x()); } +TEST_P(PaintPropertyTreeUpdateTest, + DirectOpacityUpdateSkipsPropertyTreeBuilder) { + SetBodyInnerHTML(R"HTML( + <div id='div' style="opacity:0.5"></div> + )HTML"); + + auto* div_properties = PaintPropertiesForElement("div"); + ASSERT_TRUE(div_properties); + EXPECT_EQ(0.5, div_properties->Effect()->Opacity()); + auto* div = GetDocument().getElementById("div"); + EXPECT_FALSE(div->GetLayoutObject()->NeedsPaintPropertyUpdate()); + + div->setAttribute(html_names::kStyleAttr, "opacity:0.8"); + GetDocument().View()->UpdateLifecycleToLayoutClean( + DocumentUpdateReason::kTest); + EXPECT_FALSE(div->GetLayoutObject()->NeedsPaintPropertyUpdate()); + + UpdateAllLifecyclePhasesExceptPaint(); + EXPECT_NEAR(0.8, div_properties->Effect()->Opacity(), 0.001); +} + } // namespace blink
diff --git a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc index ce88af12..a30eac6 100644 --- a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc +++ b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc
@@ -78,6 +78,10 @@ ShowAllPropertyTrees(root_frame_view); #endif + if (root_frame_view.UpdateAllPendingTransforms() || + root_frame_view.UpdateAllPendingOpacityUpdates()) + needs_invalidate_chrome_client_ = true; + // If the page has anything changed, we need to inform the chrome client // so that the client will initiate repaint of the contents if needed (e.g. // when this page is embedded as a non-composited content of another page). @@ -85,7 +89,6 @@ if (auto* client = root_frame_view.GetChromeClient()) client->InvalidateContainer(); } - root_frame_view.UpdateAllPendingTransforms(); } void PrePaintTreeWalk::Walk(LocalFrameView& frame_view,
diff --git a/third_party/blink/renderer/core/timing/delivery_type_names.json5 b/third_party/blink/renderer/core/timing/delivery_type_names.json5 new file mode 100644 index 0000000..233fdef3 --- /dev/null +++ b/third_party/blink/renderer/core/timing/delivery_type_names.json5
@@ -0,0 +1,10 @@ +{ + metadata: { + namespace: "delivery_type_names", + export: "CORE_EXPORT", + }, + + data: [ + "cache", + ], +}
diff --git a/third_party/blink/renderer/core/timing/performance_resource_timing.cc b/third_party/blink/renderer/core/timing/performance_resource_timing.cc index 7d011b4b..b2502f7118 100644 --- a/third_party/blink/renderer/core/timing/performance_resource_timing.cc +++ b/third_party/blink/renderer/core/timing/performance_resource_timing.cc
@@ -34,6 +34,7 @@ #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/public/mojom/timing/performance_mark_or_measure.mojom-blink.h" #include "third_party/blink/renderer/bindings/core/v8/v8_object_builder.h" +#include "third_party/blink/renderer/core/delivery_type_names.h" #include "third_party/blink/renderer/core/performance_entry_names.h" #include "third_party/blink/renderer/core/timing/performance.h" #include "third_party/blink/renderer/core/timing/performance_entry.h" @@ -47,6 +48,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/scheduler/public/thread_scheduler.h" +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" namespace blink { @@ -71,6 +73,9 @@ initiator_type_(initiator_type.empty() ? fetch_initiator_type_names::kOther : initiator_type), + delivery_type_(info.cache_state == mojom::blink::CacheState::kNone + ? g_empty_string + : delivery_type_names::kCache), alpn_negotiated_protocol_( static_cast<String>(info.alpn_negotiated_protocol)), connection_info_(static_cast<String>(info.connection_info)), @@ -170,10 +175,12 @@ return initiator_type_; } -// TODO(crbug/1358591): Support "cache" and "navigational-prefetch". +// TODO(crbug/1358591): Support "navigational-prefetch". AtomicString PerformanceResourceTiming::deliveryType() const { DCHECK(RuntimeEnabledFeatures::DeliveryTypeEnabled()); - return g_empty_atom; + if (!AllowTimingDetails()) + return g_empty_atom; + return delivery_type_; } AtomicString PerformanceResourceTiming::renderBlockingStatus() const {
diff --git a/third_party/blink/renderer/core/timing/performance_resource_timing.h b/third_party/blink/renderer/core/timing/performance_resource_timing.h index f1d60e1..facafef3 100644 --- a/third_party/blink/renderer/core/timing/performance_resource_timing.h +++ b/third_party/blink/renderer/core/timing/performance_resource_timing.h
@@ -139,6 +139,7 @@ // Do not access private fields directly. Use getter methods. AtomicString initiator_type_; + AtomicString delivery_type_; AtomicString alpn_negotiated_protocol_; AtomicString connection_info_; RenderBlockingStatusType render_blocking_status_;
diff --git a/third_party/blink/renderer/modules/media_controls/resources/mediaControls.css b/third_party/blink/renderer/modules/media_controls/resources/mediaControls.css index ea813bf..4ab3bfb 100644 --- a/third_party/blink/renderer/modules/media_controls/resources/mediaControls.css +++ b/third_party/blink/renderer/modules/media_controls/resources/mediaControls.css
@@ -1035,6 +1035,11 @@ outline: none; } +audio::-internal-media-controls-overflow-menu-list-item:focus-visible, +video::-internal-media-controls-overflow-menu-list-item:focus-visible { + border: 1px solid currentColor; +} + audio::-internal-media-controls-overflow-menu-list-item:active, video::-internal-media-controls-overflow-menu-list-item:active { background-color: -internal-light-dark(#e0e0e0, #454545);
diff --git a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc index 28a479bf..b23bab2 100644 --- a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc +++ b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.cc
@@ -42,18 +42,8 @@ } bool opacity_changed = opacity != other.opacity; bool opacity_change_is_simple = - opacity_changed && - // Opacity change is simple if - // - opacity doesn't change from or to 1, or - // - there was and is active opacity animation, or - // TODO(crbug.com/1285498): Optimize for will-change: opacity. - // The rule is because whether opacity is 1 affects whether the effect - // should create a render surface if there is no active opacity animation. - ((opacity != 1.f && other.opacity != 1.f) || - ((direct_compositing_reasons & - CompositingReason::kActiveOpacityAnimation) && - (other.direct_compositing_reasons & - CompositingReason::kActiveOpacityAnimation))); + IsOpacityChangeSimple(opacity, other.opacity, direct_compositing_reasons, + other.direct_compositing_reasons); if (opacity_changed && !opacity_change_is_simple) { DCHECK(!animation_state.is_running_opacity_animation_on_compositor); return PaintPropertyChangeType::kChangedOnlyValues; @@ -94,6 +84,19 @@ return PaintPropertyChangeType::kUnchanged; } +bool EffectPaintPropertyNode::State::IsOpacityChangeSimple( + float opacity, + float new_opacity, + CompositingReasons direct_compositing_reasons, + CompositingReasons new_direct_compositing_reasons) { + bool opacity_changed = opacity != new_opacity; + return opacity_changed && ((opacity != 1.f && new_opacity != 1.f) || + ((direct_compositing_reasons & + CompositingReason::kActiveOpacityAnimation) && + (new_direct_compositing_reasons & + CompositingReason::kActiveOpacityAnimation))); +} + const EffectPaintPropertyNode& EffectPaintPropertyNode::Root() { DEFINE_STATIC_REF(EffectPaintPropertyNode, root, base::AdoptRef(new EffectPaintPropertyNode( @@ -149,6 +152,40 @@ } } +PaintPropertyChangeType EffectPaintPropertyNode::State::ComputeOpacityChange( + float new_opacity, + const AnimationState& animation_state) const { + bool opacity_changed = opacity != new_opacity; + bool opacity_change_is_simple = State::IsOpacityChangeSimple( + opacity, new_opacity, direct_compositing_reasons, + direct_compositing_reasons); + if (opacity_changed && !opacity_change_is_simple) { + DCHECK(!animation_state.is_running_opacity_animation_on_compositor); + return PaintPropertyChangeType::kChangedOnlyValues; + } + + bool simple_values_changed = + opacity_change_is_simple && + !animation_state.is_running_opacity_animation_on_compositor; + if (simple_values_changed) { + return PaintPropertyChangeType::kChangedOnlySimpleValues; + } + if (opacity_changed) { + return PaintPropertyChangeType::kChangedOnlyCompositedValues; + } + return PaintPropertyChangeType::kUnchanged; +} + +PaintPropertyChangeType EffectPaintPropertyNode::DirectlyUpdateOpacity( + float opacity, + const AnimationState& animation_state) { + auto change = state_.ComputeOpacityChange(opacity, animation_state); + state_.opacity = opacity; + if (change != PaintPropertyChangeType::kUnchanged) + AddChanged(change); + return change; +} + gfx::RectF EffectPaintPropertyNode::MapRect(const gfx::RectF& rect) const { if (state_.filter.IsEmpty()) return rect;
diff --git a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h index e40a762..e98e719 100644 --- a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h +++ b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
@@ -132,6 +132,22 @@ PaintPropertyChangeType ComputeChange( const State& other, const AnimationState& animation_state) const; + + PaintPropertyChangeType ComputeOpacityChange( + float opacity, + const AnimationState& animation_state) const; + + // Opacity change is simple if + // - opacity doesn't change from or to 1, or + // - there was and is active opacity animation, or + // TODO(crbug.com/1285498): Optimize for will-change: opacity. + // The rule is because whether opacity is 1 affects whether the effect + // should create a render surface if there is no active opacity animation. + static bool IsOpacityChangeSimple( + float opacity, + float new_opacity, + CompositingReasons direct_compositing_reasons, + CompositingReasons new_direct_compositing_reasons); }; // This node is really a sentinel, and does not represent a real effect. @@ -157,6 +173,10 @@ return std::max(parent_changed, state_changed); } + PaintPropertyChangeType DirectlyUpdateOpacity( + float opacity, + const AnimationState& animation_state); + const EffectPaintPropertyNode& Unalias() const = delete; bool IsParentAlias() const = delete;
diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.cc b/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.cc index af4f1cb..15ee112 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.cc +++ b/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.cc
@@ -166,7 +166,7 @@ void RTCVideoDecoderAdapter::InitializeOnMediaThread( const media::VideoDecoderConfig& config, - InitCB init_cb, + CrossThreadOnceFunction<void(bool)> init_cb, base::TimeTicks start_time, std::string* decoder_name) { DVLOG(3) << __func__; @@ -343,8 +343,9 @@ } } -void RTCVideoDecoderAdapter::FlushOnMediaThread(FlushDoneCB flush_success_cb, - FlushDoneCB flush_fail_cb) { +void RTCVideoDecoderAdapter::FlushOnMediaThread( + WTF::CrossThreadOnceClosure flush_success_cb, + WTF::CrossThreadOnceClosure flush_fail_cb) { DCHECK_CALLED_ON_VALID_SEQUENCE(media_sequence_checker_); // Remove any pending tasks. @@ -357,7 +358,8 @@ video_decoder_->Decode( media::DecoderBuffer::CreateEOSBuffer(), WTF::BindOnce( - [](FlushDoneCB flush_success, FlushDoneCB flush_fail, + [](WTF::CrossThreadOnceClosure flush_success, + WTF::CrossThreadOnceClosure flush_fail, media::DecoderStatus status) { if (status.is_ok()) std::move(flush_success).Run(); @@ -534,9 +536,6 @@ } decoder_info_.implementation_name = "ExternalDecoder (" + decoder_name + ")"; - - base::AutoLock auto_lock(lock_); - ChangeStatus(Status::kNeedKeyFrame); return result; } @@ -671,12 +670,12 @@ CrossThreadBindOnce(&FinishWait, CrossThreadUnretained(&waiter), CrossThreadUnretained(&result)); std::string decoder_name; - FlushDoneCB flush_success_cb = CrossThreadBindOnce( + WTF::CrossThreadOnceClosure flush_success_cb = CrossThreadBindOnce( &RTCVideoDecoderAdapter::InitializeOnMediaThread, weak_this_, config, std::move(init_cb), /*start_time=*/base::TimeTicks(), /*decoder_name=*/CrossThreadUnretained(&decoder_name)); - FlushDoneCB flush_fail_cb = + WTF::CrossThreadOnceClosure flush_fail_cb = CrossThreadBindOnce(&FinishWait, CrossThreadUnretained(&waiter), CrossThreadUnretained(&result), false); if (PostCrossThreadTask(
diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h b/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h index b43fd1e0..f41910c5 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h +++ b/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h
@@ -111,12 +111,6 @@ static bool Vp9HwSupportForSpatialLayers(); private: - using CreateVideoDecoderCB = - base::RepeatingCallback<std::unique_ptr<media::VideoDecoder>( - media::MediaLog*)>; - using InitCB = CrossThreadOnceFunction<void(bool)>; - using FlushDoneCB = CrossThreadOnceFunction<void()>; - enum class DecodeResult { kOk, kErrorRequestKeyFrame, @@ -133,7 +127,7 @@ bool InitializeSync(const media::VideoDecoderConfig& config); void InitializeOnMediaThread(const media::VideoDecoderConfig& config, - InitCB init_cb, + CrossThreadOnceFunction<void(bool)> init_cb, base::TimeTicks start_time, std::string* decoder_name); absl::optional<RTCVideoDecoderFallbackReason> @@ -154,8 +148,8 @@ bool ShouldReinitializeForSettingHDRColorSpace( const webrtc::EncodedImage& input_image) const; bool ReinitializeSync(const media::VideoDecoderConfig& config); - void FlushOnMediaThread(FlushDoneCB flush_success_cb, - FlushDoneCB flush_fail_cb); + void FlushOnMediaThread(WTF::CrossThreadOnceClosure flush_success_cb, + WTF::CrossThreadOnceClosure flush_fail_cb); void ChangeStatus(Status new_status) EXCLUSIVE_LOCKS_REQUIRED(lock_); // Construction parameters.
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 1efbd6fd..403eaeb 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -3218,6 +3218,106 @@ crbug.com/626703 [ Win ] virtual/prerender/external/wpt/speculation-rules/prerender/restriction-presentation-request.https.html [ Failure ] crbug.com/626703 [ Win ] virtual/prerender/external/wpt/speculation-rules/prerender/storage-foundation.https.html [ Failure ] crbug.com/626703 [ Win ] virtual/partitioned-cookies/http/tests/inspector-protocol/network/disabled-cache-navigation.js [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=normal&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=normal&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=normal&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=normal&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=nowrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=nowrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=nowrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=nowrap&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-line&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-line&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-line&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-line&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-wrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-wrap&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-wrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=backspace&left-white-space=pre-wrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=normal&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=normal&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=normal&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=normal&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=nowrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=nowrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=nowrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=nowrap&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-line&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-line&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-line&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-line&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=normal&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=normal&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=normal&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=normal&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=nowrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=nowrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=nowrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=nowrap&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-line&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-line&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-line&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-line&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-wrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-wrap&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-wrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-line-and-right-paragraph.html?method=select-boundary&left-white-space=pre-wrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=normal&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=normal&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=normal&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=normal&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=nowrap&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-line&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-line&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-line&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-line&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-wrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-wrap&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-wrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=backspace&left-white-space=pre-wrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=normal&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=normal&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=normal&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=normal&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=nowrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=nowrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=nowrap&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=nowrap&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre&right-white-space=pre-line [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-line&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-line&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-line&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-line&right-white-space=pre-wrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=normal [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=nowrap [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=pre [ Failure ] +crbug.com/626703 external/wpt/editing/other/join-different-white-space-style-left-paragraph-and-right-line.html?method=forwarddelete&left-white-space=pre-wrap&right-white-space=pre-line [ Failure ] # ====== New tests from wpt-importer added here ====== crbug.com/626703 [ Linux ] external/wpt/encoding/unsupported-labels.window.html [ Failure Timeout ] @@ -5980,9 +6080,6 @@ crbug.com/1233766 [ Mac ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-local-time-before-start.https.html [ Crash Failure Pass ] crbug.com/1233766 [ Mac ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-get-timing-on-worklet-thread.https.html [ Crash Failure Pass ] -# [CompositeClipPathAnimations] failing test -crbug.com/1249071 virtual/composite-clip-path-animation/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html [ Crash Failure Pass ] - # Following tests fail on mac11-arm64 or mac12-arm64 crbug.com/1249176 [ Mac11-arm64 ] css3/blending/svg-blend-exclusion.html [ Failure ] crbug.com/1249176 [ Mac12-arm64 ] css3/blending/svg-blend-exclusion.html [ Failure ]
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html b/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html index c5e3eb5..cbfa8ba 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-filter.html
@@ -2,7 +2,7 @@ <html class="reftest-wait"> <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation"> <link rel="match" href="clip-path-animation-filter-ref.html"> -<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-38"> +<meta name="fuzzy" content="maxDifference=0-10; totalPixels=0-150"> <style> .container { width: 100px;
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html b/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html index deba300..12d984b 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/clip-path/animations/clip-path-animation-fixed-position-rounding-error.html
@@ -1,6 +1,5 @@ <!DOCTYPE html> <html class="reftest-wait"> -<meta name=fuzzy content="0-129;0-115"> <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation"> <link rel="match" href="clip-path-animation-fixed-position-rounding-error-ref.html"> <!--
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/delivery-type.tentative.any.js b/third_party/blink/web_tests/external/wpt/resource-timing/delivery-type.tentative.any.js new file mode 100644 index 0000000..e2b408f --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/resource-timing/delivery-type.tentative.any.js
@@ -0,0 +1,90 @@ +// META: global=window,worker +// META: script=/common/get-host-info.sub.js +// META: script=/resource-timing/resources/resource-loaders.js + +// TODO(crbug/1358591): Rename this file from "tentative" once +// `w3c/resource-timing#343` is merged. + +const {REMOTE_ORIGIN, ORIGIN} = get_host_info(); + +const redirectBase = new URL( + '/resource-timing/resources/redirect-cors.py', REMOTE_ORIGIN).href; +const cacheAndValidatedBase = new URL( + '/resource-timing/resources/cacheable-and-validated.py?content=content', + ORIGIN).href; + +const mustRevalidate = {headers: {'Cache-Control': 'max-age=0'}}; + +const fetchAndEatBody = (url, fetchOption) => { + return fetch(url, fetchOption).then(response => response.arrayBuffer()); +}; + +const accumulateEntries = () => { + return new Promise(resolve => { + const po = new PerformanceObserver(list => { + resolve(list); + }); + po.observe({type: "resource", buffered: true}); + }); +}; + +const checkDeliveryTypeBase = + (list, lookupURL, deliveryTypeForCachedResources) => { + const entries = list.getEntriesByName(lookupURL); + assert_equals(entries.length, 3, 'Wrong number of entries'); + + // 200 response (`cacheMode` is an empty string) + assert_equals(entries[0].deliveryType, "", + "Expect empty deliveryType for 200 response."); + // Cached response (`cacheMode` is "local") or 304 response (`cacheMode` is + // "validated"). + assert_equals(entries[1].deliveryType, deliveryTypeForCachedResources, + `Expect "${deliveryTypeForCachedResources}" deliveryType for a + cached response.`); + assert_equals(entries[2].deliveryType, deliveryTypeForCachedResources, + `Expect "${deliveryTypeForCachedResources}" deliveryType for a + revalidated response.`); +}; + +promise_test(() => { + // Use a different URL every time so that the cache behaviour does not depend + // on execution order. + const initialURL = load.cache_bust(cacheAndValidatedBase); + const checkDeliveryType = + list => checkDeliveryTypeBase(list, initialURL, "cache"); + return fetchAndEatBody(initialURL, {}) // 200. + .then(() => fetchAndEatBody(initialURL, {})) // Cached. + .then(() => fetchAndEatBody(initialURL, mustRevalidate)) // 304. + .then(accumulateEntries) + .then(checkDeliveryType); +}, 'PerformanceResourceTiming deliveryType test, same origin.'); + +promise_test(() => { + const cacheAndValidatedURL = load.cache_bust( + cacheAndValidatedBase + '&timing_allow_origin=*'); + const redirectURL = redirectBase + + "?timing_allow_origin=*" + + `&allow_origin=${encodeURIComponent(ORIGIN)}` + + `&location=${encodeURIComponent(cacheAndValidatedURL)}`; + const checkDeliveryType = + list => checkDeliveryTypeBase(list, redirectURL, "cache"); + return fetchAndEatBody(redirectURL, {}) // 200. + .then(() => fetchAndEatBody(redirectURL, {})) // Cached. + .then(() => fetchAndEatBody(redirectURL, mustRevalidate)) // 304. + .then(accumulateEntries) + .then(checkDeliveryType); +}, 'PerformanceResourceTiming deliveryType test, cross origin, TAO passes.'); + +promise_test(() => { + const cacheAndValidatedURL = load.cache_bust(cacheAndValidatedBase); + const redirectURL = redirectBase + + `?allow_origin=${encodeURIComponent(ORIGIN)}` + + `&location=${encodeURIComponent(cacheAndValidatedURL)}`; + const checkDeliveryType = + list => checkDeliveryTypeBase(list, redirectURL, ""); + return fetchAndEatBody(redirectURL, {}) // 200. + .then(() => fetchAndEatBody(redirectURL, {})) // Cached. + .then(() => fetchAndEatBody(redirectURL, mustRevalidate)) // 304. + .then(accumulateEntries) + .then(checkDeliveryType); +}, 'PerformanceResourceTiming deliveryType test, cross origin, TAO fails.');
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resources/cacheable-and-validated.py b/third_party/blink/web_tests/external/wpt/resource-timing/resources/cacheable-and-validated.py index 31f0e3ab..97de866 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/resources/cacheable-and-validated.py +++ b/third_party/blink/web_tests/external/wpt/resource-timing/resources/cacheable-and-validated.py
@@ -1,11 +1,30 @@ def main(request, response): - revalidation = 'Cache-Control' in request.headers + # Headers need to be set before `response.writer` writes out the response. + tao = request.GET.get(b'timing_allow_origin') + if tao: + response.headers.set(b"Timing-Allow-Origin", tao) + + if b'origin' in request.headers: + origin = request.headers[b'origin'] + response.headers.set(b'Access-Control-Allow-Origin', origin) + content = request.GET.first(b'content') response.headers.set(b'Cache-Control', b'max-age=60') response.headers.set(b'ETag', b'assdfsdfe') - if revalidation: - response.status = (304, b'NotModified') + + # Handle CORS-preflights of non-simple requests. + if request.method == 'OPTIONS': + response.status = 204 + requested_method = request.headers.get(b"Access-Control-Request-Method") + if requested_method: + response.headers.set(b"Access-Control-Allow-Methods", requested_method) + requested_headers = request.headers.get(b"Access-Control-Request-Headers") + if requested_headers: + response.headers.set(b"Access-Control-Allow-Headers", requested_headers) else: - response.status = (200, b'OK'); - response.write_status_headers() - response.writer.write(content); + if 'Cache-Control' in request.headers: + response.status = (304, b'NotModified') + else: + response.status = (200, b'OK') + response.write_status_headers() + response.writer.write(content)
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/resources/redirect-cors.py b/third_party/blink/web_tests/external/wpt/resource-timing/resources/redirect-cors.py index ea67cb8..655b862 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/resources/redirect-cors.py +++ b/third_party/blink/web_tests/external/wpt/resource-timing/resources/redirect-cors.py
@@ -1,10 +1,22 @@ def main(request, response): - location = request.GET.first(b"location") - response.status = 302 - response.headers.set(b"Location", location) - if b"allow_origin" in request.GET: - response.headers.set(b"Access-Control-Allow-Origin", request.GET.first(b"allow_origin")) + response.headers.set(b"Access-Control-Allow-Origin", + request.GET.first(b"allow_origin")) if b"timing_allow_origin" in request.GET: - response.headers.set(b"Timing-Allow-Origin", request.GET.first(b"timing_allow_origin")) + response.headers.set(b"Timing-Allow-Origin", + request.GET.first(b"timing_allow_origin")) + + # Handle CORS-preflights of non-simple requests. + if request.method == 'OPTIONS': + response.status = 204 + requested_method = request.headers.get(b"Access-Control-Request-Method") + if requested_method: + response.headers.set(b"Access-Control-Allow-Methods", requested_method) + requested_headers = request.headers.get(b"Access-Control-Request-Headers") + if requested_headers: + response.headers.set(b"Access-Control-Allow-Headers", requested_headers) + else: + location = request.GET.first(b"location") + response.status = 302 + response.headers.set(b"Location", location)
diff --git a/third_party/blink/web_tests/external/wpt/scroll-animations/css/view-timeline-inset-animation.html b/third_party/blink/web_tests/external/wpt/scroll-animations/css/view-timeline-inset-animation.html index 82bfb93e..a02e31b 100644 --- a/third_party/blink/web_tests/external/wpt/scroll-animations/css/view-timeline-inset-animation.html +++ b/third_party/blink/web_tests/external/wpt/scroll-animations/css/view-timeline-inset-animation.html
@@ -45,8 +45,43 @@ </script> <!-- - The scroller is 80x100px. - The target is 50x50px with a 150px margin. + Explanation of scroll positions + =============================== + + Please note the following: + + - The scroller has a width x height of 80x100px. + - The content is 50x50px with a 150px margin on all sides. + In other words, the size of the scroller content is 200x200px. + + This means that, for vertical direction scrolling, assuming no insets: + + - The start offset is 50px (scroller height + 50px is 150px, which consumes + exactly the margin of the content). + - The end offset is 200px (this is where the bottom edge of the scroller has + just cleared the content). + - The halfway point is (50px + 200px) / 2 = 125px. + + For horizontal direction scrolling, assuming no insets: + + - The start offset is 70px (scroller width + 70px is 150px, which consumes + exactly the margin of the content). + - The end offset is 200px (this is where the left edge of the scroller has + just cleared the content). + - The halfway point is (70px + 200px) / 2 = 135px. + + The start and end insets will adjust the start and end offsets accordingly, + and the expectations in this file explicitly write out those adjustments. + For example, if the start offset is normally 50px, but there's an inset of + 10px, we'll expect 50px + 10px rather than 60px. + + Halfway-point expectations write out the adjustment from the "normal" + halfway-point, e.g. for start-inset:10px and end-inset:20px, we expect + "125px + 5px" since (20-10)/2 == 5. + + Finally, note that for right-to-left and bottom-to-top scrolling directions + scroll offsets go the in the negative direction. This is why some expectations + negate all the offsets. --> <template id=test_one_value> @@ -66,7 +101,7 @@ inflate(t, test_one_value); await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); await assertValueAt(scroller, target, { scrollTop:50 + 10, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollTop:125, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:125 + 0, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); }, 'view-timeline-inset with one value'); @@ -89,7 +124,7 @@ inflate(t, test_two_values); await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollTop:130, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); }, 'view-timeline-inset with two values'); @@ -113,7 +148,7 @@ inflate(t, test_em_values); await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollTop:130, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); }, 'view-timeline-inset with em values'); @@ -137,7 +172,7 @@ inflate(t, test_percentage_values); await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollTop:130, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); }, 'view-timeline-inset with percentage values'); @@ -158,9 +193,10 @@ <script> promise_test(async (t) => { inflate(t, test_outset); + await assertValueAt(scroller, target, { scrollTop:20, expected:-1 }); await assertValueAt(scroller, target, { scrollTop:50 - 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollTop:120, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:125 - 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollTop:200 + 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollTop:220, expected:-1 }); }, 'view-timeline-inset with negative values'); @@ -183,7 +219,7 @@ inflate(t, test_horizontal); await assertValueAt(scroller, target, { scrollLeft:20, expected:-1 }); await assertValueAt(scroller, target, { scrollLeft:70 + 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollLeft:140, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:135 + 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollLeft:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollLeft:200, expected:-1 }); }, 'view-timeline-inset with horizontal scroller'); @@ -206,7 +242,7 @@ inflate(t, test_block); await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollTop:130, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); }, 'view-timeline-inset with block scroller'); @@ -229,8 +265,477 @@ inflate(t, test_inline); await assertValueAt(scroller, target, { scrollLeft:20, expected:-1 }); await assertValueAt(scroller, target, { scrollLeft:70 + 20, expected:0 }); // 0% - await assertValueAt(scroller, target, { scrollLeft:140, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:135 + 5, expected:50 }); // 50% await assertValueAt(scroller, target, { scrollLeft:200 - 10, expected:100 }); // 100% await assertValueAt(scroller, target, { scrollLeft:200, expected:-1 }); }, 'view-timeline-inset with inline scroller'); </script> + +<template id=test_auto_block> + <style> + #scroller { + scroll-padding-block: 10px 20px; + } + #target { + view-timeline: t1 block; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_block); + await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); + }, 'view-timeline-inset:auto, block'); +</script> + +<template id=test_auto_block_vertical_lr> + <style> + #scroller { + scroll-padding-block: 10px 20px; + writing-mode: vertical-lr; + } + #target { + view-timeline: t1 block; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_block_vertical_lr); + await assertValueAt(scroller, target, { scrollLeft:20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:70 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:135 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:200, expected:-1 }); + }, 'view-timeline-inset:auto, block, vertical-lr'); +</script> + +<template id=test_auto_block_vertical_rl> + <style> + #scroller { + scroll-padding-block: 10px 20px; + writing-mode: vertical-rl; + } + #target { + view-timeline: t1 block; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_block_vertical_rl); + // Note: this represents horizontal scrolling from right to left. + await assertValueAt(scroller, target, { scrollLeft:-20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:-(70 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:-(135 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:-200, expected:-1 }); + }, 'view-timeline-inset:auto, block, vertical-rl'); +</script> + +<template id=test_auto_inline> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + } + #target { + view-timeline: t1 inline; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_inline); + await assertValueAt(scroller, target, { scrollLeft:20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:70 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:135 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:200, expected:-1 }); + }, 'view-timeline-inset:auto, inline'); +</script> + +<template id=test_auto_inline_vertical_rl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + writing-mode: vertical-rl; + } + #target { + view-timeline: t1 inline; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_inline_vertical_rl); + await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); + }, 'view-timeline-inset:auto, inline, vertical-rl'); +</script> + +<template id=test_auto_inline_vertical_lr> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + writing-mode: vertical-lr; + } + #target { + view-timeline: t1 inline; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_inline_vertical_lr); + await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); + }, 'view-timeline-inset:auto, inline, vertical-lr'); +</script> + +<template id=test_auto_inline_rtl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + direction: rtl; + } + #target { + view-timeline: t1 inline; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_inline_rtl); + await assertValueAt(scroller, target, { scrollLeft:-20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:-(70 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:-(135 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:-200, expected:-1 }); + }, 'view-timeline-inset:auto, inline, rtl'); +</script> + +<template id=test_auto_inline_vertical_rl_rtl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + writing-mode: vertical-rl; + direction: rtl; + } + #target { + view-timeline: t1 inline; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_inline_vertical_rl_rtl); + await assertValueAt(scroller, target, { scrollTop:-50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:-(50 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:-(125 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:-200, expected:-1 }); + }, 'view-timeline-inset:auto, inline, vertical-rl, rtl'); +</script> + +<template id=test_auto_inline_vertical_lr_rtl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + writing-mode: vertical-lr; + direction: rtl; + } + #target { + view-timeline: t1 inline; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_inline_vertical_lr_rtl); + await assertValueAt(scroller, target, { scrollTop:-50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:-(50 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:-(125 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:-200, expected:-1 }); + }, 'view-timeline-inset:auto, inline, vertical-lr, rtl'); +</script> + +<template id=test_auto_vertical> + <style> + #scroller { + scroll-padding-block: 10px 20px; + } + #target { + view-timeline: t1 vertical; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_vertical); + await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); + }, 'view-timeline-inset:auto, vertical'); +</script> + +<template id=test_auto_vertical_vertical_rl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + writing-mode: vertical-rl; + } + #target { + view-timeline: t1 vertical; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_vertical_vertical_rl); + await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); + }, 'view-timeline-inset:auto, vertical, vertical-rl'); +</script> + +<template id=test_auto_vertical_vertical_rl_rtl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + writing-mode: vertical-rl; + direction: rtl; + } + #target { + view-timeline: t1 vertical; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_vertical_vertical_rl_rtl); + await assertValueAt(scroller, target, { scrollTop:-50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:-(50 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:-(125 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:-200, expected:-1 }); + }, 'view-timeline-inset:auto, vertical, vertical-rl, rtl'); +</script> + +<template id=test_auto_horizontal> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + } + #target { + view-timeline: t1 horizontal; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_horizontal); + await assertValueAt(scroller, target, { scrollLeft:20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:70 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:135 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:200, expected:-1 }); + }, 'view-timeline-inset:auto, horizontal'); +</script> + +<template id=test_auto_horizontal_rtl> + <style> + #scroller { + scroll-padding-inline: 10px 20px; + direction: rtl; + } + #target { + view-timeline: t1 horizontal; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_horizontal_rtl); + await assertValueAt(scroller, target, { scrollLeft:-20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:-(70 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:-(135 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:-200, expected:-1 }); + }, 'view-timeline-inset:auto, horizontal, rtl'); +</script> + +<template id=test_auto_horizontal_vertical_lr> + <style> + #scroller { + scroll-padding-block: 10px 20px; + writing-mode: vertical-lr; + } + #target { + view-timeline: t1 horizontal; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_horizontal_vertical_lr); + await assertValueAt(scroller, target, { scrollLeft:20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:70 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:135 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:200, expected:-1 }); + }, 'view-timeline-inset:auto, horizontal, vertical-lr'); +</script> + +<template id=test_auto_horizontal_vertical_rl> + <style> + #scroller { + scroll-padding-block: 10px 20px; + writing-mode: vertical-rl; + } + #target { + view-timeline: t1 horizontal; + view-timeline-inset: auto auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_horizontal_vertical_rl); + await assertValueAt(scroller, target, { scrollLeft:-20, expected:-1 }); + await assertValueAt(scroller, target, { scrollLeft:-(70 + 20), expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollLeft:-(135 + 5), expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollLeft:-(200 - 10), expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollLeft:-200, expected:-1 }); + }, 'view-timeline-inset:auto, horizontal, vertical-rl'); +</script> + +<template id=test_auto_mix> + <style> + #scroller { + font-size: 10px; + scroll-padding-block: 50px calc(10% + 1em); + } + #target { + view-timeline: t1; + view-timeline-inset: 10% auto; + animation: anim 1s linear t1; + } + </style> + <div id=scroller> + <div id=target></div> + </div> +</template> +<script> + promise_test(async (t) => { + inflate(t, test_auto_mix); + // Note: 10% of scroller height 100px is 10px, and 1em with font-size:10px + // is also 10px. Hence we expect the end inset specified as calc(10% + 1em) + // to be 20px. + await assertValueAt(scroller, target, { scrollTop:50, expected:-1 }); + await assertValueAt(scroller, target, { scrollTop:50 + 20, expected:0 }); // 0% + await assertValueAt(scroller, target, { scrollTop:125 + 5, expected:50 }); // 50% + await assertValueAt(scroller, target, { scrollTop:200 - 10, expected:100 }); // 100% + await assertValueAt(scroller, target, { scrollTop:200, expected:-1 }); + }, 'view-timeline-inset:auto, mix'); +</script> + +<!-- + TODO: How to test view-timeline:auto + scroll-padding:auto? The UA may + in theory use any value in that case. + + https://drafts.csswg.org/css-scroll-snap-1/#valdef-scroll-padding-auto +-->
diff --git a/third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest-001.html b/third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest-001.html new file mode 100644 index 0000000..4256628 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest-001.html
@@ -0,0 +1,37 @@ +<!DOCTYPE html> +<title>elementFromPoint(...) on <rect>s</title> +<link rel="help" href="https://svgwg.org/svg2-draft/interact.html#hit-testing"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<svg id="svg" width="420" height="300"> + <rect id="border" x="0.5" y="0.5" width="419" height="299" stroke="#000" stroke-width="1" fill="none"/> + + <rect id="rect1" x="40" y="30" width="20" height="20"/> +</svg> +<script> +// Points are relative to the client rect of the <svg> root. +const tests = [ + // Points on the edge. + { x: 50, y: 30, expectedElemId: "rect1" }, + { x: 60, y: 40, expectedElemId: "rect1" }, + { x: 50, y: 50, expectedElemId: "rect1" }, + { x: 40, y: 40, expectedElemId: "rect1" }, +]; + +setup(() => { + const svg = document.getElementById("svg"); + const svgBounds = svg.getBoundingClientRect(); + window.svgOrigin = { + x: svgBounds.left << 0, + y: svgBounds.top << 0, + }; +}); + +tests.forEach(testcase => { + test(t => { + const expectedElem = document.getElementById(testcase.expectedElemId); + const hitElem = document.elementFromPoint(svgOrigin.x + testcase.x, svgOrigin.y + testcase.y); + assert_equals(hitElem, expectedElem); + }, `${document.title}, element at (${testcase.x}, ${testcase.y})`); +}); +</script>
diff --git a/third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest.html b/third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest-002.html similarity index 100% rename from third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest.html rename to third_party/blink/web_tests/external/wpt/svg/interact/scripted/rect-hittest-002.html
diff --git a/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu-expected.png deleted file mode 100644 index 2e01597..0000000 --- a/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu.html b/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu.html index d21ab38e..141fbef7 100644 --- a/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu.html +++ b/third_party/blink/web_tests/fast/forms/color-scheme/media/video-overlay-menu.html
@@ -14,6 +14,9 @@ var overflowMenu = getOverflowMenuButton(video); var coords = elementCoordinates(overflowMenu); clickAtCoordinates(coords[0], coords[1]); + + // Simulate a 'tab' keypress to validate :focus-visible styles. + eventSender.keyDown('\u0009'); }; setVideoSrcAndWaitForFirstFrame("../../../../media/content/test.ogv"); </script>
diff --git a/third_party/blink/web_tests/platform/linux/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/linux/fast/forms/color-scheme/media/video-overlay-menu-expected.png index 8b87329..5cdd009 100644 --- a/third_party/blink/web_tests/platform/linux/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/linux/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/linux/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png index cb0211e9..af744758 100644 --- a/third_party/blink/web_tests/platform/linux/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/linux/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png index bbbe3a4..125a1515 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/mac-mac10.14/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png index 3a6c58e..8b0dd41 100644 --- a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png new file mode 100644 index 0000000..a1d7a35 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png index f75307a..813cebd3c 100644 --- a/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/mac/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/win/fast/forms/color-scheme/media/video-overlay-menu-expected.png index 4294370..46e4745 100644 --- a/third_party/blink/web_tests/platform/win/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/win/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png b/third_party/blink/web_tests/platform/win/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png index fdaab3c..c7eb6a0 100644 --- a/third_party/blink/web_tests/platform/win/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png +++ b/third_party/blink/web_tests/platform/win/virtual/dark-color-scheme/fast/forms/color-scheme/media/video-overlay-menu-expected.png Binary files differ
diff --git a/third_party/tflite/features.gni b/third_party/tflite/features.gni index 353b2e3..4b3e96f 100644 --- a/third_party/tflite/features.gni +++ b/third_party/tflite/features.gni
@@ -6,8 +6,8 @@ declare_args() { # This enables building TFLite with XNNPACK. Currently only available for - # Linux x64. - build_tflite_with_xnnpack = is_linux && current_cpu == "x64" + # Linux or Windows on x64. + build_tflite_with_xnnpack = (is_win || is_linux) && current_cpu == "x64" # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. build_tflite_with_ruy = true
diff --git a/third_party/webxr_test_pages/README.chromium b/third_party/webxr_test_pages/README.chromium index 99c8acc..4e4b646 100644 --- a/third_party/webxr_test_pages/README.chromium +++ b/third_party/webxr_test_pages/README.chromium
@@ -43,6 +43,50 @@ To install: `sudo npm install -g serve` To run: `serve .` in src/third_party/webxr_test_pages/webxr-samples + +To verify if you have sufficient access to the cloud bucket: + +1. Run: + gsutil.py ls -d gs://chromium-webxr-test + +3. If you get authentication errors such as this one: + Your credentials are invalid. For more help, see "gsutil help creds", or re-run the gsutil config command (see "gsutil help config"). + Try running: + gsutil.py config + and authenticate using your google.com identity. Use project ID 0. + WARNING: make sure to use gsutil.py (note .py suffix) from depot_tools. Your + computer may have a separate copy of gsutil from the google-cloud-sdk + package which is NOT equivalent. + + +To publish a temporary copy in a cloud bucket: + +This step isn't needed for routine changes, but can be useful in case you want +to test a change as served from the cloud bucket before submitting the change. + +1. Copy the current workspace content to a temporary bucket. Use a unique + name, not starting with rREVISION to avoid confusion with the normal snapshots + python3 ./update_bucket.py -v --direct-publish-samples-source=webxr-samples --direct-publish-samples-dest=tmp-klausw-cr3924689 + +2. Access your change at the corresponding bucket location: + https://storage.googleapis.com/chromium-webxr-test/tmp-klausw-cr3924689/index.html + +3. When done, go to the cloud console at + https://pantheon.corp.google.com/storage/browser/chromium-webxr-test + and delete the temporary bucket. + + +To publish samples for the current tip of tree (after your change was submitted): + +1. Ensure that you have a clean checkout of third_party/webxr_test_pages/ with + no local changes. + +2. From the webxr_test_pages directory, run: + python3 update-bucket.py + You can add the --dry-run flag to check the proposed action before making changes, + and/or --verbose for additional detail. + + To publish samples for OT: 1. python make_ot_samples_folder.py webxr-samples <dest-folder> @@ -53,7 +97,6 @@ 3. python update_bucket.py --direct-publish-samples-source=<dest-folder> --direct-publish-samples-dest=<bucket-dest-subfolder> - To create a Google Cloud WebXR-Samples bucket: 1. Navigate to the Google Cloud console at https://console.cloud.google.com/
diff --git a/third_party/webxr_test_pages/update_bucket.py b/third_party/webxr_test_pages/update_bucket.py index 08eb0bd..53749d1 100755 --- a/third_party/webxr_test_pages/update_bucket.py +++ b/third_party/webxr_test_pages/update_bucket.py
@@ -139,7 +139,7 @@ check_and_fix_content_types(destination) def direct_publish_samples(source: str, dest_subfolder: str): - destination = 'gs://chromium-webxr-samples' + '/' + dest_subfolder + destination = BUCKET + '/' + dest_subfolder run_modify('gsutil.py', '-m', 'rsync', '-x', 'media', '-r', './' + source, destination)
diff --git a/third_party/webxr_test_pages/webxr-samples/proposals/camera-access-marker.html b/third_party/webxr_test_pages/webxr-samples/proposals/camera-access-marker.html new file mode 100644 index 0000000..e9f338f --- /dev/null +++ b/third_party/webxr_test_pages/webxr-samples/proposals/camera-access-marker.html
@@ -0,0 +1,997 @@ +<!doctype html> +<!-- +Copyright 2022 The Immersive Web Community Group + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +--> +<html> + <head> + <meta charset='utf-8'> + <meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no'> + <meta name='mobile-web-app-capable' content='yes'> + <meta name='apple-mobile-web-app-capable' content='yes'> + + <title>WebXR Camera Access Marker Tracking</title> + <link href='../css/common.css' rel='stylesheet'></link> + <style> + #text-info { + position: absolute; + bottom: 5%; + left: 2%; + font-family: monospace; + color: white; + background-color: rgba(0, 0, 0, 0.5); + } + + canvas { + position: relative; + left: initial; + top: initial; + right: initial; + bottom: initial; + /*width: initial;*/ + width: 50%; + height: initial; + } + </style> + + <!-- + This needs a version of opencv.js that's built including opencv_contrib to ensure + modules/aruco/ is present. The default distribution doesn't include that. + + Here are the build instructions for a non-multithreaded WASM build with SIMD enabled, based + on https://docs.opencv.org/4.x/d4/da1/tutorial_js_setup.html . The specific instructions + are for a Debian/Ubuntu system, please adjust as needed for other platforms. + + sudo apt-get install emscripten + + git clone https://github.com/opencv/opencv.git + git clone https://github.com/opencv/opencv_contrib.git + + python3 ./opencv/platforms/js/build_js.py \ + --emscripten_dir /usr/share/emscripten \ + --cmake_option="-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules" \ + --build_wasm --simd build_wasm_simd + + The resulting output file is: build_wasm_simd/bin/opencv.js + --> + <script src="opencv/opencv.js"></script> + + </head> + <body> + <header> + <details open> + <summary>Camera Access Marker Tracking</summary> + This sample tracks <a href="https://docs.opencv.org/4.x/d5/dae/tutorial_aruco_detection.html">ArUco markers</a> using OpenCV.js with WASM and SIMD enabled. + <p> + <input id="asyncRead" type="checkbox" checked> + <label for="asyncRead">Read pixel data asynchronously<br/> + <input id="delayImage" type="checkbox" checked> + <label for="delayImage">In async mode, delay camera image to match poses<br/> + <input id="debugOpenCV" type="checkbox"> + <label for="debugOpenCV">Show debug image for OpenCV</label><br/> + <input type="range" id="cvDownscale" min="1" max="8" value="4"> + <label for="cvDownscale">Downscale image <span id="cvDownscaleValue">4</span>x before marker detection.</label><br/> + + <a class="back" href="./index.html">Back</a> + </p> + <div id="warning-zone"></div> + <button id="xr-button" class="barebones-button" disabled>XR not found</button> + </details> + </header> + <div id="text-overlay"> + <div id="text-info"></div> + <canvas id="out-canvas" width="25%" height="25%" style='display: none; top: 10px; left: 10px; border: 2px solid green;'> + </div> + <main style='text-align: center;'> + <p>Click 'Enter AR' to see content</p> + </main> + <script type="module"> + import * as mat4 from "../js/third-party/gl-matrix/mat4.js" + import * as vec3 from "../js/third-party/gl-matrix/vec3.js" + import * as vec4 from "../js/third-party/gl-matrix/vec4.js" + import {QueryArgs} from '../js/cottontail/src/util/query-args.js'; + + // XR globals. + let xrButton = document.getElementById('xr-button'); + let xrSession = null; + let xrRefSpace = null; + + // WebGL scene globals. + let gl = null; + let glBinding = null; + let cubeRotation = 0.0; + let rotationSpeed = 0.01; + let shaderProgram = null; + let programInfo = null; + let buffers = null; + let readback_framebuffer = null; + let readback_pixels = null; + let framebufferCompletenessChecked = false; + let glErrorsChecked = false; + + let scaledWidth = 0; + let scaledHeight = 0; + let quadCopyShaderProgram = null; + let quadCopyProgramInfo = null; + let quadCopyBuffers = null; + let quadCopyTextures = []; + let quadCopyTexIdx = 0; + let backgroundTexture = null; + let readPixelBuf = null; + let alreadyDoingMarkerDetection = false; + let frameNum = 0; + + let arc = null; + let markersInFrame = []; + let imgScale = parseInt(document.getElementById('cvDownscale').value); + + // If requested, use DOM overlay to provide information about the read color: + const use_dom_overlay = QueryArgs.getBool('useDomOverlay', true); + + const textOverlayElement = document.querySelector("#text-overlay"); + if (!textOverlayElement) { + console.error("#text-overlay element not found!"); + throw new Error("#text-overlay element not found!"); + } + + const textInfoElement = document.querySelector("#text-info"); + if (!textInfoElement) { + console.error("#text-info element not found!"); + throw new Error("#text-info element not found!"); + } + + document.getElementById('cvDownscale').onchange = (ev) => { + document.getElementById('cvDownscaleValue').innerText = ev.target.value; + }; + + document.getElementById('asyncRead').onchange = (ev) => { + // Disable the "delay image" input if in synchronous mode since it's + // not applicable in that case. + document.getElementById('delayImage').disabled = + ev.target.checked ? '' : 'disabled'; + }; + + let isWebXRSupported = false; + let isOpenCVLoaded = false; + + cv.then(() => { + console.log('OpenCV load complete.'); + // Hack: the cv module doesn't seem to be loading properly? + if (!cv.imread) cv = Module; + isOpenCVLoaded = true; + updateXRButton(); + }); + + function updateXRButton() { + console.log('isWebXRSupported=' + isWebXRSupported + " isOpenCVLoaded=" + isOpenCVLoaded); + if (isWebXRSupported && isOpenCVLoaded) { + xrButton.innerHTML = 'Enter AR'; + xrButton.disabled = false; + } else { + xrButton.innerHTML = 'AR not found'; + xrButton.disabled = true; + } + } + function checkSupportedState() { + navigator.xr.isSessionSupported('immersive-ar').then((supported) => { + console.log('isSessionSupported returned ' + supported); + isWebXRSupported = supported; + updateXRButton(); + }); + } + + function initXR() { + if (!window.isSecureContext) { + let message = "WebXR unavailable due to insecure context"; + document.getElementById("warning-zone").innerText = message; + } + + if (navigator.xr) { + xrButton.addEventListener('click', onButtonClicked); + navigator.xr.addEventListener('devicechange', checkSupportedState); + checkSupportedState(); + } + } + + function onButtonClicked() { + if (!xrSession) { + const sessionOptions = { + requiredFeatures: ['camera-access'], + trackedImages: [], + //optionalFeatures: ['image-tracking'], // for autofocus + optionalFeatures: [], + }; + + if (use_dom_overlay) { + sessionOptions.requiredFeatures.push('dom-overlay'); + //sessionOptions.domOverlay = { root: document.body }; + sessionOptions.domOverlay = { root: textOverlayElement }; + } + + navigator.xr.requestSession('immersive-ar', sessionOptions) + .then(onSessionStarted, onRequestSessionError); + } else { + xrSession.end(); + } + } + + function onSessionStarted(session) { + xrSession = session; + xrButton.innerHTML = 'Exit AR'; + + session.addEventListener('end', onSessionEnded); + let canvas = document.createElement('canvas'); + gl = canvas.getContext('webgl2', { + xrCompatible: true + }); + + glBinding = new XRWebGLBinding(session, gl); + + // Init cube geometry and cube's default texture. + initializeGLCube(gl); + + initializeGLQuadCopy(gl); + + document.getElementById('out-canvas').style.display = + document.getElementById('debugOpenCV').checked ? + 'initial' : 'none'; + + for (let i = 0; i < 2; ++i) { + quadCopyTextures[i] = gl.createTexture(); + } + readback_framebuffer = gl.createFramebuffer(); + readPixelBuf = gl.createBuffer(); + + session.updateRenderState({ baseLayer: new XRWebGLLayer(session, gl) }); + session.requestReferenceSpace('viewer').then((refSpace) => { + xrRefSpace = refSpace; + session.requestAnimationFrame(onXRFrame); + }); + + imgScale = parseInt(document.getElementById('cvDownscale').value); + initializeMarkerTracking(); + } + + function onRequestSessionError(ex) { + alert("Failed to start immersive AR session."); + console.error(ex.message); + } + + function onEndSession(session) { + session.end(); + } + + function onSessionEnded(event) { + xrSession = null; + xrButton.innerHTML = 'Enter AR'; + gl = null; + framebufferCompletenessChecked = false; + glErrorsChecked = false; + lastTime = 0; + readback_pixels = null; + backgroundTexture = null; + alreadyDoingMarkerDetection = false; + markersInFrame = []; + } + + // Only print each unique intrinsic string once. + const intrinsicsPrinted = {}; + + // Calculates the camera intrinsics matrix from a projection matrix and viewport. + // See camera-access-barebones.html in this directory for a detailed comment about + // this function. + function getCameraIntrinsics(projectionMatrix, viewport) { + const p = projectionMatrix; + // Principal point in pixels (typically at or near the center of the viewport) + let u0 = (1 - p[8]) * viewport.width / 2 + viewport.x; + let v0 = (1 - p[9]) * viewport.height / 2 + viewport.y; + // Focal lengths in pixels (these are equal for square pixels) + let ax = viewport.width / 2 * p[0]; + let ay = viewport.height / 2 * p[5]; + // Skew factor in pixels (nonzero for rhomboid pixels) + let gamma = viewport.width / 2 * p[4]; + + // Print the calculated intrinsics, but once per unique value to + // avoid log spam. These can change every frame for some XR devices. + const intrinsicString = ( + "intrinsics: u0=" +u0 + " v0=" + v0 + " ax=" + ax + " ay=" + ay + + " gamma=" + gamma + " for viewport {width=" + + viewport.width + ",height=" + viewport.height + ",x=" + + viewport.x + ",y=" + viewport.y + "}"); + if (!intrinsicsPrinted[intrinsicString]) { + console.log("projection:", Array.from(projectionMatrix).join(", ")); + console.log(intrinsicString); + intrinsicsPrinted[intrinsicString] = true; + } + return {u0, v0, ax, ay, gamma}; + } + + let lastTime = 0; + const frameTimes = []; + const frameTimeMax = 10; + let frameTimeIdx = 0; + + function showFps(timestamp) { + if (lastTime) { + const delta = timestamp - lastTime; + frameTimes[frameTimeIdx] = delta; + frameTimeIdx = (frameTimeIdx + 1) % frameTimeMax; + + if (frameTimes.length >= frameTimeMax - 1) { + const fps = Math.round(1000 * frameTimeMax / frameTimes.reduce((sum, v) => sum + v)); + const msg = '' + fps + ' fps'; + console.debug(msg); + document.getElementById('text-info').innerText = msg; + } + } + lastTime = timestamp; + } + + function onXRFrame(frameTimestamp, frame) { + ++frameNum; + let session = frame.session; + session.requestAnimationFrame(onXRFrame); + let pose = frame.getViewerPose(xrRefSpace); + if (!pose) return; + + for (let view of pose.views) { + let viewport = session.renderState.baseLayer.getViewport(view); + + let asyncRead = document.getElementById('asyncRead').checked; if (asyncRead) { + // Use asynchronous readPixels and draw the augmented scene based on the + // last-detected marker poses, effectively adding a frame of delay to the + // session. If the scene also had elements that are based on poses from the XR + // session, such as hit test results, those poses would also need to be saved + // to match the marker poses. + + // Draw the scene based on the last-available camera image (if available) and + // marker poses. + console.debug('draw frame ' + frameNum); + const delayImage = document.getElementById('delayImage').checked; + drawMarkerScene(session, viewport, view, delayImage); + + // If we're already running marker detection, ignore this camera frame. The + // marker poses will be updated once the currently-running detection finishes. + if (alreadyDoingMarkerDetection) { + console.debug('skip frame ' + frameNum + ', already doing marker detection'); + // Exit early so that we don't update the FPS counter. + // That's supposed to only count frames with updated + // marker pose data. + return; + } + + // We're not currently running marker detection. Copy the camera frame and run + // asynchronous marker detection on it. + console.debug('start frame ' + frameNum + ' new marker detection'); + if (!view.camera) return; + + if (!copyCameraTexture(view)) return; + + readPixelsAndDetectMarkersAsync(view); + gl.bindFramebuffer(gl.FRAMEBUFFER, null); + } else { + // Simple version - copy the camera texture, readPixels, detect markers, draw them. + + if (!view.camera) return; + if (!copyCameraTexture(view)) return; + + gl.readPixels(0, 0, scaledWidth, scaledHeight, + gl.RGBA, gl.UNSIGNED_BYTE, readback_pixels); + gl.bindFramebuffer(gl.FRAMEBUFFER, null); + + detectMarkers(new Uint8ClampedArray(readback_pixels.buffer), + scaledWidth, scaledHeight, view); + + drawMarkerScene(session, viewport, view, false); + } + } + + // If we get here, update the FPS counter. This is skipped in case the drawing loop + // above did an early return, so we're only counting frames where the image was actually + // processed. + showFps(frameTimestamp); + + // Once per session, check for GL errors and report them. Then turn + // off this expensive check. + if (!glErrorsChecked) { + const e = gl.getError(); + if (e != 0) { + console.warn("Got a GL error:", e); + } else { + glErrorsChecked = true; + } + } + } + + function copyCameraTexture(view) { + const cameraTexture = glBinding.getCameraImage(view.camera); + + scaledWidth = view.camera.width / imgScale; + scaledHeight = view.camera.height / imgScale; + const texture_bytes = scaledWidth * scaledHeight * 4; + if (!readback_pixels || readback_pixels.length != texture_bytes) { + readback_pixels = new Uint8Array(texture_bytes); + for (let i = 0; i < quadCopyTextures.length; ++i) { + gl.bindTexture(gl.TEXTURE_2D, quadCopyTextures[i]); + gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, scaledWidth, scaledHeight, + 0, gl.RGBA, gl.UNSIGNED_BYTE, null); + } + } + readback_pixels.fill(0); + + console.debug('frame ' + frameNum + ' update texture ' + quadCopyTexIdx); + gl.bindTexture(gl.TEXTURE_2D, quadCopyTextures[quadCopyTexIdx]); + gl.bindFramebuffer(gl.FRAMEBUFFER, readback_framebuffer); + gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, + gl.TEXTURE_2D, quadCopyTextures[quadCopyTexIdx], 0); + + // Once per session, check if the framebuffer setup worked. + if (!framebufferCompletenessChecked && + gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) { + console.warn("Framebuffer incomplete!"); + return false; + } + framebufferCompletenessChecked = true; + + gl.viewport(0, 0, scaledWidth, scaledHeight); + quadCopyDraw(gl, quadCopyProgramInfo, quadCopyBuffers, cameraTexture); + + return true; + } + + function readPixelsAndDetectMarkersAsync(view) { + alreadyDoingMarkerDetection = true; + const subtaskFrameNum = frameNum; + + readPixelsAsync(gl, 0, 0, scaledWidth, scaledHeight, gl.RGBA, gl.UNSIGNED_BYTE, + readback_pixels, readPixelBuf).then(() => { + // session ended? + if (!readback_pixels) return; + + console.debug('async do frame ' + subtaskFrameNum + ' marker detection, texture ' + quadCopyTexIdx); + detectMarkers(new Uint8ClampedArray(readback_pixels.buffer), + scaledWidth, scaledHeight, view); + + alreadyDoingMarkerDetection = false; + backgroundTexture = quadCopyTextures[quadCopyTexIdx]; + console.debug('finished frame ' + subtaskFrameNum + ' marker detection, new background texture ' + quadCopyTexIdx); + quadCopyTexIdx = (quadCopyTexIdx + 1) % quadCopyTextures.length; + }); + } + + function drawMarkerScene(session, viewport, view, drawBackground) { + gl.bindFramebuffer(gl.FRAMEBUFFER, session.renderState.baseLayer.framebuffer); + gl.clearColor(0, 0, 0, 0); + gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); + gl.enable(gl.DEPTH_TEST); + gl.enable(gl.CULL_FACE); + gl.cullFace(gl.BACK); + gl.viewport(viewport.x, viewport.y, + viewport.width, viewport.height); + + if (drawBackground && backgroundTexture) { + // Draw the stored camera image matching the scene's pose to the screen. Note that + // the backgroundTexture was flipped vertically (to match OpenCV expectations), and + // is now flipped vertically again to ensure a correctly oriented image. + gl.disable(gl.DEPTH_TEST); + quadCopyDraw(gl, quadCopyProgramInfo, quadCopyBuffers, backgroundTexture); + gl.enable(gl.DEPTH_TEST); + } + + if (drawBackground) { + gl.enable(gl.BLEND); + gl.blendFunc(gl.SRC_COLOR, gl.DST_COLOR); + } + const markerColor = vec4.fromValues(1, 0, 0, 0.75); + for (let i = 0; i < markersInFrame.length; ++i) { + let pose = markersInFrame[i].pose; + let id = markersInFrame[i].id; + //console.log('i=', i, 'id=', id, 'pose=', pose); + markerColor[0] = (1 + Math.cos(id * 2.5)) / 2; + markerColor[1] = (1 + Math.sin(id * 2.5)) / 2; + markerColor[2] = (1 + Math.sin(id * 4.1)) / 2; + drawCube(pose, gl, programInfo, buffers, view, markerColor); + } + gl.disable(gl.BLEND); + } + + let markerImage = null; + let dictionary = null; + let markerCorners = null; + let markerIds = null; + let rvecs = null; + let tvecs = null; + let detectorParams = null; + function initializeMarkerTracking() { + markerImage = new cv.Mat(); + dictionary = new cv.aruco_Dictionary(cv.DICT_6X6_250); + markerCorners = new cv.MatVector(); + markerIds = new cv.Mat(); + rvecs = new cv.Mat(); + tvecs = new cv.Mat(); + detectorParams = new cv.aruco_DetectorParameters(); + detectorParams.useAruco3Detection = true; + } + + function detectMarkers(rawData, scaledWidth, scaledHeight, view) { + const debugOpenCV = document.getElementById('debugOpenCV').checked; + + const img = new cv.Mat(scaledHeight, scaledWidth, cv.CV_8UC4); + img.data.set(rawData); + + // OpenCV needs either a three-channel RGB image or a grayscale image. The source is + // four-channel RGBA and needs to be converted. + cv.cvtColor(img, img, cv.COLOR_RGBA2GRAY, 0); + + // Run ArUco marker detection + cv.detectMarkers(img, dictionary, markerCorners, markerIds, detectorParams); + + // Assume that the camera image is undistorted. We don't have access to distortion + // parameters. The AR implementation should have taken care of any required corrections. + let distCoeffs = cv.matFromArray(5, 1, cv.CV_64F, [0, 0, 0, 0, 0]); + + // Calculate camera intrinsics based on the scaled texture size. Note that the image + // data was vertically flipped by the quad copy, so the data starts with the top left + // pixel as expected by OpenCV. The marker pose transformation will convert from + // OpenCV's camera space to WebXR viewer space. + let intrinsics = getCameraIntrinsics(view.projectionMatrix, + {width: scaledWidth, height: scaledHeight, x: 0, y: 0}); + let cameraMatrix = cv.matFromArray(3, 3, cv.CV_64F, + [intrinsics.ax, 0, intrinsics.u0, + 0, intrinsics.ay, intrinsics.v0, + 0, 0, 1]); + + // Marker detection needs to know the physical marker size in meters. If the real size + // is different, a 3D rendering based on the tracked marker will still look correct on a + // 2D screen, but the depth will be wrong. This could lead to occlusion or physics + // issues where a correct depth would be necessary. + const markerSize = 0.1; + cv.estimatePoseSingleMarkers(markerCorners, markerSize, cameraMatrix, distCoeffs, rvecs, tvecs); + + markersInFrame = []; + for (let i = 0; i < markerIds.rows; ++i) { + // Rotation vector pointing along the rotation axis. Its length + // provides the rotation angle in radians. + let rvec = cv.matFromArray(3, 1, cv.CV_64F, + [rvecs.doublePtr(0, i)[0], + rvecs.doublePtr(0, i)[1], + rvecs.doublePtr(0, i)[2]]); + // Translation vector in OpenCV camera space. + let tvec = cv.matFromArray(3, 1, cv.CV_64F, + [tvecs.doublePtr(0, i)[0], + tvecs.doublePtr(0, i)[1], + tvecs.doublePtr(0, i)[2]]); + + if (debugOpenCV) { + cv.drawFrameAxes(img, cameraMatrix, distCoeffs, rvec, tvec, markerSize); + } + + // Convert rvec/tvec to a pose in XR space. (For clarity, read these operations from + // the bottom up to see how the transform from model space to world space is + // constructed.) + let m = mat4.create(); + // OpenCV's camera coordinate system has +x right, +y down, +z away. + // We need +y down and -z away, this is a 180 degree rotation around the X axis. + mat4.fromRotation(m, Math.PI, [1, 0, 0]); + // Apply the tvec translation. + mat4.translate(m, m, tvecs.doublePtr(0, i)); + // Rotate the cube based on rvec's length and axis. + mat4.rotate(m, m, vec3.length(rvecs.doublePtr(0, i)), rvecs.doublePtr(0, 0)) + // Resize the cube to match the marker size. + mat4.scale(m, m, [markerSize / 2, markerSize / 2, markerSize / 2]); + // The drawn cube has a 2 unit (meter) edge length. Translate it so that + // its origin is in the center of the bottom face. + mat4.translate(m, m, [0, 0, 1]); + + // Save the marker for rendering. + markersInFrame.push({id: markerIds.intAt(i), pose: m}); + } + if (debugOpenCV) { + cv.drawDetectedMarkers(img, markerCorners, markerIds); + cv.imshow('out-canvas', img); + } + img.delete(); + } + +// This GL rendering code is adapted from a publicly provided code sample found at +// https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL + + function initializeGLQuadCopy(gl) { + quadCopyShaderProgram = initShaderProgram(gl, ` + attribute vec2 a_position; + varying vec2 v_uv; + void main() { + gl_Position = vec4(a_position, 0.0, 1.0); + // Rescale UV from [-1, 1] to [0, 1]. This also adds + // a Y flip since OpenCV expects the image data to start + // at the top left corner. When drawing the resulting + // texture to the screen, it'll be Y flipped again to + // appear in its normal orientation. + v_uv.x = (a_position.x + 1.0) * 0.5; + v_uv.y = (1.0 - a_position.y) * 0.5; + } + `, ` + precision mediump float; + varying vec2 v_uv; + uniform sampler2D u_texture; + void main() { + gl_FragColor = texture2D(u_texture, v_uv); + gl_FragColor.a = 1.0; + } + `); + quadCopyProgramInfo = { + program: quadCopyShaderProgram, + attribLocations: { + vertexPosition: gl.getAttribLocation(quadCopyShaderProgram, 'a_position'), + }, + uniformLocations: { + uSampler: gl.getUniformLocation(quadCopyShaderProgram, 'u_texture'), + }, + }; + quadCopyBuffers = initQuadCopyBuffers(gl); + } + + function initQuadCopyBuffers(gl) { + // Create a buffer for the cube's vertex positions. + const positionBuffer = gl.createBuffer(); + + // Select the positionBuffer as the one to apply buffer + // operations to from here out. + gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer); + + // Now create an array of positions for the cube. + const positions = [ + -1, 1, + -1, -1, + 1, -1, + 1, -1, + 1, 1, + -1, 1, + ] + // Now pass the list of positions into WebGL to build the + // shape. We do this by creating a Float32Array from the + // JavaScript array, then use it to fill the current buffer. + gl.bufferData( + gl.ARRAY_BUFFER, + new Float32Array(positions), + gl.STATIC_DRAW + ); + + return { + position: positionBuffer, + }; + } + + function quadCopyDraw(gl, programInfo, buffers, texture, view) { + // Tell WebGL how to pull out the positions from the position + // buffer into the vertexPosition attribute + { + const numComponents = 2; + const type = gl.FLOAT; + const normalize = false; + const stride = 0; + const offset = 0; + gl.bindBuffer(gl.ARRAY_BUFFER, buffers.position); + gl.vertexAttribPointer( + programInfo.attribLocations.vertexPosition, + numComponents, + type, + normalize, + stride, + offset + ); + gl.enableVertexAttribArray( + programInfo.attribLocations.vertexPosition + ); + } + + gl.useProgram(programInfo.program); + gl.activeTexture(gl.TEXTURE0); + gl.bindTexture(gl.TEXTURE_2D, texture); + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR); + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE); + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE); + + // Mipmaps might be useful for >2x downscaling, but this + // apparently doesn't work for the opaque camera texture. It + // requires a WebGL2 context since it's non-power-of-2, but + // still fails silently (framebuffer incomplete). + //gl.generateMipmap(gl.TEXTURE_2D); + + gl.uniform1i(programInfo.uniformLocations.uSampler, 0); + gl.drawArrays(gl.TRIANGLES, 0, 6); + } + + // Vertex shader program + const vsSource = ` + attribute vec4 aVertexPosition; + uniform mat4 uModelViewMatrix; + uniform mat4 uProjectionMatrix; + void main(void) { + gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition; + } + `; + + // Fragment shader program + const fsSource = ` + uniform mediump vec4 uBaseColor; + precision mediump float; + void main(void) { + gl_FragColor = uBaseColor; + } + `; + + function initializeGLCube(gl) { + // Initialize a shader program; this is where all the lighting + // for the vertices and so forth is established. + shaderProgram = initShaderProgram(gl, vsSource, fsSource); + + // Collect all the info needed to use the shader program. + // Look up which attributes our shader program is using + // for aVertexPosition, aTextureCoord and also + // look up uniform locations. + programInfo = { + program: shaderProgram, + attribLocations: { + vertexPosition: gl.getAttribLocation(shaderProgram, 'aVertexPosition'), + }, + uniformLocations: { + projectionMatrix: gl.getUniformLocation(shaderProgram, 'uProjectionMatrix'), + modelViewMatrix: gl.getUniformLocation(shaderProgram, 'uModelViewMatrix'), + uBaseColor: gl.getUniformLocation(shaderProgram, 'uBaseColor'), + }, + }; + + // Here's where we call the routine that builds all the + // objects we'll be drawing. + buffers = initBuffers(gl); + } + + // Initialize the buffers we'll need. For this demo, we just + // have one object -- a simple three-dimensional cube. + function initBuffers(gl) { + // Create a buffer for the cube's vertex positions. + const positionBuffer = gl.createBuffer(); + + // Select the positionBuffer as the one to apply buffer + // operations to from here out. + gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer); + + // Now create an array of positions for the cube. + const positions = [ + // Front face + -1.0, -1.0, 1.0, 1.0, -1.0, 1.0, 1.0, 1.0, 1.0, -1.0, 1.0, 1.0, + // Back face + -1.0, -1.0, -1.0, -1.0, 1.0, -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, -1.0, + // Top face + -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0, + // Bottom face + -1.0, -1.0, -1.0, 1.0, -1.0, -1.0, 1.0, -1.0, 1.0, -1.0, -1.0, 1.0, + // Right face + 1.0, -1.0, -1.0, 1.0, 1.0, -1.0, 1.0, 1.0, 1.0, 1.0, -1.0, 1.0, + // Left face + -1.0, -1.0, -1.0, -1.0, -1.0, 1.0, -1.0, 1.0, 1.0, -1.0, 1.0, -1.0, + ]; + + // Now pass the list of positions into WebGL to build the + // shape. We do this by creating a Float32Array from the + // JavaScript array, then use it to fill the current buffer. + gl.bufferData( + gl.ARRAY_BUFFER, + new Float32Array(positions), + gl.STATIC_DRAW + ); + + // Build the element array buffer; this specifies the indices + // into the vertex arrays for each face's vertices. + + const indexBuffer = gl.createBuffer(); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, indexBuffer); + + // This array defines each face as two triangles, using the + // indices into the vertex array to specify each triangle's + // position. + + const indices = [ + 0, 1, 2, 0, 2, 3, // front + 4, 5, 6, 4, 6, 7, // back + 8, 9, 10, 8, 10, 11, // top + 12, 13, 14, 12, 14, 15, // bottom + 16, 17, 18, 16, 18, 19, // right + 20, 21, 22, 20, 22, 23, // left + ]; + + // Now send the element array to GL + gl.bufferData( + gl.ELEMENT_ARRAY_BUFFER, + new Uint16Array(indices), + gl.STATIC_DRAW + ); + + return { + position: positionBuffer, + indices: indexBuffer, + }; + } + + function drawCube(modelViewMatrix, gl, programInfo, buffers, view, baseColor) { + // Tell WebGL how to pull out the positions from the position + // buffer into the vertexPosition attribute + { + const numComponents = 3; + const type = gl.FLOAT; + const normalize = false; + const stride = 0; + const offset = 0; + gl.bindBuffer(gl.ARRAY_BUFFER, buffers.position); + gl.vertexAttribPointer( + programInfo.attribLocations.vertexPosition, + numComponents, + type, + normalize, + stride, + offset + ); + gl.enableVertexAttribArray( + programInfo.attribLocations.vertexPosition + ); + } + + // Tell WebGL which indices to use to index the vertices + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, buffers.indices); + + // Tell WebGL to use our program when drawing + gl.useProgram(programInfo.program); + + // Set the shader uniforms + gl.uniformMatrix4fv( + programInfo.uniformLocations.projectionMatrix, + false, + view.projectionMatrix + ); + gl.uniformMatrix4fv( + programInfo.uniformLocations.modelViewMatrix, + false, + modelViewMatrix + ); + + gl.uniform4fv(programInfo.uniformLocations.uBaseColor, baseColor); + + { + const vertexCount = 36; + const type = gl.UNSIGNED_SHORT; + const offset = 0; + gl.drawElements(gl.TRIANGLES, vertexCount, type, offset); + } + } + + // Initialize a shader program, so WebGL knows how to draw our data + // + function initShaderProgram(gl, vsSource, fsSource) { + const vertexShader = loadShader(gl, gl.VERTEX_SHADER, vsSource); + const fragmentShader = loadShader(gl, gl.FRAGMENT_SHADER, fsSource); + + // Create the shader program + + const shaderProgram = gl.createProgram(); + gl.attachShader(shaderProgram, vertexShader); + gl.attachShader(shaderProgram, fragmentShader); + gl.linkProgram(shaderProgram); + + // If creating the shader program failed, alert + + if (!gl.getProgramParameter(shaderProgram, gl.LINK_STATUS)) { + alert( + "Unable to initialize the shader program: " + + gl.getProgramInfoLog(shaderProgram) + ); + return null; + } + + return shaderProgram; + } + + // Creates a shader of the given type, uploads the source and + // compiles it. + // + function loadShader(gl, type, source) { + const shader = gl.createShader(type); + + // Send the source to the shader object + + gl.shaderSource(shader, source); + + // Compile the shader program + + gl.compileShader(shader); + + // See if it compiled successfully + + if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) { + alert( + "An error occurred compiling the shaders: " + + gl.getShaderInfoLog(shader) + ); + gl.deleteShader(shader); + return null; + } + + return shader; + } + +// ... end of GL rendering code adapted from a publicly provided code sample found at +// https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL + + +// This non-blocking async data readback implementation is adapted from a publicly provided code sample found at +// https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/WebGL_best_practices#use_non-blocking_async_data_readback + + function clientWaitAsync(gl, sync, flags, interval_ms) { + return new Promise((resolve, reject) => { + function test() { + const res = gl.clientWaitSync(sync, flags, 0); + if (res === gl.WAIT_FAILED) { + reject(); + return; + } + if (res === gl.TIMEOUT_EXPIRED) { + setTimeout(test, interval_ms); + return; + } + resolve(); + } + test(); + }); + } + + async function getBufferSubDataAsync( + gl, target, buffer, srcByteOffset, dstBuffer, + /* optional */ dstOffset, /* optional */ length) { + const sync = gl.fenceSync(gl.SYNC_GPU_COMMANDS_COMPLETE, 0); + gl.flush(); + + await clientWaitAsync(gl, sync, 0, 1); + gl.deleteSync(sync); + + gl.bindBuffer(target, buffer); + gl.getBufferSubData(target, srcByteOffset, dstBuffer, dstOffset, length); + gl.bindBuffer(target, null); + + return dstBuffer; + } + + async function readPixelsAsync(gl, x, y, w, h, format, type, dest, buf) { + gl.bindBuffer(gl.PIXEL_PACK_BUFFER, buf); + gl.bufferData(gl.PIXEL_PACK_BUFFER, dest.byteLength, gl.STREAM_READ); + gl.readPixels(x, y, w, h, format, type, 0); + gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null); + + await getBufferSubDataAsync(gl, gl.PIXEL_PACK_BUFFER, buf, 0, dest); + + return dest; + } + +// ... end of non-blocking async data readback implementation adapted from a publicly provided code sample found at +// https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/WebGL_best_practices#use_non-blocking_async_data_readback + + + initXR(); + </script> + </body> +</html>
diff --git a/third_party/webxr_test_pages/webxr-samples/proposals/index.html b/third_party/webxr_test_pages/webxr-samples/proposals/index.html index 3a29448..6d66cd5 100644 --- a/third_party/webxr_test_pages/webxr-samples/proposals/index.html +++ b/third_party/webxr_test_pages/webxr-samples/proposals/index.html
@@ -130,6 +130,10 @@ path: 'camera-access-barebones.html', description: 'Demonstrates using the Camera Access feature to obtain and use a camera ' + 'image texture.' }, + { title: 'AR Camera Marker Tracking', category: 'Phone AR', + path: 'camera-access-marker.html', + description: 'Demonstrates using the Camera Access ' + + 'feature to track a marker.' }, { title: 'AR Depth Sensing - GPU access', category: 'AR', path: 'phone-ar-depth-gpu.html', description: 'Demonstrates use of a depth API in immersive-ar session. ' +
diff --git a/third_party/webxr_test_pages/webxr-samples/proposals/opencv/opencv.js b/third_party/webxr_test_pages/webxr-samples/proposals/opencv/opencv.js new file mode 100644 index 0000000..75a9d6a4 --- /dev/null +++ b/third_party/webxr_test_pages/webxr-samples/proposals/opencv/opencv.js
@@ -0,0 +1,49 @@ +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(function () { + return (root.cv = factory()); + }); + } else if (typeof module === 'object' && module.exports) { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } else if (typeof window === 'object') { + // Browser globals + root.cv = factory(); + } else if (typeof importScripts === 'function') { + // Web worker + root.cv = factory(); + } else { + // Other shells, e.g. d8 + root.cv = factory(); + } +}(this, function () { + +var cv = (() => { + var _scriptDir = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : undefined; + if (typeof __filename !== 'undefined') _scriptDir = _scriptDir || __filename; + return ( +function(cv) { + cv = cv || {}; + +var Module=typeof cv!="undefined"?cv:{};var readyPromiseResolve,readyPromiseReject;Module["ready"]=new Promise(function(resolve,reject){readyPromiseResolve=resolve;readyPromiseReject=reject});var moduleOverrides=Object.assign({},Module);var arguments_=[];var thisProgram="./this.program";var quit_=(status,toThrow)=>{throw toThrow};var ENVIRONMENT_IS_WEB=typeof window=="object";var ENVIRONMENT_IS_WORKER=typeof importScripts=="function";var ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof process.versions=="object"&&typeof process.versions.node=="string";var scriptDirectory="";function locateFile(path){if(Module["locateFile"]){return Module["locateFile"](path,scriptDirectory)}return scriptDirectory+path}var read_,readAsync,readBinary,setWindowTitle;function logExceptionOnExit(e){if(e instanceof ExitStatus)return;let toLog=e;err("exiting due to exception: "+toLog)}var fs;var nodePath;var requireNodeFS;if(ENVIRONMENT_IS_NODE){if(ENVIRONMENT_IS_WORKER){scriptDirectory=require("path").dirname(scriptDirectory)+"/"}else{scriptDirectory=__dirname+"/"}requireNodeFS=(()=>{if(!nodePath){fs=require("fs");nodePath=require("path")}});read_=function shell_read(filename,binary){var ret=tryParseAsDataURI(filename);if(ret){return binary?ret:ret.toString()}requireNodeFS();filename=nodePath["normalize"](filename);return fs.readFileSync(filename,binary?undefined:"utf8")};readBinary=(filename=>{var ret=read_(filename,true);if(!ret.buffer){ret=new Uint8Array(ret)}return ret});readAsync=((filename,onload,onerror)=>{var ret=tryParseAsDataURI(filename);if(ret){onload(ret)}requireNodeFS();filename=nodePath["normalize"](filename);fs.readFile(filename,function(err,data){if(err)onerror(err);else onload(data.buffer)})});if(process["argv"].length>1){thisProgram=process["argv"][1].replace(/\\/g,"/")}arguments_=process["argv"].slice(2);process["on"]("uncaughtException",function(ex){if(!(ex instanceof ExitStatus)){throw ex}});process["on"]("unhandledRejection",function(reason){throw reason});quit_=((status,toThrow)=>{if(keepRuntimeAlive()){process["exitCode"]=status;throw toThrow}logExceptionOnExit(toThrow);process["exit"](status)});Module["inspect"]=function(){return"[Emscripten Module object]"}}else if(ENVIRONMENT_IS_WEB||ENVIRONMENT_IS_WORKER){if(ENVIRONMENT_IS_WORKER){scriptDirectory=self.location.href}else if(typeof document!="undefined"&&document.currentScript){scriptDirectory=document.currentScript.src}if(_scriptDir){scriptDirectory=_scriptDir}if(scriptDirectory.indexOf("blob:")!==0){scriptDirectory=scriptDirectory.substr(0,scriptDirectory.replace(/[?#].*/,"").lastIndexOf("/")+1)}else{scriptDirectory=""}{read_=(url=>{try{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.send(null);return xhr.responseText}catch(err){var data=tryParseAsDataURI(url);if(data){return intArrayToString(data)}throw err}});if(ENVIRONMENT_IS_WORKER){readBinary=(url=>{try{var xhr=new XMLHttpRequest;xhr.open("GET",url,false);xhr.responseType="arraybuffer";xhr.send(null);return new Uint8Array(xhr.response)}catch(err){var data=tryParseAsDataURI(url);if(data){return data}throw err}})}readAsync=((url,onload,onerror)=>{var xhr=new XMLHttpRequest;xhr.open("GET",url,true);xhr.responseType="arraybuffer";xhr.onload=(()=>{if(xhr.status==200||xhr.status==0&&xhr.response){onload(xhr.response);return}var data=tryParseAsDataURI(url);if(data){onload(data.buffer);return}onerror()});xhr.onerror=onerror;xhr.send(null)})}setWindowTitle=(title=>document.title=title)}else{}var out=Module["print"]||console.log.bind(console);var err=Module["printErr"]||console.warn.bind(console);Object.assign(Module,moduleOverrides);moduleOverrides=null;if(Module["arguments"])arguments_=Module["arguments"];if(Module["thisProgram"])thisProgram=Module["thisProgram"];if(Module["quit"])quit_=Module["quit"];function warnOnce(text){if(!warnOnce.shown)warnOnce.shown={};if(!warnOnce.shown[text]){warnOnce.shown[text]=1;err(text)}}var tempRet0=0;var setTempRet0=value=>{tempRet0=value};var wasmBinary;if(Module["wasmBinary"])wasmBinary=Module["wasmBinary"];var noExitRuntime=Module["noExitRuntime"]||true;if(typeof WebAssembly!="object"){abort("no native wasm support detected")}var wasmMemory;var ABORT=false;var EXITSTATUS;function assert(condition,text){if(!condition){abort(text)}}var UTF8Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf8"):undefined;function UTF8ArrayToString(heap,idx,maxBytesToRead){var endIdx=idx+maxBytesToRead;var endPtr=idx;while(heap[endPtr]&&!(endPtr>=endIdx))++endPtr;if(endPtr-idx>16&&heap.subarray&&UTF8Decoder){return UTF8Decoder.decode(heap.subarray(idx,endPtr))}else{var str="";while(idx<endPtr){var u0=heap[idx++];if(!(u0&128)){str+=String.fromCharCode(u0);continue}var u1=heap[idx++]&63;if((u0&224)==192){str+=String.fromCharCode((u0&31)<<6|u1);continue}var u2=heap[idx++]&63;if((u0&240)==224){u0=(u0&15)<<12|u1<<6|u2}else{u0=(u0&7)<<18|u1<<12|u2<<6|heap[idx++]&63}if(u0<65536){str+=String.fromCharCode(u0)}else{var ch=u0-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}}}return str}function UTF8ToString(ptr,maxBytesToRead){return ptr?UTF8ArrayToString(HEAPU8,ptr,maxBytesToRead):""}function stringToUTF8Array(str,heap,outIdx,maxBytesToWrite){if(!(maxBytesToWrite>0))return 0;var startIdx=outIdx;var endIdx=outIdx+maxBytesToWrite-1;for(var i=0;i<str.length;++i){var u=str.charCodeAt(i);if(u>=55296&&u<=57343){var u1=str.charCodeAt(++i);u=65536+((u&1023)<<10)|u1&1023}if(u<=127){if(outIdx>=endIdx)break;heap[outIdx++]=u}else if(u<=2047){if(outIdx+1>=endIdx)break;heap[outIdx++]=192|u>>6;heap[outIdx++]=128|u&63}else if(u<=65535){if(outIdx+2>=endIdx)break;heap[outIdx++]=224|u>>12;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}else{if(outIdx+3>=endIdx)break;heap[outIdx++]=240|u>>18;heap[outIdx++]=128|u>>12&63;heap[outIdx++]=128|u>>6&63;heap[outIdx++]=128|u&63}}heap[outIdx]=0;return outIdx-startIdx}function stringToUTF8(str,outPtr,maxBytesToWrite){return stringToUTF8Array(str,HEAPU8,outPtr,maxBytesToWrite)}function lengthBytesUTF8(str){var len=0;for(var i=0;i<str.length;++i){var u=str.charCodeAt(i);if(u>=55296&&u<=57343)u=65536+((u&1023)<<10)|str.charCodeAt(++i)&1023;if(u<=127)++len;else if(u<=2047)len+=2;else if(u<=65535)len+=3;else len+=4}return len}var UTF16Decoder=typeof TextDecoder!="undefined"?new TextDecoder("utf-16le"):undefined;function UTF16ToString(ptr,maxBytesToRead){var endPtr=ptr;var idx=endPtr>>1;var maxIdx=idx+maxBytesToRead/2;while(!(idx>=maxIdx)&&HEAPU16[idx])++idx;endPtr=idx<<1;if(endPtr-ptr>32&&UTF16Decoder){return UTF16Decoder.decode(HEAPU8.subarray(ptr,endPtr))}else{var str="";for(var i=0;!(i>=maxBytesToRead/2);++i){var codeUnit=HEAP16[ptr+i*2>>1];if(codeUnit==0)break;str+=String.fromCharCode(codeUnit)}return str}}function stringToUTF16(str,outPtr,maxBytesToWrite){if(maxBytesToWrite===undefined){maxBytesToWrite=2147483647}if(maxBytesToWrite<2)return 0;maxBytesToWrite-=2;var startPtr=outPtr;var numCharsToWrite=maxBytesToWrite<str.length*2?maxBytesToWrite/2:str.length;for(var i=0;i<numCharsToWrite;++i){var codeUnit=str.charCodeAt(i);HEAP16[outPtr>>1]=codeUnit;outPtr+=2}HEAP16[outPtr>>1]=0;return outPtr-startPtr}function lengthBytesUTF16(str){return str.length*2}function UTF32ToString(ptr,maxBytesToRead){var i=0;var str="";while(!(i>=maxBytesToRead/4)){var utf32=HEAP32[ptr+i*4>>2];if(utf32==0)break;++i;if(utf32>=65536){var ch=utf32-65536;str+=String.fromCharCode(55296|ch>>10,56320|ch&1023)}else{str+=String.fromCharCode(utf32)}}return str}function stringToUTF32(str,outPtr,maxBytesToWrite){if(maxBytesToWrite===undefined){maxBytesToWrite=2147483647}if(maxBytesToWrite<4)return 0;var startPtr=outPtr;var endPtr=startPtr+maxBytesToWrite-4;for(var i=0;i<str.length;++i){var codeUnit=str.charCodeAt(i);if(codeUnit>=55296&&codeUnit<=57343){var trailSurrogate=str.charCodeAt(++i);codeUnit=65536+((codeUnit&1023)<<10)|trailSurrogate&1023}HEAP32[outPtr>>2]=codeUnit;outPtr+=4;if(outPtr+4>endPtr)break}HEAP32[outPtr>>2]=0;return outPtr-startPtr}function lengthBytesUTF32(str){var len=0;for(var i=0;i<str.length;++i){var codeUnit=str.charCodeAt(i);if(codeUnit>=55296&&codeUnit<=57343)++i;len+=4}return len}function writeArrayToMemory(array,buffer){HEAP8.set(array,buffer)}function writeAsciiToMemory(str,buffer,dontAddNull){for(var i=0;i<str.length;++i){HEAP8[buffer++>>0]=str.charCodeAt(i)}if(!dontAddNull)HEAP8[buffer>>0]=0}var buffer,HEAP8,HEAPU8,HEAP16,HEAPU16,HEAP32,HEAPU32,HEAPF32,HEAPF64;function updateGlobalBufferAndViews(buf){buffer=buf;Module["HEAP8"]=HEAP8=new Int8Array(buf);Module["HEAP16"]=HEAP16=new Int16Array(buf);Module["HEAP32"]=HEAP32=new Int32Array(buf);Module["HEAPU8"]=HEAPU8=new Uint8Array(buf);Module["HEAPU16"]=HEAPU16=new Uint16Array(buf);Module["HEAPU32"]=HEAPU32=new Uint32Array(buf);Module["HEAPF32"]=HEAPF32=new Float32Array(buf);Module["HEAPF64"]=HEAPF64=new Float64Array(buf)}var INITIAL_MEMORY=Module["INITIAL_MEMORY"]||134217728;var wasmTable;var __ATPRERUN__=[];var __ATINIT__=[];var __ATPOSTRUN__=[];var runtimeInitialized=false;var runtimeExited=false;var runtimeKeepaliveCounter=0;function keepRuntimeAlive(){return noExitRuntime||runtimeKeepaliveCounter>0}function preRun(){if(Module["preRun"]){if(typeof Module["preRun"]=="function")Module["preRun"]=[Module["preRun"]];while(Module["preRun"].length){addOnPreRun(Module["preRun"].shift())}}callRuntimeCallbacks(__ATPRERUN__)}function initRuntime(){runtimeInitialized=true;if(!Module["noFSInit"]&&!FS.init.initialized)FS.init();FS.ignorePermissions=false;TTY.init();callRuntimeCallbacks(__ATINIT__)}function exitRuntime(){runtimeExited=true}function postRun(){if(Module["postRun"]){if(typeof Module["postRun"]=="function")Module["postRun"]=[Module["postRun"]];while(Module["postRun"].length){addOnPostRun(Module["postRun"].shift())}}callRuntimeCallbacks(__ATPOSTRUN__)}function addOnPreRun(cb){__ATPRERUN__.unshift(cb)}function addOnInit(cb){__ATINIT__.unshift(cb)}function addOnPostRun(cb){__ATPOSTRUN__.unshift(cb)}var runDependencies=0;var runDependencyWatcher=null;var dependenciesFulfilled=null;function getUniqueRunDependency(id){return id}function addRunDependency(id){runDependencies++;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}}function removeRunDependency(id){runDependencies--;if(Module["monitorRunDependencies"]){Module["monitorRunDependencies"](runDependencies)}if(runDependencies==0){if(runDependencyWatcher!==null){clearInterval(runDependencyWatcher);runDependencyWatcher=null}if(dependenciesFulfilled){var callback=dependenciesFulfilled;dependenciesFulfilled=null;callback()}}}Module["preloadedImages"]={};Module["preloadedAudios"]={};function abort(what){{if(Module["onAbort"]){Module["onAbort"](what)}}what="Aborted("+what+")";err(what);ABORT=true;EXITSTATUS=1;what+=". Build with -s ASSERTIONS=1 for more info.";var e=new WebAssembly.RuntimeError(what);readyPromiseReject(e);throw e}var dataURIPrefix="data:application/octet-stream;base64,";function isDataURI(filename){return filename.startsWith(dataURIPrefix)}function isFileURI(filename){return filename.startsWith("file://")}var wasmBinaryFile;wasmBinaryFile="
